2020-05-06 17:48:49 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-23 11:03:53 +08:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Tue, 4 Sep 2018 15:02:00 -0500
|
|
|
|
Subject: [PATCH] Expose attack cooldown methods for Player
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
2020-05-06 17:48:49 +08:00
|
|
|
index 684978be7ccc401b71b0594828a7783b209a5210..f41975165a6a66479bc8fc1811c1d271bb2a6113 100644
|
2018-09-23 11:03:53 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
2020-01-25 09:22:52 +08:00
|
|
|
@@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving {
|
2019-12-12 08:03:31 +08:00
|
|
|
this.datawatcher.set(EntityHuman.bt, nbttagcompound);
|
2018-09-23 11:03:53 +08:00
|
|
|
}
|
|
|
|
|
2019-12-12 08:03:31 +08:00
|
|
|
+ public float getCooldownPeriod() { return this.ex(); } // Paper - OBFHELPER
|
|
|
|
public float ex() {
|
2019-05-05 16:33:44 +08:00
|
|
|
return (float) (1.0D / this.getAttributeInstance(GenericAttributes.ATTACK_SPEED).getValue() * 20.0D);
|
2018-09-23 11:03:53 +08:00
|
|
|
}
|
|
|
|
|
2019-05-05 16:33:44 +08:00
|
|
|
+ public float getCooledAttackStrength(float adjustTicks) { return s(adjustTicks); } // Paper - OBFHELPER
|
|
|
|
public float s(float f) {
|
2019-12-12 08:03:31 +08:00
|
|
|
return MathHelper.a(((float) this.aB + f) / this.ex(), 0.0F, 1.0F);
|
2018-09-23 11:03:53 +08:00
|
|
|
}
|
|
|
|
|
2019-12-12 08:03:31 +08:00
|
|
|
+ public void resetCooldown() { this.ey(); } // Paper - OBFHELPER
|
|
|
|
public void ey() {
|
|
|
|
this.aB = 0;
|
2018-09-23 11:03:53 +08:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-05-06 17:48:49 +08:00
|
|
|
index ffbf2b983bb91c873f403b411a05c563feffeebf..a874ae6758e95c782bfb3d931bf8306997aa3a70 100644
|
2018-09-23 11:03:53 +08:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-04-08 15:49:15 +08:00
|
|
|
@@ -1905,6 +1905,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2019-06-09 04:33:05 +08:00
|
|
|
getInventory().setItemInMainHand(hand);
|
2018-09-23 11:03:53 +08:00
|
|
|
}
|
|
|
|
|
2019-12-12 08:03:31 +08:00
|
|
|
+ // Paper start
|
2018-09-23 11:03:53 +08:00
|
|
|
+ public float getCooldownPeriod() {
|
|
|
|
+ return getHandle().getCooldownPeriod();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
|
|
|
+ return getHandle().getCooledAttackStrength(adjustTicks);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void resetCooldown() {
|
|
|
|
+ getHandle().resetCooldown();
|
|
|
|
+ }
|
2019-12-12 08:03:31 +08:00
|
|
|
+ // Paper end
|
2018-09-23 11:03:53 +08:00
|
|
|
+
|
|
|
|
// Spigot start
|
|
|
|
private final Player.Spigot spigot = new Player.Spigot()
|
|
|
|
{
|