From d202278ccd6876f8113d26951e6bd018f6e9b792 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 13 Jun 2021 10:13:41 -0400 Subject: [PATCH] change to containsKey method to prevent stream exceptions (fixes #7904, fixes #7880, fixes #7844, fixes #7810, fixes #7805, fixes #7675, fixes #7669, fixes #7654, fixes #7651) --- Mage/src/main/java/mage/abilities/AbilitiesImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java index 2c69d020bf4..0bab0434c01 100644 --- a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java @@ -261,7 +261,15 @@ public class AbilitiesImpl extends ArrayList implements Ab @Override public boolean containsKey(UUID abilityId) { // TODO: remove - return stream().map(T::getId).anyMatch(abilityId::equals); + if (abilityId == null) { + return false; + } + for (T ability : this) { + if (ability != null && abilityId.equals(ability.getId())) { + return true; + } + } + return false; } @Override