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