Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
ce8922b1d clone POI blockpos before dispatching
4768e3c4e Optimize Loaded Chunks Cache Lookups
This commit is contained in:
jmp
2021-01-10 14:13:05 -08:00
parent 4a9c0163d9
commit 475b232561
13 changed files with 39 additions and 39 deletions

View File

@@ -29,7 +29,7 @@ index 8d89f51182444852062d549d23c00a93e601eb38..072ec40f751b19c2a78dfcc6e439c643
if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
blockposition1 = blockposition2;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b91f3efb61575869d54d630263bb6a4c6499153e..22a5a212b8f0a223a338a8476d9fc7fd36c19df5 100644
index 1cd1255d5e7fc907a0621e0db31c35a622fe2377..ab99bce8c0ae2efb1072c6d154d15089aed2f941 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -156,7 +156,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -42,7 +42,7 @@ index b91f3efb61575869d54d630263bb6a4c6499153e..22a5a212b8f0a223a338a8476d9fc7fd
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index f34855683eb2fae8f46e3915f6dff2e585f82a1d..7c35edeca619a25c975baf73ffc8e4b561e14db0 100644
index 21b915c0aa4f2192a3eaddbc950734c6bbcce339..f498241a31f531b74167a9f71f9871f6d620ee66 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -339,7 +339,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {