1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0181-Add-Heightmap-API.patch

@@ -1,4 +1,4 @@
-From 8f07bbb425c028ff4d52daf6f08197239c8436e1 Mon Sep 17 00:00:00 2001
+From 0de142a12fee06c6dd294d94bbb6351bb727c4f4 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 1 Dec 2018 19:00:36 -0800
 Subject: [PATCH] Add Heightmap API
@@ -46,7 +46,7 @@ index 00000000..4cd9b5ed
 +    SOLID_OR_LIQUID_NO_LEAVES;
 +}
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 2a40da99..3e1ca4c9 100644
+index 77d9cd0a..59047503 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -84,10 +84,10 @@ index 2a40da99..3e1ca4c9 100644
       * Creates explosion at this location with given power
       *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index b02cda3e..1e7b633c 100644
+index 23c76976..b46b2719 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -162,6 +162,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -159,6 +159,79 @@ public interface World extends PluginMessageRecipient, Metadatable {
      @NotNull
      public Block getHighestBlockAt(@NotNull Location location);
  
@@ -168,5 +168,5 @@ index b02cda3e..1e7b633c 100644
       * Gets the {@link Chunk} at the given coordinates
       *
 -- 
-2.22.0
+2.25.0.windows.1