diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 8944e615bd0..ab717c1497f 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -724,12 +724,6 @@ public class GameAction { } } - // card state effects like Glorious Anthem -// for (final String effect : game.getStaticEffects().getStateBasedMap().keySet()) { -// final Function com = GameActionUtil.getCommands().get(effect); -// com.apply(game); -// } - List lands = game.getCardsIn(ZoneType.Battlefield); GameActionUtil.grantBasicLandsManaAbilities(CardLists.filter(lands, CardPredicates.Presets.LANDS)); @@ -927,14 +921,7 @@ public class GameAction { if (!perm.isInZone(tgtZone) || !perm.canBeEnchantedBy(c) || (perm.isPhasedOut() && !c.isPhasedOut())) { c.unEnchantEntity(perm); - if (c.isBestowed()) { - c.unanimateBestow(); - game.fireEvent(new GameEventCardStatsChanged(c)); - return true; - } - else { - this.moveToGraveyard(c); - } + this.moveToGraveyard(c); checkAgain = true; } } else if (entity instanceof Player) { @@ -955,11 +942,6 @@ public class GameAction { } if (c.isInPlay() && !c.isEnchanting()) { - if (c.isBestowed()) { - c.unanimateBestow(); - game.fireEvent(new GameEventCardStatsChanged(c)); - return true; - } this.moveToGraveyard(c); checkAgain = true; } diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 3be688ffacb..aad3814c946 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -21,6 +21,7 @@ import com.esotericsoftware.minlog.Log; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; + import forge.GameCommand; import forge.StaticData; import forge.card.*; @@ -56,6 +57,7 @@ import forge.util.Expressions; import forge.util.Lang; import forge.util.MyRandom; import forge.util.TextUtil; + import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -3560,6 +3562,9 @@ public class Card extends GameEntity implements Comparable { this.enchanting = null; entity.removeEnchantedBy(this); + if (this.isBestowed()) { + this.unanimateBestow(); + } getGame().fireEvent(new GameEventCardAttachment(this, entity, null, AttachMethod.Enchant)); }