Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
2e37979 Use cause and cancel component in PlayerGameModeChanteEvent (#6192)
b41b5b5 Catch desynced block breaks (#6193)
5a9c14b Fix distanceSq check on block breaking (#6195)
a5acf36 Fix PaperTickList (#6191)

Tuinity Changes:
08c0050 Update paper
9cabf00 Do not run filtered rebuild
23229b9 Add async catchers to chunk ticking status change
ab2aeb0 Update paper
bdd7bb4 Update paper
This commit is contained in:
William Blake Galbreath
2021-07-16 14:18:57 -05:00
parent 7b591f462c
commit 0713758d86
16 changed files with 82 additions and 97 deletions

View File

@@ -34,7 +34,7 @@ index be1bc7fda4104d61f91c2815c6ba3c612a019bed..2ede76a55c72840d915ed282609b1ca1
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 8207f0fd2c0b5cd60d02714108eab47b1ae84e16..e1b1e88cc383c99e701f5a661a98d29db031aba7 100644
index 631bc406d9bb193ac2d1d433519c2c3a7f4589e4..7c45fdbd9f389e8b74de5a672a9520ede93d6217 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -201,6 +201,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -73,10 +73,10 @@ index 57200e6b419ab0793df6498467325b6d5690c17f..bd787b4122502eacacadd8d47ea5aa5d
+
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 733ba23aa8f8d84eba556604fd743449a313a659..0a7d339a1b52f5b70830708d5eabac3f8d85f888 100644
index de56756afcd90eff9a1f7fbfa0feb33e4284c3d7..e43239fd04e81b3653c07cc441be1a4036b96b97 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2412,6 +2412,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2422,6 +2422,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);