From 2b5a61f03d135a3f4e82bc6f4b2b8ea47abd5dcb Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Thu, 15 Sep 2011 17:36:27 +0100
Subject: Rename revision 2

---
 src/main/java/net/minecraft/server/BlockCactus.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/net/minecraft/server/BlockCactus.java')

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);
     }
 }
-- 
cgit v1.2.3