From d853ca6615b26198b228f23bb4eaa1a392e474b0 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 11 Jun 2021 12:33:37 +0200 Subject: [PATCH] Fix CostTapType NPE --- forge-game/src/main/java/forge/game/keyword/Hexproof.java | 3 +-- forge-gui/src/main/java/forge/player/HumanCostDecision.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/keyword/Hexproof.java b/forge-game/src/main/java/forge/game/keyword/Hexproof.java index e6a6fce1834..bdd15dd5ca2 100644 --- a/forge-game/src/main/java/forge/game/keyword/Hexproof.java +++ b/forge-game/src/main/java/forge/game/keyword/Hexproof.java @@ -32,6 +32,5 @@ public class Hexproof extends KeywordInstance { } return false; } - - + } diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 4ce3e8492db..6e3920266d5 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -1096,7 +1096,7 @@ public class HumanCostDecision extends CostDecisionMakerBase { c = AbilityUtils.calculateAmount(source, amount, ability); } - if (c == 0) { + if (c != null && c == 0) { return PaymentDecision.number(0); }