summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-11-06 18:03:23 +1100
committermd_5 <git@md-5.net>2018-11-06 18:03:23 +1100
commit7fbc14c40d0f10925a246bcf0b5a7d7dcae05817 (patch)
treee6cd0435078882babc967daced94da99372013be
parentd7bebeff028af7baf52105394529598f1c4093c4 (diff)
downloadcraftbukkit-7fbc14c40d0f10925a246bcf0b5a7d7dcae05817.tar
craftbukkit-7fbc14c40d0f10925a246bcf0b5a7d7dcae05817.tar.gz
craftbukkit-7fbc14c40d0f10925a246bcf0b5a7d7dcae05817.tar.lz
craftbukkit-7fbc14c40d0f10925a246bcf0b5a7d7dcae05817.tar.xz
craftbukkit-7fbc14c40d0f10925a246bcf0b5a7d7dcae05817.zip
Improve zombie villagers
-rw-r--r--nms-patches/EntityZombieVillager.patch7
1 files changed, 5 insertions, 2 deletions
diff --git a/nms-patches/EntityZombieVillager.patch b/nms-patches/EntityZombieVillager.patch
index 247d0227..2b8d7cdd 100644
--- a/nms-patches/EntityZombieVillager.patch
+++ b/nms-patches/EntityZombieVillager.patch
@@ -8,9 +8,12 @@
public EntityZombieVillager(World world) {
super(world);
-@@ -60,6 +61,11 @@
+@@ -58,8 +59,13 @@
+ }
+
public void B_() {
- if (!this.world.isClientSide && this.isConverting()) {
+- if (!this.world.isClientSide && this.isConverting()) {
++ if (!this.world.isClientSide && this.isConverting() && this.isAlive()) { // CraftBukkit
int i = this.du();
+ // CraftBukkit start - Use wall time instead of ticks for villager conversion
+ int elapsedTicks = MinecraftServer.currentTick - this.lastTick;