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

Fix NPE when moving commander created by ApiBased SA (e.g. Hogaak)

Browse Source
This commit is contained in:
tool4EvEr
2021-10-20 00:06:56 +02:00
parent dc3c117ba8
commit 3b2ca119db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1508,7 +1508,7 @@ public class GameAction {
c.getGame().getTracker().flush(); c.getGame().getTracker().flush();
c.setMoveToCommandZone(false); c.setMoveToCommandZone(false);
if (c.getOwner().getController().confirmAction(c.getSpellPermanent(), PlayerActionConfirmMode.ChangeZoneToAltDestination, c.getName() + ": If a commander is in a graveyard or in exile and that card was put into that zone since the last time state-based actions were checked, its owner may put it into the command zone.")) { if (c.getOwner().getController().confirmAction(c.getFirstSpellAbility(), PlayerActionConfirmMode.ChangeZoneToAltDestination, c.getName() + ": If a commander is in a graveyard or in exile and that card was put into that zone since the last time state-based actions were checked, its owner may put it into the command zone.")) {
moveTo(c.getOwner().getZone(ZoneType.Command), c, null); moveTo(c.getOwner().getZone(ZoneType.Command), c, null);
return true; return true;
} }

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

@@ -216,7 +216,7 @@ public final class AbilityFactory {
else if (api == ApiType.PermanentCreature || api == ApiType.PermanentNoncreature) { else if (api == ApiType.PermanentCreature || api == ApiType.PermanentNoncreature) {
// If API is a permanent type, and creating AF Spell // If API is a permanent type, and creating AF Spell
// Clear out the auto created SpellPemanent spell // Clear out the auto created SpellPermanent spell
if (type == AbilityRecordType.Spell if (type == AbilityRecordType.Spell
&& !mapParams.containsKey("SubAbility") && !mapParams.containsKey("NonBasicSpell")) { && !mapParams.containsKey("SubAbility") && !mapParams.containsKey("NonBasicSpell")) {
hostCard.clearFirstSpell(); hostCard.clearFirstSpell();