c0d07c1b67
Upstream has released updates that appears 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: f009c3dd SPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround e677c370 Update ECJ version 5058a35d SPIGOT-5860: Item.setItemStack should be NotNull CraftBukkit Changes: d77f4d9b SPIGOT-5810, SPIGOT-5835: 'Better' handling of Player.isOnGround 53c95627 SPIGOT-5865: Piglin does not trigger EntityPickupItemEvent 2ab04d24 Update ECJ version 7884e079 SPIGOT-5868: Blocks do not tick in custom nether / end 2a848286 SPIGOT-5863: Don't check colour in scoreboard length validation f2cbce30 SPIGOT-5866: Beehive unknown TargetReason Spigot Changes: ad703da0 SPIGOT-5870: /plugins "website" field shows "version" 1a27cfd8 #98: Improve output of /plugins command using text components 732d5bab Disable checkstyle in Spigot blocks 0199a9a6 #97: Add Memory Usage to Ticks Per Second Command. 33ea98fc SPIGOT-5858: NPE: Joining the server with an invalid dimension
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 2441b714d343b963c43c9f8827550e683be4a93d..dec87413b5c22c95524a1b1f70fdd1ef016a6791 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -1743,6 +1743,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* @param profile The new profile to use
|
|
*/
|
|
void setPlayerProfile(@NotNull 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
|