summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockCactus.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/BlockCactus.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/BlockCactus.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockCactus.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 820849f2..569c5be9 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -6,8 +6,8 @@ import org.bukkit.craftbukkit.CraftBlock;
import org.bukkit.craftbukkit.CraftEntity;
import org.bukkit.craftbukkit.CraftLivingEntity;
import org.bukkit.craftbukkit.CraftPlayer;
-import org.bukkit.event.entity.EntityDamagedByBlockEvent;
-import org.bukkit.event.entity.EntityDamagedEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end
import java.util.Random;
@@ -104,7 +104,7 @@ public class BlockCactus extends Block {
}
if(toPassIn != null) {
- EntityDamagedByBlockEvent edbbe = new EntityDamagedByBlockEvent(((WorldServer) world).getWorld().getBlockAt(i, j, k), toPassIn, EntityDamagedEvent.DamageCause.CONTACT, 1);
+ EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(((WorldServer) world).getWorld().getBlockAt(i, j, k), toPassIn, EntityDamageEvent.DamageCause.CONTACT, 1);
((WorldServer) world).getServer().getPluginManager().callEvent(edbbe);
if (edbbe.isCancelled())