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 d5f3458c8c
commit abca14ff96
61 changed files with 193 additions and 202 deletions

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9902b05352ce2acaf2bdd871238c6d80f255f0f1..5e988ac7a639476c0f80786c8aea51ba3377fd10 100644
index a73af8caad4014fecbca9c1c09cb519cb1fc3eb1..6d010cdebcb490b57618d3865fdb776a023853bf 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@ -17,7 +17,7 @@ index 9902b05352ce2acaf2bdd871238c6d80f255f0f1..5e988ac7a639476c0f80786c8aea51ba
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Nameable;
@@ -613,5 +614,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -620,5 +621,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();