Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b1cdc12 Fix block action handling (#6213)
8f94951 Revert "Fix PaperTickList" (#6216)

Tuinity Changes:
e3bc777 Update paper
845a815 Update readme to 1.17.1
ce43ccd Don't load chunks for hasNewCollision
This commit is contained in:
William Blake Galbreath
2021-07-17 20:51:21 -05:00
parent 505548ed21
commit 0d0caaa91f
10 changed files with 26 additions and 26 deletions

View File

@@ -82,10 +82,10 @@ index 22366098d0a3f6df2ba650ef01ed4be77bee0496..efa6e02ae06e70f554f21468ec3c2e86
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 8414826f6f9204bdda832efcb00e24ab0115bd59..088045dce7a3a20b6bcbce51594b598819e4508a 100644
index 65fb15671ed2947bc62753bc685656732a96feff..3bd3cb3011e95f5c8123209e37034d7e4224fd47 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1922,12 +1922,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());