Fix some bugs with sounds

src/main/java/net/citizensnpcs/commands/NPCCommands.java

@@ -1252,9 +1252,21 @@ public class NPCCommands {
                 hurtSound = args.getFlag("hurt").equals("d") ? null : NMS.getSound(args.getFlag("hurt"));
             }
         }
-        npc.data().setPersistent(NPC.DEATH_SOUND_METADATA, deathSound);
-        npc.data().setPersistent(NPC.HURT_SOUND_METADATA, hurtSound);
-        npc.data().setPersistent(NPC.AMBIENT_SOUND_METADATA, ambientSound);
+        if (deathSound == null) {
+            npc.data().remove(NPC.DEATH_SOUND_METADATA);
+        } else {
+            npc.data().setPersistent(NPC.DEATH_SOUND_METADATA, deathSound);
+        }
+        if (hurtSound == null) {
+            npc.data().remove(NPC.HURT_SOUND_METADATA);
+        } else {
+            npc.data().setPersistent(NPC.HURT_SOUND_METADATA, hurtSound);
+        }
+        if (ambientSound == null) {
+            npc.data().remove(ambientSound);
+        } else {
+            npc.data().setPersistent(NPC.AMBIENT_SOUND_METADATA, ambientSound);
+        }
 
         Messaging.sendTr(sender, Messages.SOUND_SET, npc.getName(), ambientSound, hurtSound, deathSound);
     }

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

@@ -59,12 +59,13 @@ public class BatController extends MobEntityController {
 
         @Override
         protected String aS() {
-            return npc == null ? super.aS() : npc.data().get(NPC.HURT_SOUND_METADATA, super.aS());
+            return npc == null || !npc.data().has(NPC.HURT_SOUND_METADATA) ? super.aS() : npc.data().get(
+                    NPC.HURT_SOUND_METADATA, super.aS());
         }
 
         @Override
         protected String aT() {
-            return npc == null ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT());
+            return npc == null || !npc.data().has(NPC.DEATH_SOUND_METADATA) ? super.aT() : npc.data().get(NPC.DEATH_SOUND_METADATA, super.aT());
         }
 
         @Override
@@ -148,7 +149,7 @@ public class BatController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -135,7 +135,7 @@ public class BlazeController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -177,7 +177,7 @@ public class CaveSpiderController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -174,7 +174,7 @@ public class ChickenController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -177,7 +177,7 @@ public class CowController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -176,7 +176,7 @@ public class CreeperController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -156,7 +156,7 @@ public class EnderDragonController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -192,7 +192,7 @@ public class EndermanController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         private void updateAIWithMovement() {

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

@@ -118,7 +118,7 @@ public class GhastController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -152,7 +152,7 @@ public class GiantController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -175,7 +175,7 @@ public class HorseController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         private void updateAIWithMovement() {

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

@@ -149,7 +149,7 @@ public class IronGolemController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -160,7 +160,7 @@ public class MagmaCubeController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -161,7 +161,7 @@ public class MushroomCowController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -160,7 +160,7 @@ public class OcelotController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -167,7 +167,7 @@ public class PigController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -160,7 +160,7 @@ public class PigZombieController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -160,7 +160,7 @@ public class SheepController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -159,7 +159,7 @@ public class SilverfishController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -150,7 +150,7 @@ public class SkeletonController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -161,7 +161,7 @@ public class SlimeController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -149,7 +149,7 @@ public class SnowmanController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -159,7 +159,7 @@ public class SpiderController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -150,7 +150,7 @@ public class SquidController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -178,7 +178,7 @@ public class VillagerController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -149,7 +149,7 @@ public class WitchController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -128,7 +128,7 @@ public class WitherController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         private void updateAIWithMovement() {

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

@@ -162,7 +162,7 @@ public class WolfController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override

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

@@ -150,7 +150,7 @@ public class ZombieController extends MobEntityController {
 
         @Override
         protected String t() {
-            return npc == null ? super.aS() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
+            return npc == null || !npc.data().has(NPC.AMBIENT_SOUND_METADATA) ? super.t() : npc.data().get(NPC.AMBIENT_SOUND_METADATA, super.t());
         }
 
         @Override