From dc9a7fdfadcee5c6eef1a8d4c907f9072117cdbf 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