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

- NPE prevention in SpellAbilityRestriction (prevents Jhoira of the Ghitu Avatar crashing)

Browse Source
This commit is contained in:
Agetian
2017-01-30 09:11:29 +00:00
parent f781c2fd0b
commit 40b05f7ad4
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/spellability/SpellAbilityRestriction.java
View File

@@ -227,7 +227,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
if (sa.isSpell()) { if (sa.isSpell()) {
final CardPlayOption o = c.mayPlay(sa.getMayPlay()); final CardPlayOption o = c.mayPlay(sa.getMayPlay());
if (o == null) { if (o == null) {
return this.getZone() == null || cardZone.is(this.getZone()); return this.getZone() == null || (cardZone != null && cardZone.is(this.getZone()));
} else if (o.getPlayer() == activator) { } else if (o.getPlayer() == activator) {
Map<String,String> params = sa.getMayPlay().getMapParams(); Map<String,String> params = sa.getMayPlay().getMapParams();