From c64fe5080c996e8ea29b3e113043dd0aa962aaee Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 13 Dec 2018 11:00:00 +1100 Subject: Mappings Update --- nms-patches/EntityZombie.patch | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'nms-patches/EntityZombie.patch') diff --git a/nms-patches/EntityZombie.patch b/nms-patches/EntityZombie.patch index 1a0a9240..d4176432 100644 --- a/nms-patches/EntityZombie.patch +++ b/nms-patches/EntityZombie.patch @@ -96,15 +96,17 @@ } } -@@ -362,7 +395,7 @@ +@@ -362,8 +395,8 @@ EntityZombieVillager entityzombievillager = new EntityZombieVillager(this.world); entityzombievillager.u(entityvillager); - this.world.kill(entityvillager); +- entityzombievillager.prepare(this.world.getDamageScaler(new BlockPosition(entityzombievillager)), new EntityZombie.GroupDataZombie(false, null), (NBTTagCompound) null); + // this.world.kill(entityvillager); // CraftBukkit - moved down - entityzombievillager.prepare(this.world.getDamageScaler(new BlockPosition(entityzombievillager)), new EntityZombie.GroupDataZombie(false, null), (NBTTagCompound) null); ++ entityzombievillager.prepare(this.world.getDamageScaler(new BlockPosition(entityzombievillager)), new EntityZombie.GroupDataZombie(false), (NBTTagCompound) null); // CraftBukkit - decompile error entityzombievillager.setProfession(entityvillager.getProfession()); entityzombievillager.setBaby(entityvillager.isBaby()); + entityzombievillager.setNoAI(entityvillager.isNoAI()); @@ -372,7 +405,13 @@ entityzombievillager.setCustomNameVisible(entityvillager.getCustomNameVisible()); } @@ -120,6 +122,15 @@ this.world.a((EntityHuman) null, 1026, new BlockPosition(this), 0); } +@@ -399,7 +438,7 @@ + + this.p(this.random.nextFloat() < 0.55F * f); + if (object == null) { +- object = new EntityZombie.GroupDataZombie(this.world.random.nextFloat() < 0.05F, null); ++ object = new EntityZombie.GroupDataZombie(this.world.random.nextFloat() < 0.05F); // CraftBukkit - decompile error + } + + if (object instanceof EntityZombie.GroupDataZombie) { @@ -422,7 +461,7 @@ entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); -- cgit v1.2.3