From 0967f05721c4397855d70597ef98d19651ea2a9d Mon Sep 17 00:00:00 2001 From: xenohedron <12538125+xenohedron@users.noreply.github.com> Date: Thu, 18 Dec 2025 00:44:48 -0500 Subject: [PATCH] fix NPE in Evendo Brushrazer (PermanentsSacrificedWatcher) --- Mage.Sets/src/mage/cards/g/GoblinBlastRunner.java | 7 ++----- .../mage/watchers/common/PermanentsSacrificedWatcher.java | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/g/GoblinBlastRunner.java b/Mage.Sets/src/mage/cards/g/GoblinBlastRunner.java index b532381e56d..3371fa82418 100644 --- a/Mage.Sets/src/mage/cards/g/GoblinBlastRunner.java +++ b/Mage.Sets/src/mage/cards/g/GoblinBlastRunner.java @@ -62,12 +62,9 @@ enum GoblinBlastRunnerCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - UUID player = source.getControllerId(); PermanentsSacrificedWatcher watcher = game.getState().getWatcher(PermanentsSacrificedWatcher.class); - if (watcher == null) { - return false; - } - return watcher.getThisTurnSacrificedPermanents(player) != null; + return watcher != null + && !watcher.getThisTurnSacrificedPermanents(source.getControllerId()).isEmpty(); } public static Hint getHint() { diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java index fb3e83d95f0..c6fb4fb1dd5 100644 --- a/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PermanentsSacrificedWatcher.java @@ -44,10 +44,10 @@ public class PermanentsSacrificedWatcher extends Watcher { } public List getThisTurnSacrificedPermanents(UUID playerId) { - return sacrificedPermanents.get(playerId); + return sacrificedPermanents.getOrDefault(playerId, new ArrayList<>()); } public int getThisTurnSacrificedPermanents() { - return sacrificedPermanents.values().stream().mapToInt(permanents -> permanents.size()).sum(); + return sacrificedPermanents.values().stream().mapToInt(List::size).sum(); } }