2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-23 03:03:53 +00: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-08-25 02:22:08 +00:00
|
|
|
index cc20b73a993d021789840ed2ee7ba1fc8310dc5a..a6265c71973b67a0b49a41e2163a6f48876f1b41 100644
|
2018-09-23 03:03:53 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
2020-08-25 02:22:08 +00:00
|
|
|
@@ -2005,6 +2005,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
|
|
this.datawatcher.set(EntityHuman.bl, nbttagcompound);
|
2018-09-23 03:03:53 +00:00
|
|
|
}
|
|
|
|
|
2020-08-25 02:22:08 +00:00
|
|
|
+ public float getCooldownPeriod() { return this.eQ(); } // Paper - OBFHELPER
|
|
|
|
public float eQ() {
|
2020-06-25 14:09:55 +00:00
|
|
|
return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
|
2018-09-23 03:03:53 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-08-25 02:22:08 +00:00
|
|
|
index 25175230583bbd6fcfc864dcbae4111dcc0d3b33..b90b35c08cdc9bb44aaf9f4824289fd0824c937f 100644
|
2018-09-23 03:03:53 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
2020-08-25 02:22:08 +00:00
|
|
|
@@ -1970,6 +1970,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2019-06-08 20:33:05 +00:00
|
|
|
getInventory().setItemInMainHand(hand);
|
2018-09-23 03:03:53 +00:00
|
|
|
}
|
|
|
|
|
2019-12-12 00:03:31 +00:00
|
|
|
+ // Paper start
|
2018-09-23 03:03:53 +00:00
|
|
|
+ public float getCooldownPeriod() {
|
|
|
|
+ return getHandle().getCooldownPeriod();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
2020-08-02 05:39:36 +00:00
|
|
|
+ return getHandle().getAttackCooldown(adjustTicks);
|
2018-09-23 03:03:53 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void resetCooldown() {
|
2020-08-02 05:39:36 +00:00
|
|
|
+ getHandle().resetAttackCooldown();
|
2018-09-23 03:03:53 +00:00
|
|
|
+ }
|
2019-12-12 00:03:31 +00:00
|
|
|
+ // Paper end
|
2018-09-23 03:03:53 +00:00
|
|
|
+
|
|
|
|
// Spigot start
|
|
|
|
private final Player.Spigot spigot = new Player.Spigot()
|
|
|
|
{
|