summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/Explosion.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-01-15 21:26:05 +0100
committerErik Broes <erikbroes@grum.nl>2011-01-15 21:26:52 +0100
commit8c8f53fd44de8f4d471131abf931cf372f820bce (patch)
treea1a0515b2ccb3e3352ede4ebb16867686cfb3504 /src/main/java/net/minecraft/server/Explosion.java
parent2184d240db052d3679b47565c7e9c2cc5566b433 (diff)
downloadcraftbukkit-8c8f53fd44de8f4d471131abf931cf372f820bce.tar
craftbukkit-8c8f53fd44de8f4d471131abf931cf372f820bce.tar.gz
craftbukkit-8c8f53fd44de8f4d471131abf931cf372f820bce.tar.lz
craftbukkit-8c8f53fd44de8f4d471131abf931cf372f820bce.tar.xz
craftbukkit-8c8f53fd44de8f4d471131abf931cf372f820bce.zip
Events should be present tense, not paste tense.
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
-rw-r--r--src/main/java/net/minecraft/server/Explosion.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 3bf4358c..87abf71c 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -5,9 +5,9 @@ import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.event.entity.EntityDamagedByBlockEvent;
-import org.bukkit.event.entity.EntityDamagedByEntityEvent;
-import org.bukkit.event.entity.EntityDamagedEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end
import java.util.*;
@@ -123,7 +123,7 @@ public class Explosion {
if (e == null) { // Block explosion
// Craftbukkit TODO: get the x/y/z of the tnt block?
- EntityDamagedByBlockEvent edbbe = new EntityDamagedByBlockEvent(null, damagee, EntityDamagedEvent.DamageCause.BLOCK_EXPLOSION, damage);
+ EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(null, damagee, EntityDamageEvent.DamageCause.BLOCK_EXPLOSION, damage);
servr.getPluginManager().callEvent(edbbe);
if(!edbbe.isCancelled()) entity.a(e, damage);
} else {
@@ -134,7 +134,7 @@ public class Explosion {
} else if (e instanceof EntityLiving) {
damager = new CraftLivingEntity(servr, (EntityLiving) e);
}
- EntityDamagedByEntityEvent edbbe = new EntityDamagedByEntityEvent(damager, damagee, EntityDamagedEvent.DamageCause.ENTITY_EXPLOSION, damage);
+ EntityDamageByEntityEvent edbbe = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage);
servr.getPluginManager().callEvent(edbbe);
if (!edbbe.isCancelled()) {