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

@@ -82,10 +82,10 @@ index 100d01814aca6cbb26c721f55851df27dc654880..7d8853191eadf5f5d909dcc0269740d6
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a4a9ce9b506b7df714157bfb9c821012524d6cff..5ad5b6c90aedf6f0c7387055fa07ff46548ac32e 100644
index 5267750302a16b43ec1ac5563322b798496234c8..9a2920d61111fd9ff99424ea356a6b64b47eead5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1949,12 +1949,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1962,12 +1962,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());