External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed issue 103 - this should catch most card logic errors, log the error on the server and trigger a message on the client

Browse source
This commit is contained in:
BetaSteward 2011-06-17 22:42:04 -04:00
parent 29865e79af
commit 82654f10d5
7 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -117,6 +117,9 @@ public class GameController implements GameCallback {
case REVEAL:
revealCards(event.getMessage(), event.getCards());
break;
case ERROR:
error(event.getMessage());
break;
}
} catch (MageException ex) {
logger.fatal("Table event listener error ", ex);
@ -416,6 +419,12 @@ public class GameController implements GameCallback {
}
}
private void error(String message) {
for (final Entry<UUID, GameSession> entry: gameSessions.entrySet()) {
entry.getValue().gameError(message);
}
}
private GameView getGameView() {
return new GameView(game.getState(), game);
}

9
Mage.Server/src/main/java/mage/server/game/GameWatcher.java
View file

@ -95,6 +95,15 @@ public class GameWatcher {
}
}
public void gameError(final String message) {
if (!killed) {
Session session = SessionManager.getInstance().getSession(sessionId);
if (session != null) {
session.fireCallback(new ClientCallback("gameError", gameId, message));
}
}
}
protected void handleRemoteException(RemoteException ex) {
logger.fatal("GameWatcher error", ex);
GameManager.getInstance().kill(gameId, sessionId);