mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-16 23:55:17 +01:00
57 lines
2.5 KiB
Diff
57 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 16 Jun 2018 01:18:16 -0500
|
|
Subject: [PATCH] Make shield blocking delay configurable
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index f687bfd7cf820c1e7443c8b86ef9ca28a4768b02..8892714b9e7776183da9d9253db2c56da43319c6 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3806,12 +3806,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
if (this.isUsingItem() && !this.useItem.isEmpty()) {
|
|
Item item = this.useItem.getItem();
|
|
|
|
- return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= 5;
|
|
+ return item.getUseAnimation(this.useItem) != UseAnim.BLOCK ? false : item.getUseDuration(this.useItem) - this.useItemRemaining >= getShieldBlockingDelay(); // Paper - shieldBlockingDelay
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
+ // Paper start
|
|
+ public int shieldBlockingDelay = this.level().paperConfig().misc.shieldBlockingDelay;
|
|
+
|
|
+ public int getShieldBlockingDelay() {
|
|
+ return shieldBlockingDelay;
|
|
+ }
|
|
+
|
|
+ public void setShieldBlockingDelay(int shieldBlockingDelay) {
|
|
+ this.shieldBlockingDelay = shieldBlockingDelay;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public boolean isSuppressingSlidingDownLadder() {
|
|
return this.isShiftKeyDown();
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 5c0c4051e2f63e923e99a621d04d6a5dd7c86b44..6544b8160af89e93e508c5d466c22ba389b7621c 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -810,5 +810,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
public void setArrowsStuck(final int arrows) {
|
|
this.getHandle().setArrowCount(arrows);
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public int getShieldBlockingDelay() {
|
|
+ return getHandle().getShieldBlockingDelay();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setShieldBlockingDelay(int delay) {
|
|
+ getHandle().setShieldBlockingDelay(delay);
|
|
+ }
|
|
// Paper end
|
|
}
|