diff --git a/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch b/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch new file mode 100644 index 0000000000..cb859e75fe --- /dev/null +++ b/Spigot-API-Patches/Add-Force-Loaded-Chunk-API.patch @@ -0,0 +1,55 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: willies952002 +Date: Wed, 29 Aug 2018 00:37:30 -0400 +Subject: [PATCH] Add Force-Loaded Chunk API + + +diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java +index dc847340..51bc051f 100644 +--- a/src/main/java/org/bukkit/Chunk.java ++++ b/src/main/java/org/bukkit/Chunk.java +@@ -0,0 +0,0 @@ public interface Chunk { + * @return true if slimes are able to spawn in this chunk + */ + boolean isSlimeChunk(); ++ ++ // Paper start - Force-Loaded Chunk API ++ /** ++ * Checks if the chunk is currently force-loaded ++ * ++ * @return true if the chunk is force-loaded, otherwise false ++ */ ++ boolean isForceLoaded(); ++ ++ /** ++ * Set's whether a chunk is force-loaded or not ++ * ++ * @param force whether or not to force load this chunk ++ */ ++ void setForceLoaded(boolean force); ++ // Paper end + } +diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java +index 53764fae..00b02e36 100644 +--- a/src/main/java/org/bukkit/World.java ++++ b/src/main/java/org/bukkit/World.java +@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable { + * @return true if the chunk has been generated, otherwise false + */ + public boolean isChunkGenerated(int x, int z); ++ ++ /** ++ * Checks if a chunk is force-loaded. ++ * Note: This will only return true if the chunk is also generated ++ * ++ * @param x X-coordinate of the chunk ++ * @param z Z-coordinate of the chunk ++ * @return true if the chunk is force-loaded. otherwise false ++ */ ++ public boolean isChunkForceLoaded(int x, int z); + // Paper end + + /** +-- +2.19.0.rc1 + diff --git a/Spigot-Server-Patches/Implement-Force-Loaded-Chunk-API.patch b/Spigot-Server-Patches/Implement-Force-Loaded-Chunk-API.patch new file mode 100644 index 0000000000..e20a9d11e3 --- /dev/null +++ b/Spigot-Server-Patches/Implement-Force-Loaded-Chunk-API.patch @@ -0,0 +1,59 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: willies952002 +Date: Wed, 29 Aug 2018 00:37:42 -0400 +Subject: [PATCH] Implement Force-Loaded Chunk API + + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index 49809372d..2b5b0c4df 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -0,0 +0,0 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc + return forcedchunk != null && forcedchunk.a().contains(ChunkCoordIntPair.a(i, j)); + } + ++ public boolean setForcedChunk(int i, int j, boolean flag) { return b(i, j, flag); } // Paper - OBFHELPER + public boolean b(int i, int j, boolean flag) { + String s = "chunks"; + ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks"); +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +index 12c6d850d..55394e0c1 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +@@ -0,0 +0,0 @@ public class CraftChunk implements Chunk { + Preconditions.checkArgument(0 <= z && z <= 15, "z out of range (expected 0-15, got %s)", z); + } + ++ // Paper start - Force-Loaded Chunk API ++ @Override ++ public boolean isForceLoaded() { ++ return getHandle().getWorld().isForcedChunk(this.x, this.z); ++ } ++ ++ @Override ++ public void setForceLoaded(boolean force) { ++ getHandle().getWorld().setForcedChunk(this.x, this.z, force); ++ } ++ // Paper end ++ + static { + Arrays.fill(emptySkyLight, (byte) 0xFF); + } +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +index 1ccf2a760..755d2632f 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +@@ -0,0 +0,0 @@ public class CraftWorld implements World { + public boolean isChunkGenerated(int x, int z) { + return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z); + } ++ ++ public boolean isChunkForceLoaded(int x, int z) { ++ return this.isChunkGenerated(x, z) && this.getHandle().isForcedChunk(x, z); ++ } + // Paper end + + public ChunkGenerator getGenerator() { +-- +2.19.0.rc1 +