Updated Upstream (Bukkit/CraftBukkit)

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

Bukkit Changes:
6f9fe1d9 #562: Add API to set equipment silently
bcddb754 SPIGOT-6256: Add method to check if the entity is in water

CraftBukkit Changes:
878b4375 #772: Add API to set equipment silently
22d7fcc9 SPIGOT-6256: Add method to check if the entity is in water

Spigot-API-Patches/0213-Add-entity-liquid-API.patch

@@ -5,20 +5,15 @@ Subject: [PATCH] Add entity liquid API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98..d9ffa92f817f3b850cd7272450d2432b47f1fecf 100644
+index 52144f9ddbe700dc4e7201642511219c47a334ed..9aa80ba2df23e83642ff2bb1afa9ee9ea9ce47dd 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -655,5 +655,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -662,5 +662,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull
      org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
 +
 +    /**
-+     * Check if entity is in water
-+     */
-+    public boolean isInWater();
-+
-+    /**
 +     * Check if entity is in rain
 +     */
 +    public boolean isInRain();