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
|
2021-01-29 00:32:08 +00:00
|
|
|
index 4eea9bf6efb875cd7ba77958c9d3814237d8c74d..80a254039f3efbab6f0cbcf830ab5168fdceb0cc 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
|
2021-01-29 00:32:08 +00:00
|
|
|
@@ -1993,6 +1993,7 @@ public abstract class EntityHuman extends EntityLiving {
|
2020-08-25 02:22:08 +00:00
|
|
|
this.datawatcher.set(EntityHuman.bl, nbttagcompound);
|
2018-09-23 03:03:53 +00:00
|
|
|
}
|
|
|
|
|
2020-11-03 02:22:15 +00:00
|
|
|
+ public float getCooldownPeriod() { return this.eR(); } // Paper - OBFHELPER
|
|
|
|
public float eR() {
|
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
|
2021-02-21 19:45:33 +00:00
|
|
|
index 6ecbeffc83cef741c9a4ab1d8de1d536849c9268..17ca2f9fbd9f43a9b39637d81e26c92ec00ed4d2 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
|
2021-02-21 19:45:33 +00:00
|
|
|
@@ -2197,6 +2197,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
connection.sendPacket(new net.minecraft.server.PacketPlayOutOpenBook(net.minecraft.server.EnumHand.MAIN_HAND));
|
|
|
|
connection.sendPacket(new net.minecraft.server.PacketPlayOutSetSlot(0, slot, inventory.getItemInHand()));
|
2018-09-23 03:03:53 +00:00
|
|
|
}
|
2021-02-21 19:45:33 +00:00
|
|
|
+
|
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
|
|
|
+ }
|
2021-02-21 19:45:33 +00:00
|
|
|
// Paper end
|
|
|
|
|
2018-09-23 03:03:53 +00:00
|
|
|
// Spigot start
|