Paper 1.13.1 Update
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
This commit is contained in:
parent
c534848047
commit
835bc39b03
361 changed files with 2869 additions and 3476 deletions
|
@ -0,0 +1,33 @@
|
|||
From 2b271de495531cdde7b4cdfa4ad11470e9f749a7 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 4acd568d0..932cc249a 100644
|
||||
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
|
||||
@@ -410,5 +410,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
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue