summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/BlockCactus.java
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-09-15 17:36:27 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-09-15 17:39:17 +0100
commit2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb (patch)
tree412002b4ee8104908e0d71a996500ae188860ad4 /src/main/java/net/minecraft/server/BlockCactus.java
parent3c5632de31b923c8eaefae130f042a4d24566881 (diff)
downloadcraftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar
craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.gz
craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.lz
craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.tar.xz
craftbukkit-2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb.zip
Rename revision 2
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
-rw-r--r--src/main/java/net/minecraft/server/BlockCactus.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 3ba77d17..792c51b2 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -90,12 +90,12 @@ public class BlockCactus extends Block {
world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
- entity.damageEntity(DamageSource.g, event.getDamage());
+ entity.damageEntity(DamageSource.CACTUS, event.getDamage());
}
return;
}
// CraftBukkit end
- entity.damageEntity(DamageSource.g, 1);
+ entity.damageEntity(DamageSource.CACTUS, 1);
}
}