diff options
| author | feildmaster <admin@feildmaster.com> | 2012-03-09 15:40:59 -0600 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-03-10 02:08:33 -0500 |
| commit | 77ef0510958b7386b7f9b861aa7936f21a183a6b (patch) | |
| tree | 6c402f3c583c803cbd81450c788d4c65d0c2707a /src/main/java/net/minecraft/server/EntityHuman.java | |
| parent | a967d6e3710df70bbbc7663ed0f3ed8b65810d4d (diff) | |
| download | craftbukkit-77ef0510958b7386b7f9b861aa7936f21a183a6b.tar craftbukkit-77ef0510958b7386b7f9b861aa7936f21a183a6b.tar.gz craftbukkit-77ef0510958b7386b7f9b861aa7936f21a183a6b.tar.lz craftbukkit-77ef0510958b7386b7f9b861aa7936f21a183a6b.tar.xz craftbukkit-77ef0510958b7386b7f9b861aa7936f21a183a6b.zip | |
[Bleeding] Added new target events. Fixes BUKKIT-935
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 24fc1292..a5da800d 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -671,22 +671,6 @@ public abstract class EntityHuman extends EntityLiving { EntityWolf entitywolf1 = (EntityWolf) entity; if (entitywolf1.isTamed() && entitywolf1.H() == null && this.name.equals(entitywolf1.getOwnerName()) && (!flag || !entitywolf1.isSitting())) { - // CraftBukkit start - org.bukkit.entity.Entity bukkitTarget = entity == null ? null : entityliving.getBukkitEntity(); - - EntityTargetEvent event; - if (flag) { - event = new EntityTargetEvent(entitywolf1.getBukkitEntity(), bukkitTarget, EntityTargetEvent.TargetReason.OWNER_ATTACKED_TARGET); - } else { - event = new EntityTargetEvent(entitywolf1.getBukkitEntity(), bukkitTarget, EntityTargetEvent.TargetReason.TARGET_ATTACKED_OWNER); - } - this.world.getServer().getPluginManager().callEvent(event); - - if (event.isCancelled()) { - continue; - } - // CraftBukkit end - entitywolf1.setSitting(false); entitywolf1.setTarget(entityliving); } |