diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java index 3950fa971b1..5427cb84607 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java @@ -7,7 +7,6 @@ import mage.constants.SubType; import mage.constants.Zone; import mage.game.permanent.Permanent; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.mage.test.serverside.base.CardTestPlayerBase; @@ -162,7 +161,6 @@ public class BestowTest extends CardTestPlayerBase { * Bestowed creature can be used to sacrifice a creature for the Away part. * http://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/magic-rulings-archives/513828-bestow-far-away */ - @Ignore // TODO: make fused targeting support @Test public void bestowWithFusedSpell() { addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2); diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 419651fa128..6b7eecdb424 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1981,10 +1981,10 @@ public abstract class GameImpl implements Game, Serializable { Card card = this.getCard(perm.getId()); if (card != null && card.isCreature()) { //TODO: cleanup - //UUID wasAttachedTo = perm.getAttachedTo(); - //perm.attachTo(null, this); - //BestowAbility.becomeCreature(perm, this); - //fireEvent(new GameEvent(GameEvent.EventType.UNATTACHED, wasAttachedTo, perm.getId(), perm.getControllerId())); + UUID wasAttachedTo = perm.getAttachedTo(); + perm.attachTo(null, this); + BestowAbility.becomeCreature(perm, this); + fireEvent(new GameEvent(GameEvent.EventType.UNATTACHED, wasAttachedTo, perm.getId(), perm.getControllerId())); } else if (movePermanentToGraveyardWithInfo(perm)) { somethingHappened = true; } @@ -2001,11 +2001,10 @@ public abstract class GameImpl implements Game, Serializable { // handle bestow unattachment Card card = this.getCard(perm.getId()); if (card != null && card.isCreature()) { - //TODO: cleanup - //UUID wasAttachedTo = perm.getAttachedTo(); - //perm.attachTo(null, this); - //BestowAbility.becomeCreature(perm, this); - //fireEvent(new GameEvent(GameEvent.EventType.UNATTACHED, wasAttachedTo, perm.getId(), perm.getControllerId())); + UUID wasAttachedTo = perm.getAttachedTo(); + perm.attachTo(null, this); + BestowAbility.becomeCreature(perm, this); + fireEvent(new GameEvent(GameEvent.EventType.UNATTACHED, wasAttachedTo, perm.getId(), perm.getControllerId())); } else if (movePermanentToGraveyardWithInfo(perm)) { somethingHappened = true; } diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index f4ff85445cf..47dbc5b8877 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -1470,6 +1470,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { zoneChangeInfo = new ZoneChangeInfo(event); } boolean successfullyMoved = ZonesHandler.moveCard(zoneChangeInfo, game); + //20180810 - 701.3d detachAllAttachments(game); return successfullyMoved; } @@ -1483,6 +1484,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { ZoneChangeInfo.Exile info = new ZoneChangeInfo.Exile(event, exileId, name); boolean successfullyMoved = ZonesHandler.moveCard(info, game); + //20180810 - 701.3d detachAllAttachments(game); return successfullyMoved; }