From 49458cc927bc01085ee20be40096f2e927990158 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Mon, 21 Dec 2020 07:56:22 +0000
Subject: [PATCH] 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/Add-entity-liquid-API.patch    | 5 -----
 Spigot-Server-Patches/Add-entity-liquid-API.patch | 4 ----
 work/Bukkit                                       | 2 +-
 work/CraftBukkit                                  | 2 +-
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Spigot-API-Patches/Add-entity-liquid-API.patch b/Spigot-API-Patches/Add-entity-liquid-API.patch
index 1c70cd1141..dc0e58a454 100644
--- a/Spigot-API-Patches/Add-entity-liquid-API.patch
+++ b/Spigot-API-Patches/Add-entity-liquid-API.patch
@@ -14,11 +14,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      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();
diff --git a/Spigot-Server-Patches/Add-entity-liquid-API.patch b/Spigot-Server-Patches/Add-entity-liquid-API.patch
index 5e696e252e..d87154d276 100644
--- a/Spigot-Server-Patches/Add-entity-liquid-API.patch
+++ b/Spigot-Server-Patches/Add-entity-liquid-API.patch
@@ -48,10 +48,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return getHandle().spawnReason;
      }
 +
-+    public boolean isInWater() {
-+        return getHandle().isInWater();
-+    }
-+    
 +    public boolean isInRain() {
 +        return getHandle().isInRain();
 +    }
diff --git a/work/Bukkit b/work/Bukkit
index 8f495b8db1..6f9fe1d936 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 8f495b8db1947dbd978ebbac81973e8793bf7967
+Subproject commit 6f9fe1d936fa2183170de5ff95ee6832dac788c3
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 768d7fc2df..878b43758d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 768d7fc2df23c3882bff4613b689bf5e9781e5ca
+Subproject commit 878b43758db4dbe6e9cc0c07c3b52d8c96344d5d