mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-03 18:24:49 +02:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
38 lines
1.4 KiB
Diff
38 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 d3c3347fd08fd6e05d5b269aa50fa083c555a7e3..90982225ad78d8005961895102800b6a20bb42a0 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2492,6 +2492,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
|