42 lines
2.0 KiB
Diff
42 lines
2.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
||
|
|
index b6effe1037f3ae59e6faa5f5d039b6ad54bca5d4..87374174dcbf9e7ee448a1cdd9a3528557c3a2ea 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
||
|
|
@@ -2103,6 +2103,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||
|
|
this.datawatcher.set(EntityHuman.bl, nbttagcompound);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public float getCooldownPeriod() { return this.eR(); } // Paper - OBFHELPER
|
||
|
|
public float eR() {
|
||
|
|
return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
index ee3fbf0789b4841a113727397ba6809b2600ff83..a13867ff6d188e7633a91f1e1600116286ac0cd4 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||
|
|
@@ -2189,6 +2189,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||
|
|
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()));
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public float getCooldownPeriod() {
|
||
|
|
+ return getHandle().getCooldownPeriod();
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
||
|
|
+ return getHandle().getAttackCooldown(adjustTicks);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ public void resetCooldown() {
|
||
|
|
+ getHandle().resetAttackCooldown();
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
|
||
|
|
// Spigot start
|