Update to 1.14.4 (#2333)

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

View File

@@ -6,7 +6,7 @@ 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 ca266029e..1500e43ee 100644
index c2634f8813..b29e0c5d35 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 {
@@ -22,17 +22,17 @@ index ca266029e..1500e43ee 100644
return this.activeItem;
}
+ public int getItemUseRemainingTime() { return dn(); } // Paper - OBFHELPER
public int dn() {
+ public int getItemUseRemainingTime() { return this.dm(); } // Paper - OBFHELPER
public int dm() {
return this.bo;
}
+ public int getHandRaisedTime() { return do_(); } // Paper - OBFHELPER
public int do_() {
return this.isHandRaised() ? this.activeItem.k() - this.dn() : 0;
+ public int getHandRaisedTime() { return this.dn(); } // Paper - OBFHELPER
public int dn() {
return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 513b3fac7..8dea7d36b 100644
index 513b3fac7f..8dea7d36b6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {