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

- Fixed Boon Satyr (and possibly others) going straight to graveyard if bestowed onto a creature which then dies.

Browse Source
This commit is contained in:
Agetian
2015-01-21 19:06:45 +00:00
parent 54dcd5c645
commit 27d78fd106
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -815,14 +815,15 @@ public class GameAction {
tgt = sa.getTargetRestrictions(); tgt = sa.getTargetRestrictions();
} }
boolean wasBestowed = c.isBestowed();
if (entity instanceof Card) { if (entity instanceof Card) {
final Card perm = (Card) entity; final Card perm = (Card) entity;
final ZoneType tgtZone = tgt.getZone().get(0); final ZoneType tgtZone = tgt.getZone().get(0);
if (!perm.isInZone(tgtZone) || !perm.canBeEnchantedBy(c, true) || (perm.isPhasedOut() && !c.isPhasedOut())) { if (!perm.isInZone(tgtZone) || !perm.canBeEnchantedBy(c, true) || (perm.isPhasedOut() && !c.isPhasedOut())) {
boolean bestowed = c.isBestowed();
c.unEnchantEntity(perm); c.unEnchantEntity(perm);
if (!bestowed) { if (!wasBestowed) {
moveToGraveyard(c); moveToGraveyard(c);
} }
checkAgain = true; checkAgain = true;
@@ -844,7 +845,7 @@ public class GameAction {
} }
} }
if (c.isInPlay() && !c.isEnchanting()) { if (c.isInPlay() && !c.isEnchanting() && !wasBestowed) {
moveToGraveyard(c); moveToGraveyard(c);
checkAgain = true; checkAgain = true;
} }