diff options
author | Wesley Wolfe <weswolf@aol.com> | 2013-08-02 20:05:22 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-08-02 20:05:22 -0500 |
commit | 8a7c582d546eac7554f96a884091266bad236830 (patch) | |
tree | 17d9a731c40d3b2ca8a8a3ec51905ae98517d3d8 /src/main | |
parent | 93cfe3961f985ac9d45030f520480bd37f37bf82 (diff) | |
download | craftbukkit-8a7c582d546eac7554f96a884091266bad236830.tar craftbukkit-8a7c582d546eac7554f96a884091266bad236830.tar.gz craftbukkit-8a7c582d546eac7554f96a884091266bad236830.tar.lz craftbukkit-8a7c582d546eac7554f96a884091266bad236830.tar.xz craftbukkit-8a7c582d546eac7554f96a884091266bad236830.zip |
Ignore null sound by contract. Fixes BUKKIT-4641
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 02c7b8a8..d5d43c9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -259,6 +259,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void playSound(Location loc, Sound sound, float volume, float pitch) { + if (sound == null) { + return; + } playSound(loc, CraftSound.getSound(sound), volume, pitch); } |