From 26a85846fc1fde0560a12f26fafde7a85d61c910 Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Tue, 30 Oct 2012 20:11:24 -0700
Subject: [PATCH] Resolving potential conflict with #285.

---
 .../nossr50/skills/gathering/Herbalism.java     | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
index 9443325e4..027ab907d 100644
--- a/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
+++ b/src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
@@ -37,9 +37,6 @@ public class Herbalism {
      * @param block The block to be changed by Green Terra
      */
     public static void greenTerra(Player player, Block block) {
-        if(player == null)
-            return;
-
         PlayerInventory inventory = player.getInventory();
         boolean hasSeeds = inventory.contains(Material.SEEDS);
 
@@ -54,9 +51,6 @@ public class Herbalism {
     }
 
     public static void greenTerraConvert(Player player, Block block) {
-        if(player == null)
-            return;
-
         Material type = block.getType();
 
         if (Misc.blockBreakSimulate(block, player, false)) {
@@ -83,9 +77,6 @@ public class Herbalism {
      * @param plugin mcMMO plugin instance
      */
     public static void herbalismProcCheck(final Block block, Player player, BlockBreakEvent event, mcMMO plugin) {
-        if(player == null)
-            return;
-
         final PlayerProfile profile = Users.getProfile(player);
         final int MAX_BONUS_LEVEL = 1000;
 
@@ -381,9 +372,6 @@ public class Herbalism {
      * @param plugin mcMMO plugin instance
      */
     private static void greenThumbWheat(Block block, Player player, BlockBreakEvent event, mcMMO plugin) {
-        if(player == null)
-            return;
-
         final int MAX_BONUS_LEVEL = 1500;
 
         PlayerProfile profile = Users.getProfile(player);
@@ -419,9 +407,6 @@ public class Herbalism {
      * @param block The block being used in the ability
      */
     public static void greenThumbBlocks(ItemStack is, Player player, Block block) {
-        if(player == null)
-            return;
-
         final int MAX_BONUS_LEVEL = 1500;
 
         PlayerProfile profile = Users.getProfile(player);
@@ -443,4 +428,4 @@ public class Herbalism {
             player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Fail"));
         }
     }
-}
+}
\ No newline at end of file