mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 15:08:27 +02:00
SPIGOT-2924: Improve handling of Jukeboxes playing nothing.
This commit is contained in:
parent
0a6a5cb4ad
commit
217358e845
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user