mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream B/CB

Browse source 
--- 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
Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0133-Async-Chunks-API.patch
View file

@ -1,4 +1,4 @@
From b58f65b305f5d0822f5802442a400a92f1ef7504 Mon Sep 17 00:00:00 2001
From 3392ff505d528572bbfe41cecebb034b2ae07cb4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:43:33 -0600
Subject: [PATCH] Async Chunks API
@ -8,10 +8,10 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index abd469b5..310041ae 100644
index ae414b51..a62663b2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -169,6 +169,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -220,6 +220,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
public default Chunk getChunkAt(long chunkKey) {
return getChunkAt((int) chunkKey, (int) (chunkKey >> 32));
}
@ -371,7 +371,7 @@ index abd469b5..310041ae 100644
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 04365232..83e02aea 100644
index b4069dbf..45e0dffe 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@ -406,5 +406,5 @@ index 04365232..83e02aea 100644
* Returns a list of entities within a bounding box centered around this
* entity
--
2.25.0.windows.1
2.25.0