mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
parent
bcb9bb64f0
commit
314acb5d8f
2 changed files with 109 additions and 0 deletions
67
Spigot-API-Patches/isChunkGenerated-API.patch
Normal file
67
Spigot-API-Patches/isChunkGenerated-API.patch
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: cswhite2000 <18whitechristop@gmail.com>
|
||||||
|
Date: Tue, 21 Aug 2018 19:39:46 -0700
|
||||||
|
Subject: [PATCH] isChunkGenerated API
|
||||||
|
|
||||||
|
Resolves #1329
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||||||
|
index 7e1ee875..9457832b 100644
|
||||||
|
--- a/src/main/java/org/bukkit/Location.java
|
||||||
|
+++ b/src/main/java/org/bukkit/Location.java
|
||||||
|
@@ -0,0 +0,0 @@ import org.bukkit.util.NumberConversions;
|
||||||
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
|
// Paper start
|
||||||
|
+import com.google.common.base.Preconditions;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.function.Predicate;
|
||||||
|
import org.bukkit.entity.Entity;
|
||||||
|
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
|
||||||
|
public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
|
||||||
|
|
||||||
|
// Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Checks if a {@link Chunk} has been generated at this location.
|
||||||
|
+ *
|
||||||
|
+ * @return true if a chunk has been generated at this location
|
||||||
|
+ */
|
||||||
|
+ public boolean isGenerated() {
|
||||||
|
+ Preconditions.checkNotNull(world, "Location has no world!");
|
||||||
|
+ return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the position of this Location and returns itself
|
||||||
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||||
|
index a6facc4b..d5058634 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 {
|
||||||
|
public default Chunk getChunkAt(long chunkKey) {
|
||||||
|
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Checks if a {@link Chunk} has been generated at the specified chunk key,
|
||||||
|
+ * which is the X and Z packed into a long.
|
||||||
|
+ *
|
||||||
|
+ * @param chunkKey The Chunk Key to look up the chunk by
|
||||||
|
+ * @return true if the chunk has been generated, otherwise false
|
||||||
|
+ */
|
||||||
|
+ public default boolean isChunkGenerated(long chunkKey) {
|
||||||
|
+ return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Checks if a {@link Chunk} has been generated at the given coordinates.
|
||||||
|
+ *
|
||||||
|
+ * @param x X-coordinate of the chunk
|
||||||
|
+ * @param z Z-coordinate of the chunk
|
||||||
|
+ * @return true if the chunk has been generated, otherwise false
|
||||||
|
+ */
|
||||||
|
+ public boolean isChunkGenerated(int x, int z);
|
||||||
|
// Paper end
|
||||||
|
|
||||||
|
/**
|
||||||
|
--
|
42
Spigot-Server-Patches/isChunkGenerated-API.patch
Normal file
42
Spigot-Server-Patches/isChunkGenerated-API.patch
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: cswhite2000 <18whitechristop@gmail.com>
|
||||||
|
Date: Tue, 21 Aug 2018 19:44:10 -0700
|
||||||
|
Subject: [PATCH] isChunkGenerated API
|
||||||
|
|
||||||
|
Resolves #1329
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||||
|
index 0eba3df5..ad548590 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||||
|
@@ -0,0 +0,0 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ public boolean isChunkGenerated(int x, int z) {
|
||||||
|
+ return this.chunks.containsKey(ChunkCoordIntPair.asLong(x, z)) || this.chunkLoader.chunkExists(x, z);
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
@Nullable
|
||||||
|
public Chunk getLoadedChunkAt(int i, int j) {
|
||||||
|
long k = ChunkCoordIntPair.a(i, j);
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||||
|
index 567e9acb..afb141c6 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 {
|
||||||
|
return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Paper start
|
||||||
|
+ public boolean isChunkGenerated(int x, int z) {
|
||||||
|
+ return this.getHandle().getChunkProviderServer().isChunkGenerated(x, z);
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
+
|
||||||
|
public ChunkGenerator getGenerator() {
|
||||||
|
return generator;
|
||||||
|
}
|
||||||
|
--
|
Loading…
Reference in a new issue