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
This commit is contained in:
Shane Freeder 2020-12-21 07:56:22 +00:00
parent fdaae06cdf
commit 49458cc927
4 changed files with 2 additions and 11 deletions

View file

@ -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();

View file

@ -48,10 +48,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return getHandle().spawnReason;
}
+
+ public boolean isInWater() {
+ return getHandle().isInWater();
+ }
+
+ public boolean isInRain() {
+ return getHandle().isInRain();
+ }

@ -1 +1 @@
Subproject commit 8f495b8db1947dbd978ebbac81973e8793bf7967
Subproject commit 6f9fe1d936fa2183170de5ff95ee6832dac788c3

@ -1 +1 @@
Subproject commit 768d7fc2df23c3882bff4613b689bf5e9781e5ca
Subproject commit 878b43758db4dbe6e9cc0c07c3b52d8c96344d5d