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

- Prevent NPE when the spell is countered.

Browse Source
This commit is contained in:
swordshine
2014-02-17 04:33:58 +00:00
parent 8cbab3a5a7
commit 83a1b4f35e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/ControlSpellEffect.java
View File

@@ -69,7 +69,7 @@ public class ControlSpellEffect extends SpellAbilityEffect {
GameObject obj = Iterables.getFirst(getDefinedOrTargeted(sa, "DefinedExchange"), null); GameObject obj = Iterables.getFirst(getDefinedOrTargeted(sa, "DefinedExchange"), null);
if (obj instanceof Card) { if (obj instanceof Card) {
Card c = (Card)obj; Card c = (Card)obj;
if (!(c.isInZone(ZoneType.Battlefield))) { if (!(c.isInZone(ZoneType.Battlefield)) || si == null) {
// Exchanging object isn't available, continue // Exchanging object isn't available, continue
continue; continue;
} }