jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-27 08:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into tooomm-qt5

Browse source
This commit is contained in:
tooomm 2026-08-02 21:55:20 +02:00 • committed by GitHub
commit 4fba3c31f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
275 changed files with 66660 additions and 44237 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp
View file

@ -1630,10 +1630,9 @@ void Server_AbstractPlayer::getInfo(ServerInfo_Player *info,
bool withUserInfo)
{
getProperties(*info->mutable_properties(), withUserInfo);
if (recipient == this) {
if (deck) {
info->set_deck_list(deck->writeToString_Native().toStdString());
}
if (deck) {
info->set_deck_list(deck->writeToString_Native().toStdString());
}
for (Server_Arrow *arrow : arrows) {