jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-09-22 01:25:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 68a4caa4bb into b3c426cd43

Browse source
This commit is contained in:
BruebachL 2026-09-20 19:36:32 +02:00 • committed by GitHub
commit 5ea64f61ce
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/game/game_event_handler.cpp
View file

@ -255,8 +255,6 @@ void GameEventHandler::eventSpectatorLeave(const Event_Leave &event,
emit spectatorLeft(eventPlayerId); emit spectatorLeft(eventPlayerId);
game->getPlayerManager()->removeSpectator(eventPlayerId); game->getPlayerManager()->removeSpectator(eventPlayerId);
emitUserEvent();
} }
void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event, void GameEventHandler::eventGameStateChanged(const Event_GameStateChanged &event,
@ -443,9 +441,9 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/,
PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info()); PlayerLogic *newPlayer = game->getPlayerManager()->addPlayer(playerId, playerInfo.user_info());
emit logJoinPlayer(newPlayer); emit logJoinPlayer(newPlayer);
emit playerJoined(playerInfo); emit playerJoined(playerInfo);
}
emitUserEvent(); emitUserEvent();
}
} }
QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason) QString GameEventHandler::getLeaveReason(Event_Leave::LeaveReason reason)