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
33 Zeilen
1.2 KiB
Diff
33 Zeilen
1.2 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 8671a21a6a87de296e3dffb174e099f0cd29a40f..8299a0a81e371d469ac8ff8fb5f23cc54705313a 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2487,6 +2487,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
|
|
private final Player.Spigot spigot = new Player.Spigot()
|