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

Little more progress

Browse Source 
Keep getting interrupted so not as much as I'd like :(
This commit is contained in:
Zach Brown
2019-12-11 18:03:31 -06:00
parent c9ef3d1cfc
commit dd751b9191
40 changed files with 263 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,36 +5,36 @@ 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 9544039ab..2342ea481 100644
index 007934d8c..78e48f478 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);
this.datawatcher.set(EntityHuman.bt, nbttagcompound);
}
+ public float getCooldownPeriod() { return this.dY(); } // Paper - OBFHELPER
public float dY() {
+ public float getCooldownPeriod() { return this.ex(); } // Paper - OBFHELPER
public float ex() {
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.dY(), 0.0F, 1.0F);
return MathHelper.a(((float) this.aB + f) / this.ex(), 0.0F, 1.0F);
}
+ public void resetCooldown() { this.dZ(); } // Paper - OBFHELPER
public void dZ() {
this.aD = 0;
+ public void resetCooldown() { this.ey(); } // Paper - OBFHELPER
public void ey() {
this.aB = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ce35e6bbc..2c99a1e9d 100644
index e45dd6cd4..9e0be10d7 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 {
getInventory().setItemInMainHand(hand);
}
+ //Paper start
+ // Paper start
+ public float getCooldownPeriod() {
+ return getHandle().getCooldownPeriod();
+ }
@@ -46,7 +46,7 @@ index ce35e6bbc..2c99a1e9d 100644
+ public void resetCooldown() {
+ getHandle().resetCooldown();
+ }
+ //Paper end
+ // Paper end
+
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()