mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-05 03:04:51 +02:00
e4633ca277
Upstream has released updates that appear 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: f4a9ed36 SPIGOT-6273: Expose ItemFrame ItemDropChance through API CraftBukkit Changes: 72c5e7477 SPIGOT-6273: Expose ItemFrame ItemDropChance through API
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 d243cc10da6c6d1a66587aa1c21743d00f058f84..661db537f6ac2b5a80e2e40a25966a2e3039199d 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 ee9035cefcc406ecf2ab028f91640ad964948acf..67ce1d413526d39d3f63f96f38ad4fafd582a05b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
|
|
@@ -50,7 +50,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;
|
|
}
|