From b4510233aa4b4256c2faa247545af0b8e79d8c2c Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Thu, 20 May 2021 11:40:08 +0100
Subject: [PATCH] Fixed potential NPE

---
 .../main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
index fde3f4f..a01eb2e 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
@@ -150,8 +150,9 @@ public class LivingEcoBoss extends PluginDependent {
             for (Effect effect : effects) {
                 effect.onDeath(boss, entity, tick);
             }
-            boss.removeLivingBoss(entity.getUniqueId());
+            boss.removeLivingBoss(uuid);
             runnable.cancel();
+            return;
         }
 
         for (BossTicker ticker : tickers) {