Protects NPCs from being removed at login or /island

May also help with tastybento/ASkyBlock-Bugs-N-Features#473
tastybento · Nov 4, 2017 · 0bdc659 · 0bdc659
1 parent 4c9d1e4
commit 0bdc659
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/com/wasteofplastic/askyblock/GridManager.java b/src/com/wasteofplastic/askyblock/GridManager.java
@@ -1591,16 +1591,11 @@ public void removeMobs(final Location l) {
                 if (c.isLoaded()) {
                     for (final Entity e : c.getEntities()) {
                         //plugin.getLogger().info("DEBUG: " + e.getType());
-
+                        // Don't remove if the entity is an NPC or has a name tag
+                        if (e.getCustomName() != null || e.hasMetadata("NPC"))
+                            continue;
                         if (e instanceof Monster && !Settings.mobWhiteList.contains(e.getType())) {
-                            Monster monster = (Monster)e;
-                            //plugin.getLogger().info("DEBUG: monster found. custom name is '" + monster.getCustomName() + "'");
-                            //plugin.getLogger().info("DEBUG: remove when far away = " + monster.getRemoveWhenFarAway());
-
-                            // Don't remove if the monster has a name tag
-                            if (monster.getCustomName() == null || monster.getRemoveWhenFarAway()) {
-                                e.remove();
-                            }
+                            e.remove();
                         }
                     }
                 }