1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

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

@@ -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
 @@ -0,0 +0,0 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -84,7 +84,7 @@ 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
 @@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {