SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.14.4 (#2333)

Browse Source
This commit is contained in:
Spottedleaf
2019-07-19 21:01:24 -07:00
parent e1fb590ee6
commit f01c2b2b7c
326 changed files with 1249 additions and 1283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Spigot-Server-Patches/Expose-attack-cooldown-methods-for-Player.patch
View File

@@ -5,29 +5,29 @@ 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 8b0094d1d..e003f1c20 100644
index d2b228d0a8..598df2239b 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
this.datawatcher.set(EntityHuman.bw, nbttagcompound);
}
+ public float getCooldownPeriod() { return dZ(); } // Paper - OBFHELPER
public float dZ() {
+ public float getCooldownPeriod() { return this.dY(); } // Paper - OBFHELPER
public float dY() {
return (float) (1.0D / this.getAttributeInstance(GenericAttributes.ATTACK_SPEED).getValue() * 20.0D);
}
+ public float getCooledAttackStrength(float adjustTicks) { return s(adjustTicks); } // Paper - OBFHELPER
public float s(float f) {
return MathHelper.a(((float) this.aD + f) / this.dZ(), 0.0F, 1.0F);
return MathHelper.a(((float) this.aD + f) / this.dY(), 0.0F, 1.0F);
}
+ public void resetCooldown() { ea(); } // Paper - OBFHELPER
public void ea() {
+ public void resetCooldown() { this.dZ(); } // Paper - OBFHELPER
public void dZ() {
this.aD = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 36f6766a6..672f92f85 100644
index 39285c92c4..23897f8ca0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {