From 9c9a577ff54d9c95f6b6759b31da79273e864dee Mon Sep 17 00:00:00 2001 From: BillyGalbreath 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 index cc1bc01b1..4bbf57752 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2061,14 +2061,17 @@ public abstract class EntityHuman extends EntityLiving { this.datawatcher.set(EntityHuman.bA, nbttagcompound); } + public float getCooldownPeriod() { return dG(); } // Paper - OBFHELPER public float dG() { return (float) (1.0D / this.getAttributeInstance(GenericAttributes.g).getValue() * 20.0D); } + public float getCooledAttackStrength(float adjustTicks) { return r(adjustTicks); } // Paper - OBFHELPER public float r(float f) { return MathHelper.a(((float) this.aH + f) / this.dG(), 0.0F, 1.0F); } + public void resetCooldown() { dH(); } // Paper - OBFHELPER public void dH() { this.aH = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 47426d8fd..7a918ea72 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1897,6 +1897,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { this.resourcePackStatus = status; } + //Paper start + public float getCooldownPeriod() { + return getHandle().getCooldownPeriod(); + } + + public float getCooledAttackStrength(float adjustTicks) { + return getHandle().getCooledAttackStrength(adjustTicks); + } + + public void resetCooldown() { + getHandle().resetCooldown(); + } + //Paper end + // Spigot start private final Player.Spigot spigot = new Player.Spigot() { -- 2.21.0