github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5202 from credman0/PhasedOutRemoveFromCombatFix

Browse source 
Fixed phased out creatures not removed from combat (#5200)
This commit is contained in:
LevelX2 2018-08-15 08:17:58 +02:00 committed by GitHub
commit dbb25c8683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -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()) {