Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8347)

This commit is contained in:
Jake Potrebic 2022-09-09 11:54:00 -07:00 committed by GitHub
parent 36a5f150c5
commit e51401e764
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 150 additions and 159 deletions

View file

@ -20,10 +20,10 @@ index bd9222b9b5e7ec1f3aebe37838775f345e868150..34c2ae10e2a230ef88a756cf2024edcd
public ItemStack getItemInUse();
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 588ad09a764236cf858a4e6689cf4ee5246e6f08..1dd9f7ac1f26c253b8181519aa1873784bc54a07 100644
index dbe8511d97bfd6361177f66ae638af0c3be19a04..06896b9690a939ade2167da1a19239df2dcdba8f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -649,5 +649,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -657,5 +657,42 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param delay Delay in ticks
*/
void setShieldBlockingDelay(int delay);