diff options
author | md_5 <git@md-5.net> | 2016-12-17 09:45:14 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-12-17 09:45:14 +1100 |
commit | 217358e8450a083170abe024e22fd1501cb660c6 (patch) | |
tree | 5d5473619d0ac15e27c4bb5e50aed37109455a4e /src | |
parent | 0a6a5cb4ad97482e62f612b56199fb85bffc2171 (diff) | |
download | craftbukkit-217358e8450a083170abe024e22fd1501cb660c6.tar craftbukkit-217358e8450a083170abe024e22fd1501cb660c6.tar.gz craftbukkit-217358e8450a083170abe024e22fd1501cb660c6.tar.lz craftbukkit-217358e8450a083170abe024e22fd1501cb660c6.tar.xz craftbukkit-217358e8450a083170abe024e22fd1501cb660c6.zip |
SPIGOT-2924: Improve handling of Jukeboxes playing nothing.
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java index ebe7a6d0..4df3edf2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java @@ -29,7 +29,7 @@ public class CraftJukebox extends CraftBlockState implements Jukebox { @Override public Material getPlaying() { ItemStack record = jukebox.getRecord(); - if (record == null) { + if (record.isEmpty()) { return Material.AIR; } return CraftMagicNumbers.getMaterial(record.getItem()); @@ -39,10 +39,9 @@ public class CraftJukebox extends CraftBlockState implements Jukebox { public void setPlaying(Material record) { if (record == null || CraftMagicNumbers.getItem(record) == null) { record = Material.AIR; - jukebox.setRecord(null); - } else { - jukebox.setRecord(new ItemStack(CraftMagicNumbers.getItem(record), 1)); } + + jukebox.setRecord(new ItemStack(CraftMagicNumbers.getItem(record), 1)); if (!isPlaced()) { return; } |