external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Removed a lot of copies of "updateObservers()" (please report if you see anything funny).

Browse Source
This commit is contained in:
Sloth
2012-07-28 19:17:59 +00:00
parent f0bf725060
commit 8a0fc69a7f
6 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/Card.java
View File

@@ -3802,7 +3802,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final void setOwner(final Player player) { public final void setOwner(final Player player) {
this.owner = player; this.owner = player;
this.updateObservers(); //this.updateObservers();
} }
/** /**
@@ -5806,7 +5806,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*/ */
public final void setUniqueNumber(final int n) { public final void setUniqueNumber(final int n) {
this.uniqueNumber = n; this.uniqueNumber = n;
this.updateObservers(); //this.updateObservers();
} }
/** /**

7
src/main/java/forge/card/mana/ManaPool.java
View File

@@ -151,7 +151,6 @@ public class ManaPool {
this.floatingTotals[i]++; this.floatingTotals[i]++;
} }
} }
owner.updateObservers();
} }
/** /**
@@ -182,7 +181,7 @@ public class ManaPool {
if (this.floatingMana.size() == 0) { if (this.floatingMana.size() == 0) {
this.calculateManaTotals(); this.calculateManaTotals();
this.owner.updateObservers(); //this.owner.updateObservers();
return numRemoved; return numRemoved;
} }
@@ -202,7 +201,7 @@ public class ManaPool {
this.floatingMana.clear(); this.floatingMana.clear();
} }
this.calculateManaTotals(); this.calculateManaTotals();
this.owner.updateObservers(); //this.owner.updateObservers();
return numRemoved; return numRemoved;
} }
@@ -381,7 +380,7 @@ public class ManaPool {
this.floatingTotals[i]--; this.floatingTotals[i]--;
} }
} }
owner.updateObservers(); //owner.updateObservers();
} }
} }

2
src/main/java/forge/control/input/InputPassPriority.java
View File

@@ -44,7 +44,7 @@ public class InputPassPriority extends Input implements java.io.Serializable {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final void showMessage() { public final void showMessage() {
GuiDisplayUtil.updateGUI(); //GuiDisplayUtil.updateGUI();
ButtonUtil.enableOnlyOK(); ButtonUtil.enableOnlyOK();
final PhaseType phase = Singletons.getModel().getGameState().getPhaseHandler().getPhase(); final PhaseType phase = Singletons.getModel().getGameState().getPhaseHandler().getPhase();

2
src/main/java/forge/control/input/InputPayManaCostUtil.java
View File

@@ -195,7 +195,7 @@ public class InputPayManaCostUtil {
manaCost = AllZone.getHumanPlayer().getManaPool().payManaFromAbility(sa, manaCost, chosen); 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) // DO NOT REMOVE THIS, otherwise the cards don't always tap (copied)
return manaCost; return manaCost;

2
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -115,7 +115,7 @@ public class PhaseUtil {
Singletons.getModel().getGameState().getUntap().executeAt(); Singletons.getModel().getGameState().getUntap().executeAt();
// otherwise land seems to stay tapped when it is really untapped // 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); Singletons.getModel().getGameState().getPhaseHandler().setNeedToNextPhase(true);
} }

9
src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -562,16 +562,11 @@ public final class GuiDisplayUtil {
Singletons.getModel().getGameAction().checkStateEffects(); Singletons.getModel().getGameAction().checkStateEffects();
Singletons.getModel().getGameState().getPhaseHandler().updateObservers(); Singletons.getModel().getGameState().getPhaseHandler().updateObservers();
AllZone.getHumanPlayer().getZone(ZoneType.Exile).updateObservers(); AllZone.getHumanPlayer().updateObservers();
AllZone.getComputerPlayer().getZone(ZoneType.Exile).updateObservers();
AllZone.getHumanPlayer().getZone(ZoneType.Hand).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.getHumanPlayer().getZone(ZoneType.Battlefield).updateObservers();
AllZone.getComputerPlayer().updateObservers();
AllZone.getComputerPlayer().getZone(ZoneType.Battlefield).updateObservers(); AllZone.getComputerPlayer().getZone(ZoneType.Battlefield).updateObservers();
AllZone.getHumanPlayer().getZone(ZoneType.Library).updateObservers();
AllZone.getComputerPlayer().getZone(ZoneType.Library).updateObservers();
} }
/** /**