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

Patches 100-260 (#2729)

Browse Source
This commit is contained in:
MiniDigger | Martin
2019-12-12 00:43:22 +01:00
parent 2dc2fcce09
commit c9ef3d1cfc
159 changed files with 639 additions and 954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Spigot-Server-Patches/LivingEntity-Hand-Raised-Item-Use-API.patch
View File

@@ -6,30 +6,30 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dfbd40a99..e1972f793 100644
index 855afcd64..470cbddeb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
private float bD;
private float bB;
private int jumpTicks;
private float bF;
private float bD;
- protected ItemStack activeItem;
+ public ItemStack activeItem; // Paper - public
protected int bo;
protected int bp;
private BlockPosition bG;
protected int bl;
protected int bm;
private BlockPosition bE;
@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}
+ public int getItemUseRemainingTime() { return this.dm(); } // Paper - OBFHELPER
public int dm() {
return this.bo;
+ public int getItemUseRemainingTime() { return this.dE(); } // Paper - OBFHELPER
public int dE() {
return this.bl;
}
+ public int getHandRaisedTime() { return this.dn(); } // Paper - OBFHELPER
public int dn() {
return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
+ public int getHandRaisedTime() { return this.dF(); } // Paper - OBFHELPER
public int dF() {
return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 67f275321..379239567 100644