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

added inCombat check to controllerChangeZoneCorrection

Browse Source
This commit is contained in:
Maxmtg
2013-06-24 16:10:08 +00:00
parent b20da90917
commit 1908ad7583
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/game/GameAction.java
View File

@@ -439,7 +439,8 @@ public class GameAction {
if (c.hasStartOfKeyword("Echo")) {
c.addExtrinsicKeyword("(Echo unpaid)");
}
game.getCombat().removeFromCombat(c);
if ( game.getPhaseHandler().inCombat() )
game.getCombat().removeFromCombat(c);
c.setTurnInZone(tiz);