2020-01-21 16:12:47 +01:00
|
|
|
From fe6d14adaee1040cb699f63890f354a5db427561 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-01-21 16:12:47 +01:00
|
|
|
index 2265b01e6..763ca58d1 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
|
2019-12-12 01:03:31 +01:00
|
|
|
@@ -2115,14 +2115,17 @@ public abstract class EntityHuman extends EntityLiving {
|
|
|
|
this.datawatcher.set(EntityHuman.bt, nbttagcompound);
|
2018-09-23 05:03:53 +02:00
|
|
|
}
|
|
|
|
|
2019-12-12 01:03:31 +01:00
|
|
|
+ public float getCooldownPeriod() { return this.ex(); } // Paper - OBFHELPER
|
|
|
|
public float ex() {
|
2019-05-05 10:33:44 +02:00
|
|
|
return (float) (1.0D / this.getAttributeInstance(GenericAttributes.ATTACK_SPEED).getValue() * 20.0D);
|
2018-09-23 05:03:53 +02:00
|
|
|
}
|
|
|
|
|
2019-05-05 10:33:44 +02:00
|
|
|
+ public float getCooledAttackStrength(float adjustTicks) { return s(adjustTicks); } // Paper - OBFHELPER
|
|
|
|
public float s(float f) {
|
2019-12-12 01:03:31 +01:00
|
|
|
return MathHelper.a(((float) this.aB + f) / this.ex(), 0.0F, 1.0F);
|
2018-09-23 05:03:53 +02:00
|
|
|
}
|
|
|
|
|
2019-12-12 01:03:31 +01:00
|
|
|
+ public void resetCooldown() { this.ey(); } // Paper - OBFHELPER
|
|
|
|
public void ey() {
|
|
|
|
this.aB = 0;
|
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-01-21 16:12:47 +01:00
|
|
|
index c1f392716..352ef3669 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-01-21 16:12:47 +01:00
|
|
|
@@ -1937,6 +1937,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) {
|
|
|
|
+ return getHandle().getCooledAttackStrength(adjustTicks);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void resetCooldown() {
|
|
|
|
+ getHandle().resetCooldown();
|
|
|
|
+ }
|
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()
|
|
|
|
{
|
|
|
|
--
|
2020-01-21 16:12:47 +01:00
|
|
|
2.25.0
|
2018-09-23 05:03:53 +02:00
|
|
|
|