Merge branch 'master' into ver/1.14

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

@@ -0,0 +1,36 @@
+From 7f0c00a99054e83c7b46e49338c063f162c4b196 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 816f7ae6b..3064bce49 100644
+--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
++++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
+@@ -211,7 +211,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 70127520a..712ec431f 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.21.0
+