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 f8fa7eb584dab2c32c88b92bbedc705f6540581c Mon Sep 17 00:00:00 2001
From 192bb200ebeadeabe5d775797a033c15cbb63a82 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:15 -0500
Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index c6e2efc3..23c76976 100644
index 5366d205..d0256af5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1594,6 +1594,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1645,6 +1645,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public void setFullTime(long time);
@ -44,5 +44,5 @@ index afdc103f..784db447 100644
/**
--
2.25.0.windows.1
2.25.0