diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-15 01:23:52 +0100 |
| commit | 5b2c774edc069f70d1fa9940d96bb0b8705bef7a (patch) | |
| tree | 79d1800e7154bba7b5fca4f8c8373ee4376cca89 /src/main/java/net/minecraft/server/BlockCactus.java | |
| parent | 54bcd1c1f36691a714234e5ca2f30a20b3ad2816 (diff) | |
| download | craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.gz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.lz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.tar.xz craftbukkit-5b2c774edc069f70d1fa9940d96bb0b8705bef7a.zip | |
Update for Minecraft 1.8
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockCactus.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockCactus.java | 4 |
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 d1800e63..3ba77d17 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((Entity) null, event.getDamage()); + entity.damageEntity(DamageSource.g, event.getDamage()); } return; } // CraftBukkit end - entity.damageEntity((Entity) null, 1); + entity.damageEntity(DamageSource.g, 1); } } |