diff options
author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-11-29 21:30:37 +1100 |
---|---|---|
committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-11-29 21:30:37 +1100 |
commit | 9455ff177796415d524b922a899965112652bf01 (patch) | |
tree | ef52801d4dff540a7368003d2422d5dda57f0e6e /src/main/java/net/minecraft/server/EntityArrow.java | |
parent | a1ad0c0103fd565e28b6d759100cdbc14e0974e5 (diff) | |
download | craftbukkit-9455ff177796415d524b922a899965112652bf01.tar craftbukkit-9455ff177796415d524b922a899965112652bf01.tar.gz craftbukkit-9455ff177796415d524b922a899965112652bf01.tar.lz craftbukkit-9455ff177796415d524b922a899965112652bf01.tar.xz craftbukkit-9455ff177796415d524b922a899965112652bf01.zip |
cleanup of projectiles
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityArrow.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityArrow.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index 22b8c205..23ad759b 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -3,7 +3,6 @@ package net.minecraft.server; import java.util.List; // CraftBukkit start -import org.bukkit.craftbukkit.entity.CraftLivingEntity; import org.bukkit.entity.Projectile; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -190,15 +189,11 @@ public class EntityArrow extends Entity { if (entity instanceof EntityLiving) { org.bukkit.Server server = this.world.getServer(); - // TODO decide if we should create DamageCause.ARROW, DamageCause.PROJECTILE - // or leave as DamageCause.ENTITY_ATTACK org.bukkit.entity.Entity damagee = movingobjectposition.entity.getBukkitEntity(); Projectile projectile = (Projectile) this.getBukkitEntity(); - // TODO deal with arrows being fired from a non-entity EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(projectile, damagee, EntityDamageEvent.DamageCause.PROJECTILE, l); server.getPluginManager().callEvent(event); - this.shooter = (projectile.getShooter() == null) ? null : ((CraftLivingEntity) projectile.getShooter()).getHandle(); if (event.isCancelled()) { stick = !projectile.doesBounce(); |