SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a npe

Browse Source
This commit is contained in:
Andrew 2013-07-23 02:06:19 +12:00
parent af6e6a1aa9
commit 6ae7d703b0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/me/libraryaddict/disguise/DisguiseTypes/DisguiseSound.java
View File

@ -159,7 +159,8 @@ public enum DisguiseSound {
public SoundType getType(String name, boolean ignoreDamage) { public SoundType getType(String name, boolean ignoreDamage) {
if (isCancelSound(name)) if (isCancelSound(name))
return SoundType.CANCEL; return SoundType.CANCEL;
if (disguiseSounds.get(SoundType.STEP).startsWith("step.") && name.startsWith("step.")) if (disguiseSounds.containsKey(SoundType.STEP) && disguiseSounds.get(SoundType.STEP).startsWith("step.")
&& name.startsWith("step."))
return SoundType.STEP; return SoundType.STEP;
for (SoundType type : SoundType.values()) { for (SoundType type : SoundType.values()) {
if (!disguiseSounds.containsKey(type) || type == SoundType.DEATH || (ignoreDamage && type == SoundType.HURT)) if (!disguiseSounds.containsKey(type) || type == SoundType.DEATH || (ignoreDamage && type == SoundType.HURT))