From 39e6ffc95f7100a3d6ecde57241c5a23a2486b7f Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 4 Aug 2014 21:30:27 +0000 Subject: [PATCH] Code cleanup --- .../forge/game/ability/effects/RestartGameEffect.java | 3 +-- .../forge/game/event/GameEventPlayerLivesChanged.java | 1 - .../java/forge/control/FControlGameEventHandler.java | 10 ++++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java index d581a79512c..5ddb3f766fa 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java @@ -59,8 +59,7 @@ public class RestartGameEffect extends SpellAbilityEffect { GameAction action = game.getAction(); List gamePlayers = game.getRegisteredPlayers(); - for( int i = 0; i < gamePlayers.size(); i++ ) { - + for (int i = 0; i < gamePlayers.size(); i++) { final Player player = gamePlayers.get(i); if( player.hasLost()) continue; diff --git a/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java b/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java index e08073b14ce..87e106907da 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java +++ b/forge-game/src/main/java/forge/game/event/GameEventPlayerLivesChanged.java @@ -4,7 +4,6 @@ import forge.game.player.Player; import forge.util.Lang; public class GameEventPlayerLivesChanged extends GameEvent { - public final Player player; public final int oldLives; public final int newLives; diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index 9ffb46a92f3..9b11b3e0b7a 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java @@ -67,7 +67,6 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base { private final AtomicBoolean turnUpdPlanned = new AtomicBoolean(false); @Override public Void visit(final GameEventTurnBegan event) { - if (FModel.getPreferences().getPrefBoolean(FPref.UI_STACK_CREATURES) && event.turnOwner != null) { // anything except stack will get here updateZone(Pair.of(event.turnOwner, ZoneType.Battlefield)); @@ -339,8 +338,9 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base { manaPoolUpdate.add(event.player); } } - if (invokeUpdate) + if (invokeUpdate) { FThreads.invokeInEdtNowOrLater(updManaPool); + } return null; } @@ -363,8 +363,9 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base { livesUpdate.add(event.player); } } - if (invokeUpdate) + if (invokeUpdate) { FThreads.invokeInEdtNowOrLater(updLives); + } return null; } @@ -377,8 +378,9 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base { livesUpdate.add(event.receiver); } } - if (invokeUpdate) + if (invokeUpdate) { FThreads.invokeInEdtNowOrLater(updLives); + } return null; } } \ No newline at end of file