2018-09-29 01:31:59 +02:00
|
|
|
From dcc23b7c3d5bef992833093cc60898dee23f8662 Mon Sep 17 00:00:00 2001
|
2018-07-15 03:53:17 +02:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 5 Apr 2016 19:42:22 -0400
|
|
|
|
Subject: [PATCH] Don't spam reload spawn chunks in nether/end
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2018-09-18 03:50:02 +02:00
|
|
|
index b4274cf0ec..796ce3103a 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2018-09-18 03:50:02 +02:00
|
|
|
@@ -2877,6 +2877,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2018-07-15 03:53:17 +02:00
|
|
|
return this.K;
|
|
|
|
}
|
|
|
|
|
2018-08-26 20:11:49 +02:00
|
|
|
+ public boolean isSpawnChunk(int i, int j) { return e(i, j); } // Paper - OBFHELPER
|
|
|
|
public boolean e(int i, int j) {
|
2018-07-15 03:53:17 +02:00
|
|
|
BlockPosition blockposition = this.getSpawn();
|
|
|
|
int k = i * 16 + 8 - blockposition.getX();
|
2018-09-18 03:50:02 +02:00
|
|
|
@@ -2893,6 +2894,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
2018-08-26 20:11:49 +02:00
|
|
|
return (LongSet) (forcedchunk != null ? LongSets.unmodifiable(forcedchunk.a()) : LongSets.EMPTY_SET);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ public boolean isForcedChunk(int i, int j) { return f(i, j); } // Paper - OBFHELPER
|
|
|
|
public boolean f(int i, int j) {
|
|
|
|
ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks");
|
|
|
|
|
2018-07-15 03:53:17 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
|
2018-09-29 01:31:59 +02:00
|
|
|
index 53ce7d5e11..e1fe195bf8 100644
|
2018-07-15 03:53:17 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/WorldProvider.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/WorldProvider.java
|
2018-09-01 00:56:57 +02:00
|
|
|
@@ -72,7 +72,7 @@ public abstract class WorldProvider {
|
|
|
|
}
|
2018-07-15 03:53:17 +02:00
|
|
|
|
|
|
|
public boolean a(int i, int j) {
|
2018-08-26 20:11:49 +02:00
|
|
|
- return !this.b.f(i, j);
|
|
|
|
+ return !this.b.isSpawnChunk(i, j) && !this.b.isForcedChunk(i, j); // Paper - Use spawn chunks check for all worlds
|
2018-07-15 03:53:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
protected abstract void m();
|
|
|
|
--
|
2018-09-15 18:10:26 +02:00
|
|
|
2.19.0
|
2018-07-15 03:53:17 +02:00
|
|
|
|