Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed a cleanup problem that locked the game at game end. Minor formattings and cleanup additions.

Browse source
This commit is contained in:
LevelX2 2014-02-11 00:38:10 +01:00
parent e672e63736
commit 753ada0a01
13 changed files with 86 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
View file

@ -64,10 +64,11 @@ import org.apache.log4j.Logger;
public class CallbackClientImpl implements CallbackClient {
private static final Logger logger = Logger.getLogger(CallbackClientImpl.class);
private UUID clientId;
private MageFrame frame;
private final UUID clientId;
private final MageFrame frame;
private int messageId = 0;
private boolean firstRun;
private int gameInformMessageId = 0;
private final boolean firstRun;
public CallbackClientImpl(MageFrame frame) {
this.clientId = UUID.randomUUID();
@ -165,7 +166,7 @@ public class CallbackClientImpl implements CallbackClient {
}
} else if (callback.getMethod().equals("gameOver")) {
GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) {
if (panel != null) {
panel.endMessage((String) callback.getData(), callback.getMessageId());
}
} else if (callback.getMethod().equals("gameError")) {
@ -238,15 +239,18 @@ public class CallbackClientImpl implements CallbackClient {
}
} else if (callback.getMethod().equals("gameInform")) {
if (callback.getMessageId() > messageId) {
if (callback.getMessageId() > gameInformMessageId) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId());
if (panel != null) {
panel.inform(message.getMessage(), message.getGameView(), callback.getMessageId());
}
} else {
logger.warn("message out of sequence - ignoring");
logger.warn(new StringBuilder("message out of sequence - ignoring").append("MessageId = ").append(callback.getMessageId()).append(" method = ").append(callback.getMethod()));
//logger.warn("message out of sequence - ignoring");
}
gameInformMessageId = messageId;
} else if (callback.getMethod().equals("gameInformPersonal")) {
GameClientMessage message = (GameClientMessage) callback.getData();
GamePanel panel = MageFrame.getGame(callback.getObjectId());