Update B/CB/S

This commit is contained in:
Shane Freeder 2018-07-23 09:39:55 +01:00
commit aad194a32e
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
320 changed files with 790 additions and 882 deletions

View file

@ -0,0 +1,33 @@
From 047d17dce86b980dda8c0c0ec7220d90c321cd92 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 700ed29f..7ea7ccf0 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -401,5 +401,19 @@ public interface LivingEntity extends Attributable, Entity, Damageable, Projecti
* @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.18.0