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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2023-12-02 09:26:05 +01:00
parent 76cc51121c
commit 05e9dbfa9a
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -627,21 +627,14 @@ public abstract class Trigger extends TriggerReplacementBase {
} }
boolean whileKeywordCheck(final String param, final Map<AbilityKey, Object> runParams) { 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) { if (currentPayment != null) {
sa = currentPayment.getPayment().getAbility(); if (matchesValidParam(param, currentPayment.getPayment().getAbility())) return true;
if (sa != null) {
if (matchesValidParam(param, sa)) return true;
}
} }
CostPaymentStack stack = (CostPaymentStack) runParams.get(AbilityKey.CostStack); CostPaymentStack stack = (CostPaymentStack) runParams.get(AbilityKey.CostStack);
for (IndividualCostPaymentInstance individual : stack) { for (IndividualCostPaymentInstance individual : stack) {
sa = individual.getPayment().getAbility(); if (matchesValidParam(param, individual.getPayment().getAbility())) return true;
if (matchesValidParam(param, sa)) return true;
} }
return false; return false;