diff options
| author | Nassim Jahnke <[email protected]> | 2022-10-02 09:56:36 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-02 09:56:36 +0200 |
| commit | 928bcc8d3a058221146cea1de7d42d7e178e78f2 (patch) | |
| tree | fdb518a8812097f983c41d36ea693baf5c208554 /patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch | |
| parent | ec3cfa9b7f147cf097692144f665893748fadc3b (diff) | |
| download | Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.tar.gz Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8430)
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:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events
CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
Diffstat (limited to 'patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch')
| -rw-r--r-- | patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch new file mode 100644 index 0000000000..8f80e7c151 --- /dev/null +++ b/patches/server/0316-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Phoenix616 <[email protected]> +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/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +index 11638d21d509518809b4d992165913ffec315328..ac0fe310b01506b3b2a767d47f65cefb57f58c7d 100644 +--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java ++++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +@@ -327,7 +327,7 @@ public class ItemFrame extends HangingEntity { + + this.onItemChanged(itemstack); + this.getEntityData().set(ItemFrame.DATA_ITEM, itemstack); +- if (!itemstack.isEmpty() && playSound) { // CraftBukkit ++ if (!itemstack.isEmpty() && flag && playSound) { // CraftBukkit // Paper - only play sound when update flag is set + this.playSound(this.getAddItemSound(), 1.0F, 1.0F); + } + |