summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityZombie.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-12-13 14:10:36 +1100
committermd_5 <git@md-5.net>2018-12-13 14:10:36 +1100
commit6ec8ea5cf4f8db20562abdead706982d4e842943 (patch)
tree9c9c9d3852da9b0baeb77c2e0d92b13177753186 /nms-patches/EntityZombie.patch
parentc64fe5080c996e8ea29b3e113043dd0aa962aaee (diff)
downloadcraftbukkit-6ec8ea5cf4f8db20562abdead706982d4e842943.tar
craftbukkit-6ec8ea5cf4f8db20562abdead706982d4e842943.tar.gz
craftbukkit-6ec8ea5cf4f8db20562abdead706982d4e842943.tar.lz
craftbukkit-6ec8ea5cf4f8db20562abdead706982d4e842943.tar.xz
craftbukkit-6ec8ea5cf4f8db20562abdead706982d4e842943.zip
SPIGOT-4526: Add conversion time API for Zombie & subclasses
Diffstat (limited to 'nms-patches/EntityZombie.patch')
-rw-r--r--nms-patches/EntityZombie.patch23
1 files changed, 20 insertions, 3 deletions
diff --git a/nms-patches/EntityZombie.patch b/nms-patches/EntityZombie.patch
index d4176432..6912ad16 100644
--- a/nms-patches/EntityZombie.patch
+++ b/nms-patches/EntityZombie.patch
@@ -16,8 +16,17 @@
public class EntityZombie extends EntityMonster {
protected static final IAttribute c = (new AttributeRanged((IAttribute) null, "zombie.spawnReinforcements", 0.0D, 0.0D, 1.0D)).a("Spawn Reinforcements Chance");
-@@ -21,6 +30,7 @@
- private int drownedConversionTime;
+@@ -14,13 +23,14 @@
+ private static final DataWatcherObject<Boolean> bC = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
+ private static final DataWatcherObject<Integer> bD = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.b);
+ private static final DataWatcherObject<Boolean> bE = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
+- private static final DataWatcherObject<Boolean> bF = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i);
++ public static final DataWatcherObject<Boolean> bF = DataWatcher.a(EntityZombie.class, DataWatcherRegistry.i); // PAIL
+ private final PathfinderGoalBreakDoor bG;
+ private boolean bH;
+ private int bI;
+- private int drownedConversionTime;
++ public int drownedConversionTime; // PAIL
private float bK;
private float bL;
+ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
@@ -39,7 +48,7 @@
if (this.drownedConversionTime < 0) {
this.dE();
}
-@@ -182,7 +196,14 @@
+@@ -182,14 +196,21 @@
}
if (flag) {
@@ -55,6 +64,14 @@
}
}
+ super.movementTick();
+ }
+
+- private void a(int i) {
++ public void a(int i) { // PAIL
+ this.drownedConversionTime = i;
+ this.getDataWatcher().set(EntityZombie.bF, true);
+ }
@@ -221,7 +242,12 @@
entityzombie.setCustomNameVisible(this.getCustomNameVisible());
}