From 9adfa96667d88a937a596cef88ee0fc385f79712 Mon Sep 17 00:00:00 2001 From: Colin Redman Date: Sun, 5 Aug 2018 17:13:42 -0600 Subject: [PATCH] Fixed phased out creatures not removed from combat (#5200) --- Mage/src/main/java/mage/game/permanent/PermanentImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index fca0516e4d2..74739b25a37 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -1,7 +1,6 @@ package mage.game.permanent; -import java.util.*; import mage.MageObject; import mage.MageObjectReference; import mage.ObjectColor; @@ -36,6 +35,8 @@ import mage.util.GameLog; import mage.util.ThreadLocalStringBuilder; import org.apache.log4j.Logger; +import java.util.*; + /** * @author BetaSteward_at_googlemail.com */ @@ -493,6 +494,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { attachedPerm.phaseOut(game, true); } } + this.removeFromCombat(game); this.phasedIn = false; this.indirectPhase = indirectPhase; if (!game.isSimulation()) {