Initial work on 1.14 pre-5

This commit is contained in:
Shane Freeder
2019-04-23 05:47:07 +01:00
parent fb25dc17c6
commit 6c3f04049d
315 changed files with 1547 additions and 1648 deletions

View File

@@ -1,11 +1,11 @@
From 39f88f102e19e146cd9a008dfc0af879190f3f3a Mon Sep 17 00:00:00 2001
From 1ed95fc07f6d3e686f998625d821320a3419b70d 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 2719eecb..a90f78d5 100644
index e546407e..7713f183 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -1,5 +1,6 @@
@@ -14,8 +14,8 @@ index 2719eecb..a90f78d5 100644
+import com.google.common.base.Preconditions; // Paper
import java.util.HashMap;
import java.util.Map;
@@ -518,6 +519,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
import org.bukkit.block.Block;
@@ -517,6 +518,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
// Paper start
@@ -32,10 +32,10 @@ index 2719eecb..a90f78d5 100644
/**
* 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 fa736b07..38dae649 100644
index 446d91c5..dd51aa31 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -196,6 +196,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -203,6 +203,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}