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

Merge branch 'ghastNPE' into 'master'

Browse Source 
Fix Shambling Ghast NPE

See merge request core-developers/forge!6469
This commit is contained in:
Hans Mackowiak
2022-04-01 08:49:00 +00:00
parent f2a51a98b6 69f3859c45
commit a9e4e38c9a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ForgeScript.java
View File

@@ -116,10 +116,15 @@ public class ForgeScript {
} }
for (final Trigger trig : cardState.getTriggers()) { for (final Trigger trig : cardState.getTriggers()) {
SpellAbility sa = trig.getOverridingAbility(); SpellAbility sa = trig.getOverridingAbility();
if (sa != null && sa.isManaAbility()) { if (sa != null) {
if (!sa.isTrigger()) {
sa.setTrigger(trig);
}
if (sa.isManaAbility()) {
return true; return true;
} }
} }
}
return false; return false;
} else if (property.equals("hasNonManaActivatedAbility")) { } else if (property.equals("hasNonManaActivatedAbility")) {
for (final SpellAbility sa : cardState.getNonManaAbilities()) { for (final SpellAbility sa : cardState.getNonManaAbilities()) {

3
forge-game/src/main/java/forge/game/TriggerReplacementBase.java
View File

@@ -64,9 +64,6 @@ public abstract class TriggerReplacementBase extends CardTraitBase implements II
* @return the overridingAbility * @return the overridingAbility
*/ */
public SpellAbility getOverridingAbility() { public SpellAbility getOverridingAbility() {
if (overridingAbility != null && !overridingAbility.isTrigger() && this instanceof Trigger) {
overridingAbility.setTrigger((Trigger) this);
}
return this.overridingAbility; return this.overridingAbility;
} }