Merge pull request #1000 from ImYenil/Fix-NPCRemoveEvent-NullPointerE…

…xception- Fixed NullPointerException error in NPCRemoveEvent event
andrei1058 · Apr 20, 2024 · 89129b2 · 89129b2
2 parents 3895fd0 + 1f5a2ff
commit 89129b2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/citizens/CitizensListener.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/support/citizens/CitizensListener.java
@@ -44,6 +44,8 @@ public class CitizensListener implements Listener {
     @EventHandler
     public void removeNPC(NPCRemoveEvent e) {
         if (e == null) return;
+        if (e.getNPC() == null) return;
+        if (e.getNPC().getEntity() == null) return;
         List<String> locations = BedWars.config.getYml().getStringList(ConfigPath.GENERAL_CONFIGURATION_NPC_LOC_STORAGE);
         boolean removed = false;
         if (JoinNPC.npcs.containsKey(e.getNPC().getId())) {