From f12a61624356a583c0f655323e9253567bfe790e Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 5 Sep 2014 12:47:49 +0200 Subject: [PATCH] Some changes to debug messages and change to avoid conccurent change exception. --- .../main/java/mage/server/ChatSession.java | 2 +- .../mage/abilities/TriggeredAbilities.java | 3 +- Mage/src/mage/game/GameImpl.java | 2 +- Mage/src/mage/players/PlayerImpl.java | 35 ++++++++++--------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/ChatSession.java b/Mage.Server/src/main/java/mage/server/ChatSession.java index bcff7a79251..e866fb4f6f5 100644 --- a/Mage.Server/src/main/java/mage/server/ChatSession.java +++ b/Mage.Server/src/main/java/mage/server/ChatSession.java @@ -159,7 +159,7 @@ public class ChatSession { user.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(username, msg, time, color, messageType, soundToPlay))); } else { - logger.debug("user not found but chat still exists - userId: " + userId +" chatId: " +chatId); + logger.error("User not found but connected to chat - userId: " + userId + " chatId: " + chatId); } } } diff --git a/Mage/src/mage/abilities/TriggeredAbilities.java b/Mage/src/mage/abilities/TriggeredAbilities.java index 028c722c048..9782876ddaa 100644 --- a/Mage/src/mage/abilities/TriggeredAbilities.java +++ b/Mage/src/mage/abilities/TriggeredAbilities.java @@ -59,7 +59,8 @@ public class TriggeredAbilities extends HashMap { } public void checkTriggers(GameEvent event, Game game) { - for (TriggeredAbility ability: this.values()) { + for (Iterator it = this.values().iterator(); it.hasNext();) { + TriggeredAbility ability = it.next(); // for effects like when leaves battlefield use ShortLKI to check if permanent was in the correct zone before (e.g. Oblivion Ring) if (ability.isInUseableZone(game, null, event.getType().equals(GameEvent.EventType.ZONE_CHANGE))) { if (!game.getContinuousEffects().preventedByRuleModification(event, ability, game, false)) { diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index 60eb8b0f2f4..4bea2ca1f56 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -1086,7 +1086,7 @@ public abstract class GameImpl implements Game, Serializable { } } catch (Exception ex) { - logger.fatal("Game exception ", ex); + logger.fatal("Game exception gameId: " + getId(), ex); ex.printStackTrace(); this.fireErrorEvent("Game exception occurred: ", ex); restoreState(bookmark); diff --git a/Mage/src/mage/players/PlayerImpl.java b/Mage/src/mage/players/PlayerImpl.java index a2691af9491..14d96b4f866 100644 --- a/Mage/src/mage/players/PlayerImpl.java +++ b/Mage/src/mage/players/PlayerImpl.java @@ -121,7 +121,7 @@ import org.apache.log4j.Logger; public abstract class PlayerImpl implements Player, Serializable { - private static final transient Logger log = Logger.getLogger(PlayerImpl.class); + private static final transient Logger logger = Logger.getLogger(PlayerImpl.class); private static Random rnd = new Random(); @@ -957,7 +957,7 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public boolean triggerAbility(TriggeredAbility source, Game game) { if (source == null) { - log.warn("Null source in triggerAbility method"); + logger.warn("Null source in triggerAbility method"); throw new IllegalArgumentException("source TriggeredAbility must not be null"); } //20091005 - 603.3c, 603.3d @@ -1576,14 +1576,15 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void quit(Game game) { - game.informPlayers(new StringBuilder(getName()).append(" quits the match.").toString()); + logger.debug(getName() + " quits the match."); + game.informPlayers(getName() + " quits the match."); quit = true; this.concede(game); } @Override public void timerTimeout(Game game) { - game.informPlayers(new StringBuilder(getName()).append(" has run out of time. Loosing the Match.").toString()); + game.informPlayers(getName() + " has run out of time. Loosing the Match."); quit = true; timerTimeout = true; this.concede(game); @@ -1599,11 +1600,11 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void concede(Game game) { - log.debug(this.getName() + (" concedes gameId:" +game.getId())); + logger.debug(this.getName() + (" concedes gameId:" +game.getId())); game.gameOver(playerId); - log.debug("Before lost " + this.getName()); + logger.debug("Before lost " + this.getName()); lost(game); - log.debug("After lost " + this.getName()); + logger.debug("After lost " + this.getName()); this.left = true; } @@ -1612,21 +1613,21 @@ public abstract class PlayerImpl implements Player, Serializable { passedTurn = true; passedAllTurns = true; this.skip(); - log.trace("Passed priority for turns"); + logger.trace("Passed priority for turns"); } @Override public void passTurnPriority(Game game) { passedTurn = true; this.skip(); - log.trace("Passed priority for turn"); + logger.trace("Passed priority for turn"); } @Override public void restorePriority(Game game) { passedAllTurns = false; passedTurn = false; - log.trace("Restore priority"); + logger.trace("Restore priority"); } @Override @@ -1648,7 +1649,7 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void lost(Game game) { - log.debug(this.getName() + " has lost gameId: " + game.getId()); + logger.debug(this.getName() + " has lost gameId: " + game.getId()); if (canLose(game)) { //20100423 - 603.9 if (!this.wins) { @@ -1656,11 +1657,11 @@ public abstract class PlayerImpl implements Player, Serializable { game.fireEvent(GameEvent.getEvent(GameEvent.EventType.LOST, null, null, playerId)); game.informPlayers(new StringBuilder(this.getName()).append(" has lost the game.").toString()); } else { - log.debug(this.getName() + " has already won - stop lost"); + logger.debug(this.getName() + " has already won - stop lost"); } // for draw - first all players that have lost have to be set to lost if (!hasLeft()) { - log.debug("Game over playerId: " + playerId); + logger.debug("Game over playerId: " + playerId); game.gameOver(playerId); } } @@ -1673,7 +1674,7 @@ public abstract class PlayerImpl implements Player, Serializable { @Override public void won(Game game) { - log.debug("player won -> start: " + this.getName()); + logger.debug("player won -> start: " + this.getName()); if (!game.replaceEvent(new GameEvent(GameEvent.EventType.WINS, null, null, playerId))) { if (!this.loses) { //20130501 - 800.7, 801.16 @@ -1681,7 +1682,7 @@ public abstract class PlayerImpl implements Player, Serializable { for (UUID opponentId: game.getOpponents(playerId)) { Player opponent = game.getPlayer(opponentId); if (opponent != null && !opponent.hasLost()) { - log.debug("player won -> calling opponent lost: " + this.getName() + " opponent: " + opponent.getName()); + logger.debug("player won -> calling opponent lost: " + this.getName() + " opponent: " + opponent.getName()); opponent.lost(game); } } @@ -1694,13 +1695,13 @@ public abstract class PlayerImpl implements Player, Serializable { } } if (opponentsAlive == 0 && !hasWon()) { - log.debug("player won -> No more oppononets alive game won: " + this.getName()); + logger.debug("player won -> No more oppononets alive game won: " + this.getName()); game.informPlayers(new StringBuilder(this.getName()).append(" has won the game").toString()); this.wins = true; game.end(); } } else { - log.debug("player won -> but already lost before: " + this.getName()); + logger.debug("player won -> but already lost before: " + this.getName()); } } }