Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
4c9bdf53ac
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: 9d0ad318 Fix javadoc errors in previous commits 9501daa2 #578: Add methods to modify the rate of regeneration and starvation 197d8f3d #577: Add EntityExhaustionEvent CraftBukkit Changes: a021e334 #795: Add methods to modify the rate of regeneration and starvation 509e523c #792: Add EntityExhaustionEvent Spigot Changes: db99f821 Rebuild patches
42 Zeilen
1.9 KiB
Diff
42 Zeilen
1.9 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/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
index 67e14b606f9eb83e111e76665bd1228034193513..d9eaa6ed3408d377218d64d75e97c2ed00ab0b08 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -2006,6 +2006,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
this.datawatcher.set(EntityHuman.bl, nbttagcompound);
|
|
}
|
|
|
|
+ public float getCooldownPeriod() { return this.eR(); } // Paper - OBFHELPER
|
|
public float eR() {
|
|
return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index df5c75aaeb1aef7cbed9e4b500a2a9a1632e049f..47e6986f1f3b1366cbabb76d16491bc4bba04b36 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -2180,6 +2180,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
connection.sendPacket(new net.minecraft.server.PacketPlayOutOpenBook(net.minecraft.server.EnumHand.MAIN_HAND));
|
|
connection.sendPacket(new net.minecraft.server.PacketPlayOutSetSlot(0, slot, inventory.getItemInHand()));
|
|
}
|
|
+
|
|
+ public float getCooldownPeriod() {
|
|
+ return getHandle().getCooldownPeriod();
|
|
+ }
|
|
+
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
|
+ return getHandle().getAttackCooldown(adjustTicks);
|
|
+ }
|
|
+
|
|
+ public void resetCooldown() {
|
|
+ getHandle().resetAttackCooldown();
|
|
+ }
|
|
// Paper end
|
|
|
|
// Spigot start
|