1.15.2 update (#2887)

Functional GUI fix added by billygalbreath
This commit is contained in:
Spottedleaf 2020-01-21 18:02:07 -08:00 committed by Zach
parent d4ae43fc00
commit 19de9af63c
624 changed files with 2369 additions and 2370 deletions

View file

@ -1,4 +1,4 @@
From e9382947de5cb8b5bc680815fe9bc811b59ef058 Mon Sep 17 00:00:00 2001
From b58f65b305f5d0822f5802442a400a92f1ef7504 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 b80b8b3b..7a0b66fe 100644
index abd469b5..310041ae 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -172,6 +172,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -169,6 +169,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 b80b8b3b..7a0b66fe 100644
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index e5756c42..da7b35f0 100644
index 04365232..83e02aea 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 e5756c42..da7b35f0 100644
* Returns a list of entities within a bounding box centered around this
* entity
--
2.24.0
2.25.0.windows.1