EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

Resolving potential conflict with #285.

Browse Source
This commit is contained in:
Glitchfinder 2012-10-30 20:11:24 -07:00
parent cd40507609
commit 26a85846fc
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/gmail/nossr50/skills/gathering/Herbalism.java
View File

@ -37,9 +37,6 @@ public class Herbalism {
* @param block The block to be changed by Green Terra * @param block The block to be changed by Green Terra
*/ */
public static void greenTerra(Player player, Block block) { public static void greenTerra(Player player, Block block) {
if(player == null)
return;
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
boolean hasSeeds = inventory.contains(Material.SEEDS); boolean hasSeeds = inventory.contains(Material.SEEDS);
@ -54,9 +51,6 @@ public class Herbalism {
} }
public static void greenTerraConvert(Player player, Block block) { public static void greenTerraConvert(Player player, Block block) {
if(player == null)
return;
Material type = block.getType(); Material type = block.getType();
if (Misc.blockBreakSimulate(block, player, false)) { if (Misc.blockBreakSimulate(block, player, false)) {
@ -83,9 +77,6 @@ public class Herbalism {
* @param plugin mcMMO plugin instance * @param plugin mcMMO plugin instance
*/ */
public static void herbalismProcCheck(final Block block, Player player, BlockBreakEvent event, mcMMO plugin) { public static void herbalismProcCheck(final Block block, Player player, BlockBreakEvent event, mcMMO plugin) {
if(player == null)
return;
final PlayerProfile profile = Users.getProfile(player); final PlayerProfile profile = Users.getProfile(player);
final int MAX_BONUS_LEVEL = 1000; final int MAX_BONUS_LEVEL = 1000;
@ -381,9 +372,6 @@ public class Herbalism {
* @param plugin mcMMO plugin instance * @param plugin mcMMO plugin instance
*/ */
private static void greenThumbWheat(Block block, Player player, BlockBreakEvent event, mcMMO plugin) { private static void greenThumbWheat(Block block, Player player, BlockBreakEvent event, mcMMO plugin) {
if(player == null)
return;
final int MAX_BONUS_LEVEL = 1500; final int MAX_BONUS_LEVEL = 1500;
PlayerProfile profile = Users.getProfile(player); PlayerProfile profile = Users.getProfile(player);
@ -419,9 +407,6 @@ public class Herbalism {
* @param block The block being used in the ability * @param block The block being used in the ability
*/ */
public static void greenThumbBlocks(ItemStack is, Player player, Block block) { public static void greenThumbBlocks(ItemStack is, Player player, Block block) {
if(player == null)
return;
final int MAX_BONUS_LEVEL = 1500; final int MAX_BONUS_LEVEL = 1500;
PlayerProfile profile = Users.getProfile(player); PlayerProfile profile = Users.getProfile(player);
@ -443,4 +428,4 @@ public class Herbalism {
player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Fail")); player.sendMessage(LocaleLoader.getString("Herbalism.Ability.GTh.Fail"));
} }
} }
} }