34 lines
1.8 KiB
Diff
34 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 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 0a0f06d03b01103f0bbe911b0e8c543f9ad53f8a..b61876affd09b4bcd2062fd725b8525edc68b054 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
|
|
@@ -247,7 +247,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.playSound(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 072c56b8a28d850e1171149a34d6b410d5a6fa5a..d59977ab3898c5a615bd3093b3ddd6c07f5e7e58 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;
|
|
}
|