3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 11:30:06 +01:00
Paper/Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch

34 Zeilen
1.8 KiB
Diff

From 0000000000000000000000000000000000000000 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 d243cc10da6c6d1a66587aa1c21743d00f058f84..661db537f6ac2b5a80e2e40a25966a2e3039199d 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
2020-06-25 16:09:55 +02:00
@@ -247,7 +247,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
2020-06-25 16:09:55 +02:00
this.playSound(SoundEffects.ENTITY_ITEM_FRAME_ADD_ITEM, 1.0F, 1.0F);
2019-04-27 21:05:20 +02:00
}
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
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
@@ -50,7 +50,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);
2019-04-27 21:05:20 +02:00
- frame.setItem(item);
+ frame.setItem(item, true, false); // Paper - fix itemframe sound
world.addEntity(frame);
this.entity = frame;
}