Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
fc4c0bc42 Reset shield blocking on dimension change

Tuinity Changes:
06ce05bbd Fix broken chunk loading while under high block update stress
This commit is contained in:
BillyGalbreath
2021-01-26 17:49:07 -06:00
parent 7b0b3f74e1
commit d72b22863d
13 changed files with 64 additions and 68 deletions

View File

@@ -25,7 +25,7 @@ index 41844f30a2a98eb14559b3ab0885ae738b54520c..63eb29635957d4e6ce1274ee17a59af6
this.inPortal = true;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 53125d7fc29e87f4bbf37ee77518222f6be1a4f4..13b745b333137ed4d71755a0fc7b5f3fb4ab972e 100644
index 4719bf0945208061424401b68385212fe3af1830..ae5b0d19a7fa572a1483314261dc10c84927f3d6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1180,6 +1180,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {