2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 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
|
2021-03-03 23:43:45 +01:00
|
|
|
index 67e14b606f9eb83e111e76665bd1228034193513..d9eaa6ed3408d377218d64d75e97c2ed00ab0b08 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
|
2021-03-03 23:43:45 +01:00
|
|
|
@@ -2006,6 +2006,7 @@ public abstract class EntityHuman extends EntityLiving {
|
2020-08-25 04:22:08 +02:00
|
|
|
this.datawatcher.set(EntityHuman.bl, nbttagcompound);
|
2018-09-23 05:03:53 +02:00
|
|
|
}
|
|
|
|
|
2020-11-03 03:22:15 +01:00
|
|
|
+ public float getCooldownPeriod() { return this.eR(); } // Paper - OBFHELPER
|
|
|
|
public float eR() {
|
2020-06-25 16:09:55 +02:00
|
|
|
return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
|
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
|
2021-03-09 19:03:27 +01:00
|
|
|
index 778bbaf03d050271c7b97c2dc72ee57d46600e0d..794235ef374e1f035220d8485f5a937e3e9ff72c 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
|
2021-03-09 19:03:27 +01:00
|
|
|
@@ -2181,6 +2181,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-02-21 20:45:33 +01:00
|
|
|
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 05:03:53 +02:00
|
|
|
}
|
2021-02-21 20:45:33 +01:00
|
|
|
+
|
2018-09-23 05:03:53 +02:00
|
|
|
+ public float getCooldownPeriod() {
|
|
|
|
+ return getHandle().getCooldownPeriod();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
2020-08-02 07:39:36 +02:00
|
|
|
+ return getHandle().getAttackCooldown(adjustTicks);
|
2018-09-23 05:03:53 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void resetCooldown() {
|
2020-08-02 07:39:36 +02:00
|
|
|
+ getHandle().resetAttackCooldown();
|
2018-09-23 05:03:53 +02:00
|
|
|
+ }
|
2021-02-21 20:45:33 +01:00
|
|
|
// Paper end
|
|
|
|
|
2018-09-23 05:03:53 +02:00
|
|
|
// Spigot start
|