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/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());
});
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);
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
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