geforkt von Mirrors/Paper
f79c0daece
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: 5c21a63f PR-717: Add PlayerHideEntityEvent and PlayerShowEntityEvent CraftBukkit Changes: c26a7b54d PR-1000: Add PlayerHideEntityEvent and PlayerShowEntityEvent
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 5ae1387341c0003f1677e139a94b658c6116c18c..90053c916f609a4316e91e8093c12166010d7417 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2400,6 +2400,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()
|