Update upstream B/CB/S

This commit is contained in:
Zach Brown 2018-10-27 00:02:22 -04:00
commit c4865a6445
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
57 changed files with 380 additions and 386 deletions

View file

@ -1,11 +1,11 @@
From fbbca41aee75b1949e0b4133ad2a87923d28328e Mon Sep 17 00:00:00 2001
From f36153fbc7b8b55a0bb0529803d9e1fc60c14f36 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 7e1ee875e..9457832bc 100644
index 7e1ee875..9457832b 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -9,6 +9,7 @@ import org.bukkit.util.NumberConversions;
@ -33,10 +33,10 @@ index 7e1ee875e..9457832bc 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 c918c26be..d367e890f 100644
index adace47c..de89122e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -182,6 +182,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -184,6 +184,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -55,5 +55,5 @@ index c918c26be..d367e890f 100644
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
* as well as future support
--
2.19.0
2.19.1