mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-31 09:09:56 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: cfd18bd0 SPIGOT-6436: Add Player#stopAllSounds CraftBukkit Changes: b58f4299 SPIGOT-6436: Add Player#stopAllSounds eb191612 SPIGOT-6783: Items do not appear in custom anvil inventories 376edf4f SPIGOT-6779: Fix LivingEntity#attack for Player entities 747a73ec SPIGOT-6772: Use entity mailbox and re-schedule entities if they get unloaded
33 lines
1.1 KiB
Diff
33 lines
1.1 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/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 7d87be1eb79045226cad3b7e62ff5d265160b866..3be9882ac1e96441f479f22099b77a25dd7cb8dd 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2296,6 +2296,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
|
|
return this.adventure$pointers;
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public float getCooldownPeriod() {
|
|
+ return getHandle().getCurrentItemAttackStrengthDelay();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
|
+ return getHandle().getAttackStrengthScale(adjustTicks);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void resetCooldown() {
|
|
+ getHandle().resetAttackStrengthTicker();
|
|
+ }
|
|
// Paper end
|
|
|
|
// Spigot start
|