External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 22:42:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a test.

Browse source
This commit is contained in:
LevelX2 2015-07-23 15:58:10 +02:00
parent b169e7e6c7
commit 7d3ff0551d
6 changed files with 117 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage/src/mage/game/GameImpl.java
View file

@ -44,6 +44,7 @@ import java.util.Random;
import java.util.Set;
import java.util.Stack;
import java.util.UUID;
import mage.MageException;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbility;
@ -1173,6 +1174,7 @@ public abstract class GameImpl implements Game, Serializable {
@Override
public void playPriority(UUID activePlayerId, boolean resuming) {
int errorContinueCounter = 0;
int bookmark = 0;
clearAllBookmarks();
try {
@ -1239,11 +1241,19 @@ public abstract class GameImpl implements Game, Serializable {
}
} catch (Exception ex) {
logger.fatal("Game exception gameId: " + getId(), ex);
ex.printStackTrace();
this.fireErrorEvent("Game exception occurred: ", ex);
restoreState(bookmark, "");
bookmark = 0;
continue;
Player activePlayer = this.getPlayer(getActivePlayerId());
if (errorContinueCounter > 15) {
throw new MageException("Iterated player priority after game exception too often, game ends!");
}
if (activePlayer != null && !activePlayer.isTestMode()) {
errorContinueCounter++;
continue;
} else {
throw new MageException("Error in testclass");
}
}
state.getPlayerList().getNext();
}
@ -1251,6 +1261,7 @@ public abstract class GameImpl implements Game, Serializable {
} catch (Exception ex) {
logger.fatal("Game exception ", ex);
this.fireErrorEvent("Game exception occurred: ", ex);
this.end();
} finally {
resetLKI();
clearAllBookmarks();