Prepare for 1.20.3 dev
This commit is contained in:
		
					parent
					
						
							
								1fa2b7d2f5
							
						
					
				
			
			
				commit
				
					
						46f4547805
					
				
			
		
					 1514 changed files with 10 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -1,62 +0,0 @@
 | 
			
		|||
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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 | 
			
		||||
--- a/src/main/java/org/bukkit/Location.java
 | 
			
		||||
+++ b/src/main/java/org/bukkit/Location.java
 | 
			
		||||
@@ -0,0 +0,0 @@ package org.bukkit;
 | 
			
		||||
 import com.google.common.base.Preconditions;
 | 
			
		||||
 import java.lang.ref.Reference;
 | 
			
		||||
 import java.lang.ref.WeakReference;
 | 
			
		||||
+import com.google.common.base.Preconditions; // Paper
 | 
			
		||||
 import java.util.HashMap;
 | 
			
		||||
 import java.util.Map;
 | 
			
		||||
 import org.bukkit.block.Block;
 | 
			
		||||
@@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm
 | 
			
		||||
 
 | 
			
		||||
     public boolean isChunkLoaded() { return this.getWorld().isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
 | 
			
		||||
 
 | 
			
		||||
+    // Paper start - isGenerated API
 | 
			
		||||
+    /**
 | 
			
		||||
+     * 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() {
 | 
			
		||||
+        World world = this.getWorld();
 | 
			
		||||
+        Preconditions.checkNotNull(world, "Location has no world!");
 | 
			
		||||
+        return world.isChunkGenerated(locToBlock(x) >> 4, locToBlock(z) >> 4);
 | 
			
		||||
+    }
 | 
			
		||||
+    // Paper end - isGenerated API
 | 
			
		||||
+
 | 
			
		||||
     // Paper start - expand location manipulation API
 | 
			
		||||
 
 | 
			
		||||
     /**
 | 
			
		||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 | 
			
		||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 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 RegionAccessor, WorldInfo, PluginMessageRecipient
 | 
			
		||||
     }
 | 
			
		||||
     // Paper end - chunk long key API
 | 
			
		||||
 
 | 
			
		||||
+    // Paper start - isChunkGenerated API
 | 
			
		||||
+    /**
 | 
			
		||||
+     * 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
 | 
			
		||||
+     */
 | 
			
		||||
+    default boolean isChunkGenerated(long chunkKey) {
 | 
			
		||||
+        return isChunkGenerated((int) chunkKey, (int) (chunkKey >> 32));
 | 
			
		||||
+    }
 | 
			
		||||
+    // Paper end - isChunkGenerated API
 | 
			
		||||
+
 | 
			
		||||
     /**
 | 
			
		||||
      * Checks if the specified {@link Chunk} is loaded
 | 
			
		||||
      *
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue