Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d1a72ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11405)
PaperMC/Paper@0a53f1d Set default drop behavior for player deaths (#11380)
PaperMC/Paper@951e7dd Fix TrialSpawner forgetting assigned mob when placed by player (#11381)
PaperMC/Paper@13a2395 Fix enable-player-collisions playing sounds when set to false (#11390)
This commit is contained in:
granny
2024-09-15 20:18:23 -07:00
parent bc7bcbb8dd
commit 8af4ea6f46
30 changed files with 103 additions and 103 deletions

View File

@@ -36,10 +36,10 @@ index 2e45bc48c8a86d9522e4574bf3037611cfda63a3..98fd4d8aab273ab86bcb9b95a331cd8b
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7267591a31bcfc4a42d5bca99b1f2677bd1253cc..16c98e031ead4a8ea03d44842fc557204055c942 100644
index c13922d2fb1c15f895b14d4cb6d5379b59ea1ef8..fbfcd1bd4f6bbaef2d5eb4b5f4c286b343ffb294 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1021,6 +1021,20 @@ public abstract class PlayerList {
@@ -1026,6 +1026,20 @@ public abstract class PlayerList {
}
// CraftBukkit end
@@ -81,7 +81,7 @@ index bb1a60180e58c1333e7bb33e8acf1b0225eda8a8..c83e80ebdbbfb2d0e08561a44486a308
return this.type().msgId();
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b3b602076e18b45ce773bafba8f6811aba5321ec..e2907879dbe758ffe728d77ebde434b1e7382a96 100644
index d4d4f1951e61165b0feb8b0c45fcf40328dd34d1..46b485521660b2a93c5e261e6bc1072e8d1bea0a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4185,6 +4185,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess