Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-18 13:21:45 +01:00
Code Issues Projects Releases Wiki Activity

Further fix to /npc sound

Browse Source
This commit is contained in:
fullwall 2019-09-17 19:44:43 +08:00
parent 3cef996a24
commit b3589e40f9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -1747,8 +1747,9 @@ public class NPCCommands {
if (deathSound != null && deathSound.isEmpty()) { if (deathSound != null && deathSound.isEmpty()) {
deathSound = "none"; deathSound = "none";
} }
if (!StringUtils.isNullOrEmpty(ambientSound) || !StringUtils.isNullOrEmpty(deathSound) if ((!StringUtils.isNullOrEmpty(ambientSound) && !ambientSound.equals("none"))
|| !StringUtils.isNullOrEmpty(hurtSound)) { || (!StringUtils.isNullOrEmpty(deathSound) && !deathSound.equals("none"))
|| (!StringUtils.isNullOrEmpty(hurtSound) && !hurtSound.equals("none"))) {
npc.data().setPersistent(NPC.SILENT_METADATA, false); npc.data().setPersistent(NPC.SILENT_METADATA, false);
} }
Messaging.sendTr(sender, Messages.SOUND_SET, npc.getName(), ambientSound, hurtSound, deathSound); Messaging.sendTr(sender, Messages.SOUND_SET, npc.getName(), ambientSound, hurtSound, deathSound);