Update upstream B/CB

--- work/Bukkit
Submodule work/Bukkit 6a4242cb..337955e3:
  > SPIGOT-5468: Improve Beehive TileEntity API
  > #473: Add an API for passing the heightmap to getHighestBlockAt* method

--- work/CraftBukkit
Submodule work/CraftBukkit 807a677e..708be695:
  > SPIGOT-5468: Improve Beehive TileEntity API
  > #624: Add an API for passing the heightmap to getHighestBlockAt* method
  > MC-135989, SPIGOT-5564: Don't kick players for flight while riptiding

This deprecates the Paper getHighestBlockAt HeightMap APIs now that
Bukkit has added their own. These methods will stick around long enough
for people to migrate. Their API is pretty much the same as ours,
migration should be quick and easy.
This commit is contained in:
Zach Brown 2020-02-08 18:32:48 -06:00
parent 7c1ef0b701
commit f09fed894f
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
45 changed files with 204 additions and 191 deletions

View file

@ -1,4 +1,4 @@
From 6d81881cbf9b5eca26d514dd5397735659b33f18 Mon Sep 17 00:00:00 2001
From 6a29ae93dfaeecf54eb718c7a35fdbfb1008e72e 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
@ -34,10 +34,10 @@ index 07e532cd..6e1a1124 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 5bf2ba6f..c6e2efc3 100644
index e291c544..5366d205 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -202,6 +202,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -253,6 +253,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -56,5 +56,5 @@ index 5bf2ba6f..c6e2efc3 100644
* This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided,
* as well as future support
--
2.25.0.windows.1
2.25.0