From c25ddf063a808e3adb749e22017661f403c5fb7e Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 17 Nov 2016 12:41:03 +1100 Subject: Update to Minecraft 1.11 --- nms-patches/EntityZombieVillager.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 nms-patches/EntityZombieVillager.patch (limited to 'nms-patches/EntityZombieVillager.patch') diff --git a/nms-patches/EntityZombieVillager.patch b/nms-patches/EntityZombieVillager.patch new file mode 100644 index 00000000..776cdba1 --- /dev/null +++ b/nms-patches/EntityZombieVillager.patch @@ -0,0 +1,31 @@ +--- a/net/minecraft/server/EntityZombieVillager.java ++++ b/net/minecraft/server/EntityZombieVillager.java +@@ -7,6 +7,7 @@ + private static final DataWatcherObject b = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.h); + private static final DataWatcherObject c = DataWatcher.a(EntityZombieVillager.class, DataWatcherRegistry.b); + private int conversionTime; ++ private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field + + public EntityZombieVillager(World world) { + super(world); +@@ -54,6 +55,11 @@ + public void A_() { + if (!this.world.isClientSide && this.isConverting()) { + int i = this.dq(); ++ // CraftBukkit start - Use wall time instead of ticks for villager conversion ++ int elapsedTicks = MinecraftServer.currentTick - this.lastTick; ++ this.lastTick = MinecraftServer.currentTick; ++ i *= elapsedTicks; ++ // CraftBukkit end + + this.conversionTime -= i; + if (this.conversionTime <= 0) { +@@ -116,7 +122,7 @@ + entityvillager.setCustomNameVisible(this.getCustomNameVisible()); + } + +- this.world.addEntity(entityvillager); ++ this.world.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason + entityvillager.addEffect(new MobEffect(MobEffects.CONFUSION, 200, 0)); + this.world.a((EntityHuman) null, 1027, new BlockPosition((int) this.locX, (int) this.locY, (int) this.locZ), 0); + } -- cgit v1.2.3