mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 04:25:26 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
From 4e87d71abca5dc5f455afa7f7803b2e0cd9dee2f 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 c7dc6fe0ef..3df3d5bbef 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -2054,14 +2054,17 @@ public abstract class EntityHuman extends EntityLiving {
|
|
this.datawatcher.set(EntityHuman.bA, nbttagcompound);
|
|
}
|
|
|
|
+ public float getCooldownPeriod() { return dG(); } // Paper - OBFHELPER
|
|
public float dG() {
|
|
return (float) (1.0D / this.getAttributeInstance(GenericAttributes.g).getValue() * 20.0D);
|
|
}
|
|
|
|
+ public float getCooledAttackStrength(float adjustTicks) { return r(adjustTicks); } // Paper - OBFHELPER
|
|
public float r(float f) {
|
|
return MathHelper.a(((float) this.aH + f) / this.dG(), 0.0F, 1.0F);
|
|
}
|
|
|
|
+ public void resetCooldown() { dH(); } // Paper - OBFHELPER
|
|
public void dH() {
|
|
this.aH = 0;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 6c78c2e823..2f9cff6e71 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1912,6 +1912,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
this.resourcePackStatus = status;
|
|
}
|
|
|
|
+ //Paper start
|
|
+ public float getCooldownPeriod() {
|
|
+ return getHandle().getCooldownPeriod();
|
|
+ }
|
|
+
|
|
+ public float getCooledAttackStrength(float adjustTicks) {
|
|
+ return getHandle().getCooledAttackStrength(adjustTicks);
|
|
+ }
|
|
+
|
|
+ public void resetCooldown() {
|
|
+ getHandle().resetCooldown();
|
|
+ }
|
|
+ //Paper end
|
|
+
|
|
// Spigot start
|
|
private final Player.Spigot spigot = new Player.Spigot()
|
|
{
|
|
--
|
|
2.19.0
|
|
|