external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed NPE caused by Jhoira Avatar

Browse Source
This commit is contained in:
swordshine
2014-04-07 05:06:17 +00:00
parent 8de3157cbe
commit 58f02d0bc1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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