geforkt von Mirrors/Paper
b077005910
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: fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand ae72ba3a SPIGOT-5591: Allow concurrent potion effects CraftBukkit Changes:3d61a853Fix formatting in CraftLivingEntityf7ab3055#633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHandd5ef2eabSPIGOT-5591: Allow concurrent potion effects25a9a9ffSPIGOT-5592: Custom ChunkGenerator can cause bugged dirt3f6d0de9Make it clear in error messages that api-version above 1.13 is also supported
34 Zeilen
1.1 KiB
Diff
34 Zeilen
1.1 KiB
Diff
From 071b34424f1f8e21825f757bfe107f01e49cfb31 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 ae712e76d..896b1971c 100644
|
|
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
|
@@ -554,5 +554,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
|
|
|