Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Add Event to the signature of updateZoneChangeCounter.

Browse source 
This is required to Implement Skullbriar, the Walking Grave
This commit is contained in:
Samuel Sandeen 2016-09-10 17:45:26 -04:00
parent d53f751711
commit cdff9bae78
10 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/game/ZonesHandler.java
View file

@ -73,6 +73,7 @@ public class ZonesHandler {
toZone = subInfo.event.getToZone();
placeInDestinationZone(subInfo, game);
}
// We arbitrarily prefer the bottom half card. This should never be relevant.
if (toZone != null) {
game.setZone(unmelded.event.getTargetId(), toZone);
}
@ -180,7 +181,8 @@ public class ZonesHandler {
if (unmelded.subInfo.isEmpty()) {
return false;
}
meld.updateZoneChangeCounter(game);
// We arbitrarily prefer the bottom half card. This should never be relevant.
meld.updateZoneChangeCounter(game, unmelded.subInfo.get(unmelded.subInfo.size() - 1).event);
return true;
}
// Handle all normal cases
@ -235,9 +237,9 @@ public class ZonesHandler {
}
if (success) {
if (event.getToZone() == Zone.BATTLEFIELD && event.getTarget() != null) {
event.getTarget().updateZoneChangeCounter(game);
event.getTarget().updateZoneChangeCounter(game, event);
} else {
card.updateZoneChangeCounter(game);
card.updateZoneChangeCounter(game, event);
}
}
return success;