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

- Attempt to fix NPEs related to SpellAbilityRestrictions queried with no activator set for the spell ability.

Browse Source
This commit is contained in:
Agetian
2014-09-17 15:38:19 +00:00
parent e710743a3b
commit d06edd2ed3
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/spellability/AbilityActivated.java
View File

@@ -123,6 +123,14 @@ public abstract class AbilityActivated extends SpellAbility implements java.io.S
public boolean isPossible() { public boolean isPossible() {
//consider activated abilities possible always and simply disable if not currently playable //consider activated abilities possible always and simply disable if not currently playable
//the exception is to consider them not possible if there's a zone or activator restriction that's not met //the exception is to consider them not possible if there's a zone or activator restriction that's not met
// FIXME: Something is potentially leading to hard-to-reproducing conditions where this method is getting called
// with no activator set for the SA. Most likely deserves a better fix in the future.
if (this.getActivatingPlayer() == null) {
this.setActivatingPlayer(this.getHostCard().getController());
System.out.println(this.getHostCard().getName() + " Did not have activator set in AbilityActivated.isPossible");
}
return this.getRestrictions().checkZoneRestrictions(this.getHostCard(), this) && return this.getRestrictions().checkZoneRestrictions(this.getHostCard(), this) &&
this.getRestrictions().checkActivatorRestrictions(this.getHostCard(), this); this.getRestrictions().checkActivatorRestrictions(this.getHostCard(), this);
} }

3
forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
View File

@@ -197,9 +197,6 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
} }
Player activator = sa.getActivatingPlayer(); Player activator = sa.getActivatingPlayer();
if (activator == null) {
return true;
}
Zone cardZone = activator.getGame().getZoneOf(c); Zone cardZone = activator.getGame().getZoneOf(c);
if (cardZone == null || !cardZone.is(this.getZone())) { if (cardZone == null || !cardZone.is(this.getZone())) {