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

@@ -5,10 +5,10 @@ Subject: [PATCH] Armor click equip options
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index 55a9c1d13484c4ce5e3d8f2dd270df01480add87..a513e60c9bf96c6863926b608c0c46706700c096 100644
index dd5bc68171ce5a67ecf30de65f0c1d280cc88419..38323c95dc36e5ead294670ce120114492de37d5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -503,7 +503,7 @@ public class ServerPlayerGameMode {
@@ -499,7 +499,7 @@ public class ServerPlayerGameMode {
return interactionresultwrapper.getResult();
} else {
player.setItemInHand(hand, itemstack1);