Skip to content

Commit 1cb6dff

Browse files
Merge branch 'server' of github.com:moecube/ygopro into server
2 parents 816714d + b7169d4 commit 1cb6dff

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

gframe/data_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace ygo {
99
unsigned char DataManager::scriptBuffer[0x100000] = {};
1010
DataManager dataManager;
1111
#ifdef YGOPRO_SERVER_MODE
12-
static const char SELECT_STMT[] = "SELECT * FROM datas";
12+
static const char SELECT_STMT[] = "SELECT datas.id, datas.ot, datas.alias, datas.setcode, datas.type, datas.atk, datas.def, datas.level, datas.race, datas.attribute, datas.category FROM datas";
1313
#else
1414
static const char SELECT_STMT[] = "SELECT datas.id, datas.ot, datas.alias, datas.setcode, datas.type, datas.atk, datas.def, datas.level, datas.race, datas.attribute, datas.category,"
1515
" texts.name, texts.desc, texts.str1, texts.str2, texts.str3, texts.str4, texts.str5, texts.str6, texts.str7, texts.str8,"

gframe/single_duel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1926,6 +1926,8 @@ void SingleDuel::EndDuel() {
19261926
for(auto oit = observers.begin(); oit != observers.end(); ++oit)
19271927
NetServer::ReSendToPlayer(*oit);
19281928
NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
1929+
} else {
1930+
NetServer::ReSendToPlayer(replay_recorder);
19291931
}
19301932
#else
19311933
for(auto oit = observers.begin(); oit != observers.end(); ++oit)

gframe/tag_duel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,6 +2017,8 @@ void TagDuel::EndDuel() {
20172017
for(auto oit = observers.begin(); oit != observers.end(); ++oit)
20182018
NetServer::ReSendToPlayer(*oit);
20192019
NetServer::ReSendToPlayers(cache_recorder, replay_recorder);
2020+
} else {
2021+
NetServer::ReSendToPlayer(replay_recorder);
20202022
}
20212023
#else
20222024
for(auto oit = observers.begin(); oit != observers.end(); ++oit)

0 commit comments

Comments
 (0)