diff options
author | GJ <gjmcferrin@gmail.com> | 2014-02-05 11:56:37 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-04-18 10:43:06 -0500 |
commit | 890a4af12fce9c28dcc69aebf14078420293dc00 (patch) | |
tree | 05a1f7938e78c3040aac869a25678c07750c7b13 /src/main/java/net/minecraft/server/EntityPigZombie.java | |
parent | 3abba823151c87050fb7680c3a7194eb1fe5d64d (diff) | |
download | craftbukkit-890a4af12fce9c28dcc69aebf14078420293dc00.tar craftbukkit-890a4af12fce9c28dcc69aebf14078420293dc00.tar.gz craftbukkit-890a4af12fce9c28dcc69aebf14078420293dc00.tar.lz craftbukkit-890a4af12fce9c28dcc69aebf14078420293dc00.tar.xz craftbukkit-890a4af12fce9c28dcc69aebf14078420293dc00.zip |
[Bleeding] Call EntityTargetEvent in many new places.
Adds BUKKIT-5388, BUKKIT-5387, BUKKIT-5386, BUKKIT-5483, BUKKIT-5484.
Fixes BUKKIT-5389.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPigZombie.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPigZombie.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java index 38d14422..ec268506 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java @@ -83,22 +83,20 @@ public class EntityPigZombie extends EntityZombie { if (entity1 instanceof EntityPigZombie) { EntityPigZombie entitypigzombie = (EntityPigZombie) entity1; - entitypigzombie.c(entity); + entitypigzombie.c(entity, EntityTargetEvent.TargetReason.PIG_ZOMBIE_TARGET); } } - this.c(entity); + this.c(entity, EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY); } return super.damageEntity(damagesource, f); } } - private void c(Entity entity) { - // CraftBukkit start - org.bukkit.entity.Entity bukkitTarget = entity == null ? null : entity.getBukkitEntity(); - - EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, EntityTargetEvent.TargetReason.PIG_ZOMBIE_TARGET); + // CraftBukkit start + private void c(Entity entity, EntityTargetEvent.TargetReason reason) { // add TargetReason + EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), entity.getBukkitEntity(), reason); this.world.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { |