Updates to all Entities to use getBukkitEntity() any time an event is

raised.
Similar update to CraftVehicle and CraftLivingEntity
This commit is contained in:
Andrew Ardill
2011-01-17 08:53:42 +08:00
committed by Dinner Bone
parent 3400eafaf1
commit 5f2c8108b7
14 changed files with 34 additions and 70 deletions

View File

@@ -176,14 +176,10 @@ public class EntityArrow extends Entity {
boolean bounce;
if (entity instanceof EntityLiving) {
CraftServer server = ((WorldServer) this.l).getServer();
CraftEntity damagee = new CraftLivingEntity(server, (EntityLiving) entity);
CraftEntity damager = new CraftLivingEntity(server, b);
CraftEntity projectile = new CraftArrow(server, (EntityArrow) this);
//TODO decide if we should create DamageCause.ARROW, DamageCause.PROJECTILE
// or leave as DamageCause.ENTITY_ATTACK
EntityDamageByProjectileEvent edbpe = new EntityDamageByProjectileEvent(
damager, damagee, projectile, EntityDamageEvent.DamageCause.ENTITY_ATTACK, 4);
EntityDamageByProjectileEvent edbpe = new EntityDamageByProjectileEvent(b.getBukkitEntity(), entity.getBukkitEntity(), this.getBukkitEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, 4);
server.getPluginManager().callEvent(edbpe);
if(!edbpe.isCancelled()) {