57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes: 77fd87e4 SPIGOT-2304: Implement LootGenerateEvent a1a705ee SPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent 41712edd SPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
36 lines
1.7 KiB
Diff
36 lines
1.7 KiB
Diff
From 6d6002de9471b8642c27bbb0117d32aad673952f Mon Sep 17 00:00:00 2001
|
|
From: Phoenix616 <mail@moep.tv>
|
|
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 9b1e07452f..f8a2f32f1d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
|
|
@@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging {
|
|
}
|
|
|
|
this.getDataWatcher().set(EntityItemFrame.ITEM, 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 2873ff9d1f..a3613edcbb 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
|
|
@@ -49,7 +49,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.26.2
|
|
|