diff options
| author | Phoenix616 <[email protected]> | 2019-04-27 20:05:20 +0100 |
|---|---|---|
| committer | Phoenix616 <[email protected]> | 2019-04-27 20:05:20 +0100 |
| commit | 1183f1aa1e46e3e688e80932adb69e60eb96854e (patch) | |
| tree | 877624c41de3607797c96a2fbcd44d38d223fcc4 | |
| parent | fb25dc17c62acce335346d5e96899257ae7230c7 (diff) | |
| download | Paper-1183f1aa1e46e3e688e80932adb69e60eb96854e.tar.gz Paper-1183f1aa1e46e3e688e80932adb69e60eb96854e.zip | |
Fix itemframe sound on change
| -rw-r--r-- | Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch new file mode 100644 index 0000000000..c35e847aef --- /dev/null +++ b/Spigot-Server-Patches/0441-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -0,0 +1,36 @@ +From f175505ce0a62b77390a9d7c83dfa52c309287a3 Mon Sep 17 00:00:00 2001 +From: Phoenix616 <[email protected]> +Date: Sat, 27 Apr 2019 20:00:43 +0100 +Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) + +This also fixes the adding sound playing when the item frame direction is changed. + +diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java +index 964509a3..1b1e0838 100644 +--- a/src/main/java/net/minecraft/server/EntityItemFrame.java ++++ b/src/main/java/net/minecraft/server/EntityItemFrame.java +@@ -186,7 +186,7 @@ public class EntityItemFrame extends EntityHanging { + } + + this.getDataWatcher().set(EntityItemFrame.e, itemstack); +- if (!itemstack.isEmpty() && playSound) { // CraftBukkit ++ if (!itemstack.isEmpty() && flag && playSound) { // CraftBukkit // Paper - only play sound when update flag is set + this.a(SoundEffects.ENTITY_ITEM_FRAME_ADD_ITEM, 1.0F, 1.0F); + } + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +index 227a9ffa..d6328d2f 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +@@ -51,7 +51,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { + old.die(); + + EntityItemFrame frame = new EntityItemFrame(world,position,direction); +- frame.setItem(item); ++ frame.setItem(item, true, false); // Paper - fix itemframe sound + world.addEntity(frame); + this.entity = frame; + } +-- +2.18.0.windows.1 + |