diff options
| author | md_5 <git@md-5.net> | 2018-08-26 12:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-08-26 12:00:00 +1000 |
| commit | ce1af0c348a8477f9ec58d79e6267e9226dc5dba (patch) | |
| tree | 369972a692f450001c06a13e202d916f9c1bb5a8 /nms-patches/EntityZombie.patch | |
| parent | 162bda93ff76fe96a6138a14176807f21a6ddef4 (diff) | |
| download | craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar.gz craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar.lz craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.tar.xz craftbukkit-ce1af0c348a8477f9ec58d79e6267e9226dc5dba.zip | |
Update to Minecraft 1.13.1
Diffstat (limited to 'nms-patches/EntityZombie.patch')
| -rw-r--r-- | nms-patches/EntityZombie.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/EntityZombie.patch b/nms-patches/EntityZombie.patch index 69dbfccd..25380ca7 100644 --- a/nms-patches/EntityZombie.patch +++ b/nms-patches/EntityZombie.patch @@ -30,7 +30,7 @@ } } -@@ -220,7 +234,7 @@ +@@ -221,7 +235,7 @@ entityzombie.setCustomNameVisible(this.getCustomNameVisible()); } @@ -39,10 +39,10 @@ this.die(); } } -@@ -251,8 +265,8 @@ +@@ -252,8 +266,8 @@ if (this.world.getType(new BlockPosition(i1, j1 - 1, k1)).q() && this.world.getLightLevel(new BlockPosition(i1, j1, k1)) < 10) { entityzombie.setPosition((double) i1, (double) j1, (double) k1); - if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.b((Entity) entityzombie, entityzombie.getBoundingBox()) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()) && !this.world.containsLiquid(entityzombie.getBoundingBox())) { + if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a_(entityzombie, entityzombie.getBoundingBox()) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()) && !this.world.containsLiquid(entityzombie.getBoundingBox())) { - this.world.addEntity(entityzombie); - entityzombie.setGoalTarget(entityliving); + this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit @@ -50,7 +50,7 @@ entityzombie.prepare(this.world.getDamageScaler(new BlockPosition(entityzombie)), (GroupDataEntity) null, (NBTTagCompound) null); this.getAttributeInstance(EntityZombie.c).b(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, 0)); entityzombie.getAttributeInstance(EntityZombie.c).b(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806D, 0)); -@@ -275,7 +289,14 @@ +@@ -276,7 +290,14 @@ float f = this.world.getDamageScaler(new BlockPosition(this)).b(); if (this.getItemInMainHand().isEmpty() && this.isBurning() && this.random.nextFloat() < f * 0.3F) { @@ -66,7 +66,7 @@ } } -@@ -371,7 +392,7 @@ +@@ -372,7 +393,7 @@ entityzombievillager.setCustomNameVisible(entityvillager.getCustomNameVisible()); } @@ -75,7 +75,7 @@ this.world.a((EntityHuman) null, 1026, new BlockPosition(this), 0); } -@@ -421,7 +442,7 @@ +@@ -422,7 +443,7 @@ entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); entitychicken1.s(true); @@ -84,7 +84,7 @@ this.startRiding(entitychicken1); } } -@@ -494,7 +515,7 @@ +@@ -495,7 +516,7 @@ } public void die(DamageSource damagesource) { @@ -93,7 +93,7 @@ if (damagesource.getEntity() instanceof EntityCreeper) { EntityCreeper entitycreeper = (EntityCreeper) damagesource.getEntity(); -@@ -507,6 +528,7 @@ +@@ -508,6 +529,7 @@ } } } |