Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-29 15:47:40 +02:00
Code Issues Projects Releases Wiki Activity

Fix /npc sound -n bug

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

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

@ -37,6 +37,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.mysql.jdbc.StringUtils;
import net.citizensnpcs.Citizens; import net.citizensnpcs.Citizens;
import net.citizensnpcs.Settings.Setting; import net.citizensnpcs.Settings.Setting;
@ -1746,7 +1747,8 @@ public class NPCCommands {
if (deathSound != null && deathSound.isEmpty()) { if (deathSound != null && deathSound.isEmpty()) {
deathSound = "none"; deathSound = "none";
} }
if (ambientSound != null || deathSound != null || hurtSound != null) { if (!StringUtils.isNullOrEmpty(ambientSound) || !StringUtils.isNullOrEmpty(deathSound)
|| !StringUtils.isNullOrEmpty(hurtSound)) {
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);