mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 17:17:13 +01:00
1cfd363d32
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: fc460d1b PR-735: Add Villager#zombify c8c8331e PR-690: Add method to read ItemStack input 62845f2f SPIGOT-6829: Add per-player world border API CraftBukkit Changes: a459f4d4 PR-1033: Add Villager#zombify d65d1430 PR-975: Add method to read ItemStack input b5559f8c SPIGOT-6990: Fix setRepairCost(0) in Anvil 6c308e1b SPIGOT-6829: Add per-player world border API Spigot Changes: 42b61526 SPIGOT-7000: Generation and /locate issues when using custom structure seeds
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Tue, 4 Sep 2018 15:01:54 -0500
|
|
Subject: [PATCH] Expose attack cooldown methods for Player
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index c0fed694f66acc623eaef2f3d53bcd32180b09af..98b856d068c765a277d1e218a04e05588e18fdcb 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2449,6 +2449,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* @param profile The new profile to use
|
|
*/
|
|
void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
|
|
+
|
|
+ /**
|
|
+ * Returns the amount of ticks the current cooldown lasts
|
|
+ *
|
|
+ * @return Amount of ticks cooldown will last
|
|
+ */
|
|
+ float getCooldownPeriod();
|
|
+
|
|
+ /**
|
|
+ * Returns the percentage of attack power available based on the cooldown (zero to one).
|
|
+ *
|
|
+ * @param adjustTicks Amount of ticks to add to cooldown counter for this calculation
|
|
+ * @return Percentage of attack power available
|
|
+ */
|
|
+ float getCooledAttackStrength(float adjustTicks);
|
|
+
|
|
+ /**
|
|
+ * Reset the cooldown counter to 0, effectively starting the cooldown period.
|
|
+ */
|
|
+ void resetCooldown();
|
|
// Paper end
|
|
|
|
// Spigot start
|