Updated Upstream (Paper Changes)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
7480b94720 fix empty array elements in command args (#5778)
a67959e131 Add bee stinger API (#5962)
e4ecf6ce87 [ci skip] Fix various compile warnings (#6264)
7a5025d461 Fix closeInventory shenanigans (#6292)
This commit is contained in:
William Blake Galbreath
2021-07-30 06:35:12 -05:00
parent 0274bd5421
commit 9adda450f5
8 changed files with 16 additions and 16 deletions

View File

@@ -348,10 +348,10 @@ index 2fb5c5ea01d5f1071c8e8a39e7863ed0640d3fc9..e1513023d7f9701f2c1fde816fa81767
// Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 624f06c50c1e8c938ddc7b4b0ee63d723b0be89b..78154669fa940888de5cf60b7067f9fb34c3a98e 100644
index 6234d72de5b6c4c3dd3f65cc53c99c63ab2f251d..6c258c7eadce0f0c2a4af5bef9527bf5b7d53c40 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -889,5 +889,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -910,5 +910,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}