This commit is contained in:
Loki 2011-07-14 12:35:01 +03:00
parent 5c62ea27bf
commit 824f53f019

View file

@ -60,15 +60,13 @@ public class ReturnToHandSourceEffect extends OneShotEffect<ReturnToHandSourceEf
if (card != null) { if (card != null) {
switch (game.getZone(card.getId())) { switch (game.getZone(card.getId())) {
case BATTLEFIELD: case BATTLEFIELD:
if (card != null) { Permanent p = game.getPermanent(source.getSourceId());
return card.moveToZone(Zone.HAND, source.getId(), game, false); if (p != null) {
return p.moveToZone(Zone.HAND, source.getId(), game, false);
} }
break; break;
case GRAVEYARD: case GRAVEYARD:
if (card != null) { return card.moveToZone(Zone.HAND, source.getId(), game, true);
return card.moveToZone(Zone.HAND, source.getId(), game, true);
}
break;
} }
} }
return false; return false;