diff options
author | GJ <gjmcferrin@gmail.com> | 2014-02-05 11:42:44 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-04-18 09:34:08 -0500 |
commit | 729df1a734053f61459f7abdcc92a892f7eb3aad (patch) | |
tree | c81146e9ef77bf88b225743ad2e91882f30fd420 /src/main/java/net/minecraft/server/EntityZombie.java | |
parent | b6831792ec0ee830ac88bbb51dc4d9d3f0bae3a3 (diff) | |
download | craftbukkit-729df1a734053f61459f7abdcc92a892f7eb3aad.tar craftbukkit-729df1a734053f61459f7abdcc92a892f7eb3aad.tar.gz craftbukkit-729df1a734053f61459f7abdcc92a892f7eb3aad.tar.lz craftbukkit-729df1a734053f61459f7abdcc92a892f7eb3aad.tar.xz craftbukkit-729df1a734053f61459f7abdcc92a892f7eb3aad.zip |
[Bleeding] Add many missing SpawnReasons.
Adds BUKKIT-5370, BUKKIT-5377, BUKKIT-5378, BUKKIT-5379, BUKKIT-5380,
BUKKIT-5381, BUKKIT-5382. Adds reasons for zombies infecting villagers and
zombie villagers being cured. Readds reason for a skeleton being spawned as
a spider jockey. Adds reason to distinguish ocelot babies from the parent
they spawned with. Adds reasons for chunk generation causing the ender
dragon, villagers, and witches to spawn. And finally, adds a reason for
spawning a chicken mount for a baby zombie.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityZombie.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityZombie.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java index a0b6f62e..66c4c9c4 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -7,6 +7,7 @@ import java.util.UUID; //CraftBukkit start import org.bukkit.craftbukkit.entity.CraftLivingEntity; +import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.EntityCombustByEntityEvent; import org.bukkit.event.entity.EntityCombustEvent; //CraftBukkit end @@ -186,7 +187,7 @@ public class EntityZombie extends EntityMonster { if (World.a((IBlockAccess) this.world, i1, j1 - 1, k1) && this.world.getLightLevel(i1, j1, k1) < 10) { entityzombie.setPosition((double) i1, (double) j1, (double) k1); if (this.world.b(entityzombie.boundingBox) && this.world.getCubes(entityzombie, entityzombie.boundingBox).isEmpty() && !this.world.containsLiquid(entityzombie.boundingBox)) { - this.world.addEntity(entityzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit + this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit entityzombie.setGoalTarget(entityliving); entityzombie.a((GroupDataEntity) null); this.getAttributeInstance(bp).a(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, 0)); @@ -341,7 +342,7 @@ public class EntityZombie extends EntityMonster { entityzombie.setBaby(true); } - this.world.addEntity(entityzombie); + this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason this.world.a((EntityHuman) null, 1016, (int) this.locX, (int) this.locY, (int) this.locZ, 0); } } @@ -379,7 +380,7 @@ public class EntityZombie extends EntityMonster { entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entitychicken1.a((GroupDataEntity) null); entitychicken1.i(true); - this.world.addEntity(entitychicken1); + this.world.addEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); this.mount(entitychicken1); } } @@ -462,7 +463,7 @@ public class EntityZombie extends EntityMonster { } this.world.kill(this); - this.world.addEntity(entityvillager); + this.world.addEntity(entityvillager, CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason entityvillager.addEffect(new MobEffect(MobEffectList.CONFUSION.id, 200, 0)); this.world.a((EntityHuman) null, 1017, (int) this.locX, (int) this.locY, (int) this.locZ, 0); } |