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
|
|
|
|
|
|
|
|
|
2021-03-16 08:19:45 +01: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
|
2021-03-16 14:04:28 +01:00
|
|
|
index b6effe1037f3ae59e6faa5f5d039b6ad54bca5d4..87374174dcbf9e7ee448a1cdd9a3528557c3a2ea 100644
|
2021-03-16 08:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
|
2021-03-16 14:04:28 +01:00
|
|
|
@@ -2103,6 +2103,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-16 16:50:45 +01:00
|
|
|
index 32228b4eddaadabbae46ebbc5eb3404acf73fb29..9d3e01f7ad743dbe60685e9b111308ed06a0b4b7 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-16 16:50:45 +01:00
|
|
|
@@ -2186,6 +2186,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
2021-03-16 08:19:45 +01: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 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
|