Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@503ac8f Provide option to disable username validation (Closes #7250) (#7254)
PaperMC/Paper@d3f3429 Use simulation distance for per-player mob spawns (#7247)
PaperMC/Paper@19bc612 Make BlockData creation thread safe again (#6876)
PaperMC/Paper@79dd62a Use AreaMap for per-player mob spawning (#7235)
This commit is contained in:
Encode42
2022-01-02 15:09:18 -05:00
parent f652d4d4ee
commit 79eeead258
2 changed files with 3 additions and 3 deletions

View File

@@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT
mcVersion = 1.18.1 mcVersion = 1.18.1
packageVersion = 1_18_R1 packageVersion = 1_18_R1
paperCommit = cee7e0df017d9f52c4af4a6975222dc59c7bcac9 paperCommit = 79dd62ae620c082646b2f376451cceb52d3b4618
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index b127949def00b312266b9207264758bf60f5c136..45e2bb4d4b03f77cbf69d6bac382be39d5e28cae 100644 index c1433f2f55d43b5dbae12f7d86ee97d4486758d4..6bed501b146aa42cae1a84e8c76f93eb35b623e1 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2206,7 +2206,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -2228,7 +2228,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
public class TrackedEntity { public class TrackedEntity {