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

Add code for a few edge cases in zone change handling

Browse source 
Specifically this should fix the bugs that happen when tokens copy
PermanentCards.
This commit is contained in:
Samuel Sandeen 2016-09-14 19:30:14 -04:00
parent 0214576146
commit edd97587fc
1 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,11 @@ public class ZonesHandler {
// Handle normal cases // Handle normal cases
ZoneChangeEvent event = info.event; ZoneChangeEvent event = info.event;
Zone toZone = event.getToZone(); Zone toZone = event.getToZone();
Card targetCard = game.getCard(event.getTargetId()); Card targetCard = getTargetCard(game, event.getTargetId());
if (targetCard == null) {
// This should never happen.
return;
}
Cards cards; Cards cards;
if (targetCard instanceof MeldCard) { if (targetCard instanceof MeldCard) {
cards = ((MeldCard) targetCard).getHalves(); cards = ((MeldCard) targetCard).getHalves();
@ -161,6 +165,19 @@ public class ZonesHandler {
} }
} }
private static Card getTargetCard(Game game, UUID targetId) {
if (game.getCard(targetId) != null) {
return game.getCard(targetId);
}
if (game.getMeldCard(targetId) != null) {
return game.getMeldCard(targetId);
}
if (game.getPermanent(targetId) != null) {
return game.getPermanent(targetId);
}
return null;
}
private static boolean maybeRemoveFromSourceZone(ZoneChangeInfo info, Game game) { private static boolean maybeRemoveFromSourceZone(ZoneChangeInfo info, Game game) {
// Handle Unmelded Cards // Handle Unmelded Cards
if (info instanceof ZoneChangeInfo.Unmelded) { if (info instanceof ZoneChangeInfo.Unmelded) {
@ -185,7 +202,11 @@ public class ZonesHandler {
} }
// Handle all normal cases // Handle all normal cases
ZoneChangeEvent event = info.event; ZoneChangeEvent event = info.event;
Card card = game.getCard(event.getTargetId()); Card card = getTargetCard(game, event.getTargetId());
if (card == null) {
// If we can't find the card we can't remove it.
return false;
}
boolean success = false; boolean success = false;
if (card == null) { if (card == null) {
return success; return success;
@ -200,6 +221,9 @@ public class ZonesHandler {
Permanent permanent; Permanent permanent;
if (card instanceof MeldCard) { if (card instanceof MeldCard) {
permanent = new PermanentMeld(card, event.getPlayerId(), game); permanent = new PermanentMeld(card, event.getPlayerId(), game);
} else if (card instanceof Permanent) {
// This should never happen.
permanent = (Permanent) card;
} else { } else {
permanent = new PermanentCard(card, event.getPlayerId(), game); permanent = new PermanentCard(card, event.getPlayerId(), game);
} }
@ -239,7 +263,7 @@ public class ZonesHandler {
if (success) { if (success) {
if (event.getToZone() == Zone.BATTLEFIELD && event.getTarget() != null) { if (event.getToZone() == Zone.BATTLEFIELD && event.getTarget() != null) {
event.getTarget().updateZoneChangeCounter(game, event); event.getTarget().updateZoneChangeCounter(game, event);
} else { } else if (!(card instanceof Permanent)) {
card.updateZoneChangeCounter(game, event); card.updateZoneChangeCounter(game, event);
} }
} }