From 5ccf038a902f2697a683f165e8669d15a2838f47 Mon Sep 17 00:00:00 2001
From: tool4ever <therealtoolkit@hotmail.com>
Date: Thu, 29 Jun 2023 21:40:36 +0200
Subject: [PATCH] Fix logic (#3365)

---
 forge-ai/src/main/java/forge/ai/ability/AttachAi.java          | 3 ++-
 .../src/main/java/forge/game/trigger/TriggerTapsForMana.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
index 2934c81f317..568d28afe14 100644
--- a/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/AttachAi.java
@@ -2,6 +2,7 @@ package forge.ai.ability;
 
 import java.util.*;
 
+import org.apache.commons.lang3.ObjectUtils;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -1260,7 +1261,7 @@ public class AttachAi extends SpellAbilityAi {
         // TODO Somehow test for definitive advantage (e.g. opponent low on health, AI is attacking)
         // to be able to deal the final blow with an enchanted vehicle like that
         boolean canOnlyTargetCreatures = true;
-        for (String valid : attachSource.getFirstAttachSpell().getTargetRestrictions().getValidTgts()) {
+        for (String valid : ObjectUtils.firstNonNull(attachSource.getFirstAttachSpell(), sa).getTargetRestrictions().getValidTgts()) {
             if (!valid.startsWith("Creature")) {
                 canOnlyTargetCreatures = false;
                 break;
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
index b2c1d1e2a13..c2cc270f86e 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
@@ -75,7 +75,7 @@ public class TriggerTapsForMana extends Trigger {
                     return false;
                 }
             } else if (!produced.contains(MagicColor.toShortString(this.getParam("Produced")))) {
-                    return false;
+                return false;
             }
         }