From 355b46e57394265a7d519d18242998803c939275 Mon Sep 17 00:00:00 2001 From: fullwall Date: Thu, 22 May 2014 09:11:44 +0800 Subject: [PATCH] Fix some bugs with sounds --- .../net/citizensnpcs/commands/NPCCommands.java | 18 +++++++++++++++--- .../citizensnpcs/npc/entity/BatController.java | 7 ++++--- .../npc/entity/BlazeController.java | 2 +- .../npc/entity/CaveSpiderController.java | 2 +- .../npc/entity/ChickenController.java | 2 +- .../citizensnpcs/npc/entity/CowController.java | 2 +- .../npc/entity/CreeperController.java | 2 +- .../npc/entity/EnderDragonController.java | 2 +- .../npc/entity/EndermanController.java | 2 +- .../npc/entity/GhastController.java | 2 +- .../npc/entity/GiantController.java | 2 +- .../npc/entity/HorseController.java | 2 +- .../npc/entity/IronGolemController.java | 2 +- .../npc/entity/MagmaCubeController.java | 2 +- .../npc/entity/MushroomCowController.java | 2 +- .../npc/entity/OcelotController.java | 2 +- .../citizensnpcs/npc/entity/PigController.java | 2 +- .../npc/entity/PigZombieController.java | 2 +- .../npc/entity/SheepController.java | 2 +- .../npc/entity/SilverfishController.java | 2 +- .../npc/entity/SkeletonController.java | 2 +- .../npc/entity/SlimeController.java | 2 +- .../npc/entity/SnowmanController.java | 2 +- .../npc/entity/SpiderController.java | 2 +- .../npc/entity/SquidController.java | 2 +- .../npc/entity/VillagerController.java | 2 +- .../npc/entity/WitchController.java | 2 +- .../npc/entity/WitherController.java | 2 +- .../npc/entity/WolfController.java | 2 +- .../npc/entity/ZombieController.java | 2 +- 30 files changed, 47 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/src/main/java/net/citizensnpcs/commands/NPCCommands.java index cd6b726c0..24c830167 100644 --- a/src/main/java/net/citizensnpcs/commands/NPCCommands.java +++ b/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); } diff --git a/src/main/java/net/citizensnpcs/npc/entity/BatController.java b/src/main/java/net/citizensnpcs/npc/entity/BatController.java index 228ecc841..1286cd474 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BatController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java b/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java index da1c55d41..f964185ed 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/BlazeController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java index a1e84aaa1..e1fd7961c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CaveSpiderController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java b/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java index 2c4b1d3ef..654e1b172 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ChickenController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/CowController.java b/src/main/java/net/citizensnpcs/npc/entity/CowController.java index eaaa127aa..9e646ba0b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CowController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java b/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java index 97773ee2c..cc198ab5c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/CreeperController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java b/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java index 8e24b8506..8a0494f9d 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EnderDragonController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java b/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java index cd54dff24..fae0bddc9 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/EndermanController.java +++ b/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() { diff --git a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java b/src/main/java/net/citizensnpcs/npc/entity/GhastController.java index a6ed92b95..09fdee562 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GhastController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java b/src/main/java/net/citizensnpcs/npc/entity/GiantController.java index 55aec80b7..f77d3003f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/GiantController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java b/src/main/java/net/citizensnpcs/npc/entity/HorseController.java index f98e16895..31ffa9639 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/HorseController.java +++ b/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() { diff --git a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java b/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java index 24ce03828..529e9297b 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/IronGolemController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java index 872aebee8..0c80f4f60 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java b/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java index 522ed2402..36f9151c1 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/MushroomCowController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java b/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java index 6ed12b97d..228874028 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/OcelotController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigController.java b/src/main/java/net/citizensnpcs/npc/entity/PigController.java index 93d745614..9a761e78e 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java index dc43f75b5..42312506d 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/PigZombieController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java b/src/main/java/net/citizensnpcs/npc/entity/SheepController.java index 0bf12834c..6a7307db2 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SheepController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java b/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java index 2db4039a5..02d0c443a 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SilverfishController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java b/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java index b45ad970e..6b5f106b8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SkeletonController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java index f5ea9bd76..b378b3a8f 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java index 3bbe149f6..76e4c86f8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java b/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java index cd61f25d8..c6086142c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SpiderController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java b/src/main/java/net/citizensnpcs/npc/entity/SquidController.java index 2290e1876..5f71c2453 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/SquidController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java b/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java index 01b8960e6..51d73a5b0 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/VillagerController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java b/src/main/java/net/citizensnpcs/npc/entity/WitchController.java index b8a016642..7971ebac8 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitchController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java b/src/main/java/net/citizensnpcs/npc/entity/WitherController.java index d8fdb2a33..b24e9f96c 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WitherController.java +++ b/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() { diff --git a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java b/src/main/java/net/citizensnpcs/npc/entity/WolfController.java index dd684dbe2..a68a66171 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/WolfController.java +++ b/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 diff --git a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java b/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java index e139a4aca..59b363f7d 100644 --- a/src/main/java/net/citizensnpcs/npc/entity/ZombieController.java +++ b/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