From 05e9dbfa9aba6da5dee4997e60e65731d1cca3e5 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.60>
Date: Sat, 2 Dec 2023 09:26:05 +0100
Subject: [PATCH] Clean up

---
 .../src/main/java/forge/game/trigger/Trigger.java   | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java
index 54f8a11e128..c5b1a2daf17 100644
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -627,21 +627,14 @@ public abstract class Trigger extends TriggerReplacementBase {
     }
 
     boolean whileKeywordCheck(final String param, final Map<AbilityKey, Object> runParams) {
-        SpellAbility sa;
-
-        IndividualCostPaymentInstance currentPayment =
-                (IndividualCostPaymentInstance) runParams.get(AbilityKey.IndividualCostPaymentInstance);
+        IndividualCostPaymentInstance currentPayment = (IndividualCostPaymentInstance) runParams.get(AbilityKey.IndividualCostPaymentInstance);
         if (currentPayment != null) {
-            sa = currentPayment.getPayment().getAbility();
-            if (sa != null) {
-                if (matchesValidParam(param, sa)) return true;
-            }
+            if (matchesValidParam(param, currentPayment.getPayment().getAbility())) return true;
         }
 
         CostPaymentStack stack = (CostPaymentStack) runParams.get(AbilityKey.CostStack);
         for (IndividualCostPaymentInstance individual : stack) {
-                sa = individual.getPayment().getAbility();
-                if (matchesValidParam(param, sa)) return true;
+            if (matchesValidParam(param, individual.getPayment().getAbility())) return true;
         }
 
         return false;