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
|
|
|
|
|
|
|
|
|
2021-03-16 07:19:45 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
index 5f92ba350658c7f1cac9111f06d95e6ffc5600c3..bed54f9732bbfe9edab81744276643da482785d3 100644
|
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
@@ -2100,6 +2100,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-03-16 07:19:45 +00:00
|
|
|
index 1851f261ce8e454cbe4012c0c4ea6a69e926daa0..c763f2bbd10ce6b62d703d3eabb894f24be91b11 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-03-09 18:03:27 +00:00
|
|
|
@@ -2181,6 +2181,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-03-16 07:19:45 +00:00
|
|
|
connection.sendPacket(new net.minecraft.network.protocol.game.PacketPlayOutOpenBook(net.minecraft.world.EnumHand.MAIN_HAND));
|
|
|
|
connection.sendPacket(new net.minecraft.network.protocol.game.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
|