diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index fff525ab368..cd0c854e7f4 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -3802,7 +3802,7 @@ public class Card extends GameEntity implements Comparable { */ public final void setOwner(final Player player) { this.owner = player; - this.updateObservers(); + //this.updateObservers(); } /** @@ -5806,7 +5806,7 @@ public class Card extends GameEntity implements Comparable { */ public final void setUniqueNumber(final int n) { this.uniqueNumber = n; - this.updateObservers(); + //this.updateObservers(); } /** diff --git a/src/main/java/forge/card/mana/ManaPool.java b/src/main/java/forge/card/mana/ManaPool.java index bf0b4427aad..f119470a491 100644 --- a/src/main/java/forge/card/mana/ManaPool.java +++ b/src/main/java/forge/card/mana/ManaPool.java @@ -151,7 +151,6 @@ public class ManaPool { this.floatingTotals[i]++; } } - owner.updateObservers(); } /** @@ -182,7 +181,7 @@ public class ManaPool { if (this.floatingMana.size() == 0) { this.calculateManaTotals(); - this.owner.updateObservers(); + //this.owner.updateObservers(); return numRemoved; } @@ -202,7 +201,7 @@ public class ManaPool { this.floatingMana.clear(); } this.calculateManaTotals(); - this.owner.updateObservers(); + //this.owner.updateObservers(); return numRemoved; } @@ -381,7 +380,7 @@ public class ManaPool { this.floatingTotals[i]--; } } - owner.updateObservers(); + //owner.updateObservers(); } } diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java index 1a77be36114..cd3a50a93b9 100644 --- a/src/main/java/forge/control/input/InputPassPriority.java +++ b/src/main/java/forge/control/input/InputPassPriority.java @@ -44,7 +44,7 @@ public class InputPassPriority extends Input implements java.io.Serializable { /** {@inheritDoc} */ @Override public final void showMessage() { - GuiDisplayUtil.updateGUI(); + //GuiDisplayUtil.updateGUI(); ButtonUtil.enableOnlyOK(); final PhaseType phase = Singletons.getModel().getGameState().getPhaseHandler().getPhase(); diff --git a/src/main/java/forge/control/input/InputPayManaCostUtil.java b/src/main/java/forge/control/input/InputPayManaCostUtil.java index 3740ff6f6cb..6468f902293 100644 --- a/src/main/java/forge/control/input/InputPayManaCostUtil.java +++ b/src/main/java/forge/control/input/InputPayManaCostUtil.java @@ -195,7 +195,7 @@ public class InputPayManaCostUtil { manaCost = AllZone.getHumanPlayer().getManaPool().payManaFromAbility(sa, manaCost, chosen); - AllZone.getHumanPlayer().getZone(ZoneType.Battlefield).updateObservers(); + //AllZone.getHumanPlayer().getZone(ZoneType.Battlefield).updateObservers(); // DO NOT REMOVE THIS, otherwise the cards don't always tap (copied) return manaCost; diff --git a/src/main/java/forge/game/phase/PhaseUtil.java b/src/main/java/forge/game/phase/PhaseUtil.java index d88ad5e6c83..6a9c22b9118 100644 --- a/src/main/java/forge/game/phase/PhaseUtil.java +++ b/src/main/java/forge/game/phase/PhaseUtil.java @@ -115,7 +115,7 @@ public class PhaseUtil { Singletons.getModel().getGameState().getUntap().executeAt(); // otherwise land seems to stay tapped when it is really untapped - AllZone.getHumanPlayer().getZone(ZoneType.Battlefield).updateObservers(); + //AllZone.getHumanPlayer().getZone(ZoneType.Battlefield).updateObservers(); Singletons.getModel().getGameState().getPhaseHandler().setNeedToNextPhase(true); } diff --git a/src/main/java/forge/gui/GuiDisplayUtil.java b/src/main/java/forge/gui/GuiDisplayUtil.java index 696d77f1a87..cacb81c769f 100644 --- a/src/main/java/forge/gui/GuiDisplayUtil.java +++ b/src/main/java/forge/gui/GuiDisplayUtil.java @@ -562,16 +562,11 @@ public final class GuiDisplayUtil { Singletons.getModel().getGameAction().checkStateEffects(); Singletons.getModel().getGameState().getPhaseHandler().updateObservers(); - AllZone.getHumanPlayer().getZone(ZoneType.Exile).updateObservers(); - AllZone.getComputerPlayer().getZone(ZoneType.Exile).updateObservers(); + AllZone.getHumanPlayer().updateObservers(); AllZone.getHumanPlayer().getZone(ZoneType.Hand).updateObservers(); - AllZone.getComputerPlayer().getZone(ZoneType.Hand).updateObservers(); - AllZone.getHumanPlayer().getZone(ZoneType.Graveyard).updateObservers(); - AllZone.getComputerPlayer().getZone(ZoneType.Graveyard).updateObservers(); AllZone.getHumanPlayer().getZone(ZoneType.Battlefield).updateObservers(); + AllZone.getComputerPlayer().updateObservers(); AllZone.getComputerPlayer().getZone(ZoneType.Battlefield).updateObservers(); - AllZone.getHumanPlayer().getZone(ZoneType.Library).updateObservers(); - AllZone.getComputerPlayer().getZone(ZoneType.Library).updateObservers(); } /**