Better overriding of persistent check

src/main/java/net/citizensnpcs/EventListen.java

@@ -120,12 +120,17 @@ public class EventListen implements Listener {
                 continue;
             if (!npc.despawn(DespawnReason.CHUNK_UNLOAD)) {
                 event.setCancelled(true);
+                if (Messaging.isDebugging()) {
                     Messaging.debug("Cancelled chunk unload at [" + coord.x + "," + coord.z + "]");
+                }
                 respawnAllFromCoord(coord);
                 return;
             }
             toRespawn.put(coord, npc);
-            Messaging.debug("Despawned id", npc.getId(), "due to chunk unload at [" + coord.x + "," + coord.z + "]");
+            if (Messaging.isDebugging()) {
+                Messaging
+                        .debug("Despawned id", npc.getId(), "due to chunk unload at [" + coord.x + "," + coord.z + "]");
+            }
         }
     }
 
@@ -322,19 +327,25 @@ public class EventListen implements Listener {
             NPC npc = ids.get(i);
             boolean success = spawn(npc);
             if (!success) {
-                Messaging.debug("Couldn't respawn id", npc.getId(), "during chunk event at [" + coord.x + "," + coord.z
+                if (Messaging.isDebugging()) {
-                        + "]");
+                    Messaging.debug("Couldn't respawn id", npc.getId(), "during chunk event at [" + coord.x + ","
+                            + coord.z + "]");
+                }
                 continue;
             }
             ids.remove(i--);
+            if (Messaging.isDebugging()) {
                 Messaging.debug("Spawned id", npc.getId(), "due to chunk event at [" + coord.x + "," + coord.z + "]");
             }
         }
+    }
 
     private boolean spawn(NPC npc) {
         Location spawn = npc.getTrait(CurrentLocation.class).getLocation();
         if (spawn == null) {
+            if (Messaging.isDebugging()) {
                 Messaging.debug("Couldn't find a spawn location for despawned NPC id", npc.getId());
+            }
             return false;
         }
         return npc.spawn(spawn);
@@ -389,9 +400,7 @@ public class EventListen implements Listener {
         @Override
         public int hashCode() {
             final int prime = 31;
-            int result = prime + ((worldName == null) ? 0 : worldName.hashCode());
+            return prime * (prime * (prime + ((worldName == null) ? 0 : worldName.hashCode())) + x) + z;
-            result = prime * result + x;
-            return prime * result + z;
         }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/BatController.java

@@ -142,11 +142,6 @@ public class BatController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         public void setFlying(boolean flying) {
             a(flying);
         }
@@ -155,5 +150,12 @@ public class BatController extends MobEntityController {
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/BlazeController.java

@@ -133,14 +133,16 @@ public class BlazeController extends MobEntityController {
             return npc;
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java

@@ -175,14 +175,16 @@ public class CaveSpiderController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/ChickenController.java

@@ -161,14 +161,16 @@ public class ChickenController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/CowController.java

@@ -164,14 +164,16 @@ public class CowController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/CreeperController.java

@@ -170,11 +170,6 @@ public class CreeperController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         public void setAllowPowered(boolean allowPowered) {
             this.allowPowered = allowPowered;
         }
@@ -183,5 +178,12 @@ public class CreeperController extends MobEntityController {
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java

@@ -154,14 +154,16 @@ public class EnderDragonController extends MobEntityController {
             return npc;
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/EndermanController.java

@@ -182,11 +182,6 @@ public class EndermanController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected boolean k(double d1, double d2, double d3) {
             if (npc == null) {
@@ -224,5 +219,12 @@ public class EndermanController extends MobEntityController {
                 jumpTicks--;
             }
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 }

src/main/java/net/citizensnpcs/npc/entity/GhastController.java

@@ -117,13 +117,15 @@ public class GhastController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/GiantController.java

@@ -151,13 +151,15 @@ public class GiantController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/HorseController.java

@@ -162,11 +162,6 @@ public class HorseController extends MobEntityController {
             }
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
@@ -197,6 +192,13 @@ public class HorseController extends MobEntityController {
                 jumpTicks--;
             }
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 
     public static class HorseNPC extends CraftHorse implements NPCHolder {

src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java

@@ -148,13 +148,15 @@ public class IronGolemController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java

@@ -159,13 +159,15 @@ public class MagmaCubeController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java

@@ -149,13 +149,15 @@ public class MushroomCowController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/OcelotController.java

@@ -149,13 +149,15 @@ public class OcelotController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/PigController.java

@@ -155,13 +155,15 @@ public class PigController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java

@@ -159,13 +159,15 @@ public class PigZombieController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SheepController.java

@@ -149,13 +149,15 @@ public class SheepController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java

@@ -158,13 +158,15 @@ public class SilverfishController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java

@@ -148,13 +148,15 @@ public class SkeletonController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SlimeController.java

@@ -160,13 +160,15 @@ public class SlimeController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java

@@ -148,13 +148,15 @@ public class SnowmanController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SpiderController.java

@@ -158,13 +158,15 @@ public class SpiderController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/SquidController.java

@@ -149,13 +149,15 @@ public class SquidController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/VillagerController.java

@@ -161,11 +161,6 @@ public class VillagerController extends MobEntityController {
             return blockTrades;
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         public void setBlockTrades(boolean blocked) {
             this.blockTrades = blocked;
         }
@@ -174,6 +169,13 @@ public class VillagerController extends MobEntityController {
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 
     public static class VillagerNPC extends CraftVillager implements NPCHolder {

src/main/java/net/citizensnpcs/npc/entity/WitchController.java

@@ -148,13 +148,15 @@ public class WitchController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/WitherController.java

@@ -126,11 +126,6 @@ public class WitherController extends MobEntityController {
             return npc;
         }
 
-        @Override
-        protected boolean isTypeNotPersistent() {
-            return npc == null ? super.isTypeNotPersistent() : false;
-        }
-
         @Override
         protected String t() {
             return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
@@ -161,6 +156,13 @@ public class WitherController extends MobEntityController {
                 jumpTicks--;
             }
         }
+
+        @Override
+        protected void w() {
+            if (npc == null) {
+                super.w();
+            }
+        }
     }
 
     public static class WitherNPC extends CraftWither implements NPCHolder {

src/main/java/net/citizensnpcs/npc/entity/WolfController.java

@@ -150,13 +150,15 @@ public class WolfController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }
 

src/main/java/net/citizensnpcs/npc/entity/ZombieController.java

@@ -149,13 +149,15 @@ public class ZombieController extends MobEntityController {
         }
 
         @Override
-        protected boolean isTypeNotPersistent() {
+        protected String t() {
-            return npc == null ? super.isTypeNotPersistent() : false;
+            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override
-        protected String t() {
+        protected void w() {
-            return npc == null ? super.aT() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            if (npc == null) {
+                super.w();
+            }
         }
     }