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,14 +1,14 @@
From d7084ea0a2a44fed946a7b95cb34a48803b39312 Mon Sep 17 00:00:00 2001
From ea50ead30623af4d40088561beb454adef129629 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Tue, 3 Jul 2018 16:07:16 +0200
Subject: [PATCH] Add World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index b257eda2..260ee11a 100644
index 86d488e5..f82063af 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -862,6 +862,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -913,6 +913,17 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public Collection<Entity> getNearbyEntities(@NotNull Location location, double x, double y, double z);
@ -27,5 +27,5 @@ index b257eda2..260ee11a 100644
* Returns a list of entities within a bounding box centered around a
* Location.
--
2.25.0.windows.1
2.25.0