SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-2924: Improve handling of Jukeboxes playing nothing.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-12-17 09:45:14 +11:00
parent d69f49d486
commit fe586949bf
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftJukebox.java
View File

@@ -29,7 +29,7 @@ public class CraftJukebox extends CraftBlockState implements Jukebox {
@Override @Override
public Material getPlaying() { public Material getPlaying() {
ItemStack record = jukebox.getRecord(); ItemStack record = jukebox.getRecord();
if (record == null) { if (record.isEmpty()) {
return Material.AIR; return Material.AIR;
} }
return CraftMagicNumbers.getMaterial(record.getItem()); return CraftMagicNumbers.getMaterial(record.getItem());
@@ -39,10 +39,9 @@ public class CraftJukebox extends CraftBlockState implements Jukebox {
public void setPlaying(Material record) { public void setPlaying(Material record) {
if (record == null || CraftMagicNumbers.getItem(record) == null) { if (record == null || CraftMagicNumbers.getItem(record) == null) {
record = Material.AIR; 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()) { if (!isPlaced()) {
return; return;
} }