summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityArrow.java
diff options
context:
space:
mode:
authorAndrew Ardill <andrew.ardill@gmail.com>2011-12-05 19:13:10 +1100
committerAndrew Ardill <andrew.ardill@gmail.com>2011-12-05 19:23:40 +1100
commitb1a3aa602a8021228e3cdf429cb613c590ceb122 (patch)
tree8021307349caffcf78fa6e7aefbf0cfe0d33125a /src/main/java/net/minecraft/server/EntityArrow.java
parent8363eadcabe1ac9277842e75d56a7409ef6e3ced (diff)
downloadcraftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar
craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar.gz
craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar.lz
craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.tar.xz
craftbukkit-b1a3aa602a8021228e3cdf429cb613c590ceb122.zip
Clean-up some events to maintain general style
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityArrow.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityArrow.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 64e71b9d..d4bfa929 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -3,6 +3,7 @@ package net.minecraft.server;
import java.util.List;
// CraftBukkit start
+import org.bukkit.Bukkit;
import org.bukkit.entity.Projectile;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
@@ -187,13 +188,12 @@ public class EntityArrow extends Entity {
// CraftBukkit start
boolean stick;
if (entity instanceof EntityLiving) {
- org.bukkit.Server server = this.world.getServer();
org.bukkit.entity.Entity damagee = movingobjectposition.entity.getBukkitEntity();
Projectile projectile = (Projectile) this.getBukkitEntity();
EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(projectile, damagee, EntityDamageEvent.DamageCause.PROJECTILE, l);
- server.getPluginManager().callEvent(event);
+ Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
stick = !projectile.doesBounce();