- Fixed NPE caused by Jhoira Avatar

This commit is contained in:
swordshine
2014-04-07 05:06:17 +00:00
parent 8de3157cbe
commit 58f02d0bc1

View File

@@ -393,10 +393,10 @@ public class GameAction {
c = changeZone(zoneFrom, zoneTo, c, position); c = changeZone(zoneFrom, zoneTo, c, position);
if (zoneTo.is(ZoneType.Stack)) { if (zoneFrom == null) {
c.setCastFrom(zoneFrom.getZoneType());
} else if (zoneFrom == null) {
c.setCastFrom(null); c.setCastFrom(null);
} else if (zoneTo.is(ZoneType.Stack)) {
c.setCastFrom(zoneFrom.getZoneType());
} else if (!(zoneTo.is(ZoneType.Battlefield) && zoneFrom.is(ZoneType.Stack))) { } else if (!(zoneTo.is(ZoneType.Battlefield) && zoneFrom.is(ZoneType.Stack))) {
c.setCastFrom(null); c.setCastFrom(null);
} }