Paper/Spigot-Server-Patches/0390-Fix-sounds-when-item-frames-are-modified-MC-123450.patch

37 lines
1.7 KiB
Diff
Raw Normal View History

From fbe26512308005f01514a79f68e76aebbe5a9cec Mon Sep 17 00:00:00 2001
2019-04-27 21:05:20 +02:00
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 816f7ae6b7..3064bce494 100644
2019-04-27 21:05:20 +02:00
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
2019-05-10 21:03:43 +02:00
@@ -211,7 +211,7 @@ public class EntityItemFrame extends EntityHanging {
2019-04-27 21:05:20 +02:00
}
2019-05-10 21:03:43 +02:00
this.getDataWatcher().set(EntityItemFrame.ITEM, itemstack);
2019-04-27 21:05:20 +02:00
- 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 70127520a2..712ec431f0 100644
2019-04-27 21:05:20 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
2019-05-10 21:03:43 +02:00
@@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
2019-04-27 21:05:20 +02:00
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;
}
--
2019-05-10 21:03:43 +02:00
2.21.0
2019-04-27 21:05:20 +02:00