mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
9946cef8c5
Upstream has released updates that appears 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: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes:fba9f487Improve legacy conversion of some materials that changed post flatteningb1ba8749Move Bukkit.Aware loading/saving to correct locationf7cdb53cSPIGOT-5311: Add API to get/set item associated with throwable projectiles689f429c#634: Cross platform patch scriptsab85433dAdd set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 4f025823575c29539c54a5d3717c8fef62505445 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 16 Jun 2018 01:17:39 -0500
|
|
Subject: [PATCH] Make shield blocking delay configurable
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
index 371d342a..7f1f3dc6 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -527,5 +527,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
|
|
* @param arrows Number of arrows to stick in this entity
|
|
*/
|
|
void setArrowsStuck(int arrows);
|
|
+
|
|
+ /**
|
|
+ * Get the delay (in ticks) before blocking is effective for this entity
|
|
+ *
|
|
+ * @return Delay in ticks
|
|
+ */
|
|
+ int getShieldBlockingDelay();
|
|
+
|
|
+ /**
|
|
+ * Set the delay (in ticks) before blocking is effective for this entity
|
|
+ *
|
|
+ * @param delay Delay in ticks
|
|
+ */
|
|
+ void setShieldBlockingDelay(int delay);
|
|
// Paper end
|
|
}
|
|
--
|
|
2.25.0
|
|
|