Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a219c497bd Dont register multiple ASK_SERVER suggestions under one parent node (#7188)
329912b816 Expose isFuel and canSmelt methods to FurnaceInventory (#7181)
7b833ca18f Fix bees aging inside hives (#6466)
a99a33cdd9 Bucketable API (#7204)
721f14842f [ci skip] Change test logging settings to log by default (#7203)
2d458ee14f Check player world in endPortalSoundRadius (#6226)
686bbd33d4 Fix EntityLoadCrossbowEvent Sync Issue (#5739)
64f9225c94 Fix riding distance statistics (#7021/SPIGOT-6475) (#7033)
This commit is contained in:
BillyGalbreath
2021-12-31 05:35:42 -06:00
parent 3607ed47ad
commit ce115a0bfc
18 changed files with 35 additions and 290 deletions

View File

@@ -73,10 +73,10 @@ index c516ad43cac2419bcf63e11eaa183785b462de5c..618595add09eef5381307ba2fe154adf
+
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 30c6df3fa13c3fb44e1fe5833fe0aaad236b0a82..28d5d52a9e2bbed40918be2e6641886a64919756 100644
index 2e60ee66d091f01128c6467b02d0791726b5813a..ff01b193a1f2372bc79bd864a689a6b36d53b4b8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2439,6 +2439,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2452,6 +2452,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
@@ -4507,7 +4507,7 @@ index 642279bb7e15db9f662094ffd6ded2e3c7af3fd6..ab648e7dafd78f414646cef96b422e87
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 2c00a766130a7f682fc6c4c74321e10637ca7932..7eae138f3bbddd44c078b2fbcb5d5fd07d5bd9aa 100644
index 570d2325997e2465a8e17803ea882bc07ca64c38..957808b534592fd50cac78d2209a38c37950cb22 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -191,6 +191,19 @@ public abstract class Player extends LivingEntity {