From 22ef485ab038f863e37a16ac2ebc60f7adfa53b2 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 14 Apr 2020 14:12:11 -0400 Subject: [PATCH 1/4] Fix for NPE --- .../songoda/epicbosses/listeners/during/BossDamageListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java index 61e8df6..c476dd8 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java @@ -81,7 +81,7 @@ public class BossDamageListener implements Listener { player = (Player) shooter; } - if (player == null) return; + if (player == null || activeBossHolder == null) return; double currentDamage = activeBossHolder.getMapOfDamagingUsers().getOrDefault(player.getUniqueId(), 0.0); BossDamageEvent bossDamageEvent = new BossDamageEvent(activeBossHolder, livingEntity, livingEntity.getEyeLocation(), damage); From b7421407cea3126934d0ad429e12ebfebfa09161 Mon Sep 17 00:00:00 2001 From: Brianna Date: Thu, 16 Apr 2020 03:19:05 -0400 Subject: [PATCH 2/4] FIlter out null values in the active minion holder. --- .../songoda/epicbosses/holder/ActiveMinionHolder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java index 0468391..4b904ff 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveMinionHolder.java @@ -8,6 +8,7 @@ import org.bukkit.entity.LivingEntity; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.UUID; import java.util.stream.Collectors; import org.bukkit.entity.Entity; @@ -72,16 +73,16 @@ public class ActiveMinionHolder implements IActiveHolder { // this.livingEntityMap.clear(); // grab list of all valid entities by UUID that can be removed - Map toRemove = this.livingEntityMap.entrySet().stream() - .collect(Collectors.toMap(e -> e.getKey(), e -> ServerUtils.get().getEntity(e.getValue()))) + Map toRemove = this.livingEntityMap.entrySet().stream().filter(Objects::nonNull) + .collect(Collectors.toMap(Map.Entry::getKey, e -> ServerUtils.get().getEntity(e.getValue()))) .entrySet().stream() .filter(e -> e.getValue() != null && e.getValue().getWorld().isChunkLoaded( e.getValue().getLocation().getBlockX() >> 4, e.getValue().getLocation().getBlockZ() >> 4)) - .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue())); + .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); // remove everything we can - toRemove.entrySet().stream().forEach(e -> { + toRemove.entrySet().forEach(e -> { e.getValue().remove(); livingEntityMap.remove(e.getKey()); }); From 53a06bd519885e7475ef1f488d89e4227f42a84e Mon Sep 17 00:00:00 2001 From: Brianna Date: Thu, 16 Apr 2020 03:24:37 -0400 Subject: [PATCH 3/4] Handle ItemStack fails. --- .../utils/itemstack/ItemStackHolderConverter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java index ab8d495..39cc816 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/itemstack/ItemStackHolderConverter.java @@ -4,7 +4,6 @@ import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.epicbosses.utils.IConverter; import com.songoda.epicbosses.utils.exceptions.NotImplementedException; import com.songoda.epicbosses.utils.itemstack.holder.ItemStackHolder; -import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import java.util.List; @@ -24,7 +23,11 @@ public class ItemStackHolderConverter implements IConverter Date: Thu, 16 Apr 2020 03:26:49 -0400 Subject: [PATCH 4/4] version 1.2.11 --- api-modules/FactionsM/pom.xml | 2 +- api-modules/FactionsOne/pom.xml | 2 +- api-modules/FactionsUUID/pom.xml | 2 +- api-modules/LegacyFactions/pom.xml | 2 +- plugin-modules/Core/pom.xml | 2 +- plugin-modules/FactionHelper/pom.xml | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api-modules/FactionsM/pom.xml b/api-modules/FactionsM/pom.xml index 8032fe1..8f62a96 100644 --- a/api-modules/FactionsM/pom.xml +++ b/api-modules/FactionsM/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.10 + 1.2.11 ../../pom.xml 4.0.0 diff --git a/api-modules/FactionsOne/pom.xml b/api-modules/FactionsOne/pom.xml index 205a7df..3abd6a1 100644 --- a/api-modules/FactionsOne/pom.xml +++ b/api-modules/FactionsOne/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.10 + 1.2.11 ../../pom.xml 4.0.0 diff --git a/api-modules/FactionsUUID/pom.xml b/api-modules/FactionsUUID/pom.xml index ab2d452..1188259 100644 --- a/api-modules/FactionsUUID/pom.xml +++ b/api-modules/FactionsUUID/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.10 + 1.2.11 ../../pom.xml 4.0.0 diff --git a/api-modules/LegacyFactions/pom.xml b/api-modules/LegacyFactions/pom.xml index 1b25276..c97b28b 100644 --- a/api-modules/LegacyFactions/pom.xml +++ b/api-modules/LegacyFactions/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.10 + 1.2.11 ../../pom.xml 4.0.0 diff --git a/plugin-modules/Core/pom.xml b/plugin-modules/Core/pom.xml index 5a8dfa9..daa5ae8 100644 --- a/plugin-modules/Core/pom.xml +++ b/plugin-modules/Core/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.10 + 1.2.11 ../../pom.xml 4.0.0 diff --git a/plugin-modules/FactionHelper/pom.xml b/plugin-modules/FactionHelper/pom.xml index 1369b66..6f2fa60 100644 --- a/plugin-modules/FactionHelper/pom.xml +++ b/plugin-modules/FactionHelper/pom.xml @@ -5,7 +5,7 @@ EpicBosses com.songoda.epicbosses - 1.2.10 + 1.2.11 ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 5a141d7..c82b286 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.songoda.epicbosses EpicBosses pom - 1.2.10 + 1.2.11 api-modules/FactionsM @@ -16,7 +16,7 @@ - 1.2.10 + 1.2.11 EpicBosses com.songoda.epicbosses.EpicBosses Songoda