Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI
0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work
bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason

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

@@ -1,4 +1,4 @@
-From 30b569ca7446323f70c2582de9d0c3998d09ed2e Mon Sep 17 00:00:00 2001
+From 1b7353ee69e534a8c4385b9cfc788ffb93f47709 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Heightmap API
 
 diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java
 new file mode 100644
-index 00000000..4cd9b5ed
+index 000000000..4cd9b5ed0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java
 @@ -0,0 +1,35 @@
@@ -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 2a40da99f..3e1ca4c9f 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,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 1818e158..65dc8022 100644
+index 1818e158f..65dc80229 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -161,6 +161,79 @@ public interface World extends PluginMessageRecipient, Metadatable {