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

clear triggerHandler moved to FGameState

Browse Source
This commit is contained in:
Maxmtg
2011-09-19 19:18:47 +00:00
parent c08920bceb
commit fb26392eda
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/AllZone.java
View File

@@ -435,14 +435,11 @@ public final class AllZone implements NewConstants {
* <p>Resets everything possible to set a new game.</p> * <p>Resets everything possible to set a new game.</p>
*/ */
public static void newGameCleanup() { public static void newGameCleanup() {
Singletons.getModel().getGameState().newGameCleanup(); Singletons.getModel().getGameState().newGameCleanup();
getDisplay().showCombat(""); getDisplay().showCombat("");
getDisplay().loadPrefs(); getDisplay().loadPrefs();
getInputControl().clearInput(); getInputControl().clearInput();
getColorChanger().reset(); getColorChanger().reset();
@@ -450,9 +447,6 @@ public final class AllZone implements NewConstants {
// player.reset() now handles this // player.reset() now handles this
//AllZone.getHumanPlayer().clearHandSizeOperations(); //AllZone.getHumanPlayer().clearHandSizeOperations();
//AllZone.getComputerPlayer().clearHandSizeOperations(); //AllZone.getComputerPlayer().clearHandSizeOperations();
getTriggerHandler().clearRegistered();
} }
/** /**

1
src/main/java/forge/model/FGameState.java
View File

@@ -296,6 +296,7 @@ public class FGameState {
} }
getStaticEffects().reset(); getStaticEffects().reset();
getTriggerHandler().clearRegistered();
} }
} }