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 3e08720f1ab03046c754262078e033268f5cef8c Mon Sep 17 00:00:00 2001
From f8cc53df49e56becb4f871f8205b35b5a2abdd2e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 19 Dec 2017 16:24:42 -0500
Subject: [PATCH] Expand Explosions API
@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
index 5730d5f46..b226d7e4c 100644
index 4cf22afc..ac3c8eef 100644
--- a/src/main/java/org/bukkit/Location.java
+++ b/src/main/java/org/bukkit/Location.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
@ -106,10 +106,10 @@ index 5730d5f46..b226d7e4c 100644
* Returns a list of entities within a bounding box centered around a Location.
*
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index fee0f5211..af5aba4e5 100644
index 0b357583..b257eda2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1305,6 +1305,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1302,6 +1302,88 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean createExplosion(@NotNull Location loc, float power, boolean setFire);
@ -199,5 +199,5 @@ index fee0f5211..af5aba4e5 100644
* Creates explosion at given coordinates with given power and optionally
* setting blocks on fire or breaking blocks.
--
2.23.0
2.25.0.windows.1