Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 00:47:38 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
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
This commit is contained in:
Aikar 2020-12-27 17:07:01 -05:00
parent a23be44da0
commit e4633ca277
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0347-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
View File

@ -6,7 +6,7 @@ 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 bc8c007fc819335d9a8a464c01774e15dc18b7c6..16c8f2cdf7120337bec6f1d28822f3219c7d2d8f 100644
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 {
@ -19,10 +19,10 @@ index bc8c007fc819335d9a8a464c01774e15dc18b7c6..16c8f2cdf7120337bec6f1d28822f321
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
index 072c56b8a28d850e1171149a34d6b410d5a6fa5a..d59977ab3898c5a615bd3093b3ddd6c07f5e7e58 100644
index ee9035cefcc406ecf2ab028f91640ad964948acf..67ce1d413526d39d3f63f96f38ad4fafd582a05b 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 {
@@ -50,7 +50,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
old.die();
EntityItemFrame frame = new EntityItemFrame(world, position, direction);

2
work/Bukkit

@ -1 +1 @@
Subproject commit 6f9fe1d936fa2183170de5ff95ee6832dac788c3
Subproject commit f4a9ed36c2d9276713078ea0ae92e47e23a2f828

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 9f2b92e58e3f2ca2ee7c701be67f487611914df1
Subproject commit 72c5e7477a09856c6759bc33b5667a7ff9b926cb