Update Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly
This commit is contained in:
Ben Kerllenevich
2021-08-31 07:23:46 -04:00
parent 64547876a0
commit 19293aabc5
36 changed files with 113 additions and 113 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index e395652b99bbee087604f88a23168206ba874e0c..aa33000f6431f5c0b5f79a34d7389addf5d20374 100644
index 1312a4d7a6f77d4b9812edd44ed27a6ca7cd7977..f3252dbb7f081b7f47a0e28e74a1da6c42cdd788 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2324,7 +2324,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
@@ -2273,7 +2273,7 @@ Sections go from 0..16. Now whenever a section is not empty, it can potentially
public class TrackedEntity {