Only remove seed on greenThumb - Green Terra's already had the seed

removed the first time.
This commit is contained in:
GJ 2013-02-24 14:04:54 -05:00
parent a485308fca
commit 5cd542002e

View File

@ -320,22 +320,19 @@ public class Herbalism {
* @return true if the ability was successful, false otherwise * @return true if the ability was successful, false otherwise
*/ */
private static boolean processGreenThumbPlants(BlockState blockState, Player player) { private static boolean processGreenThumbPlants(BlockState blockState, Player player) {
PlayerInventory playerInventory = player.getInventory();
ItemStack seed = HerbalismBlock.getHerbalismBlock(blockState.getType()).getDropItem();
if (!playerInventory.containsAtLeast(seed, 1)) {
return false;
}
PlayerProfile playerProfile = Users.getPlayer(player).getProfile(); PlayerProfile playerProfile = Users.getPlayer(player).getProfile();
if (playerProfile.getAbilityMode(AbilityType.GREEN_TERRA)) { if (playerProfile.getAbilityMode(AbilityType.GREEN_TERRA)) {
playerInventory.removeItem(seed);
player.updateInventory(); // Needed until replacement available
return convertGreenTerraPlants(blockState); return convertGreenTerraPlants(blockState);
} }
else if (SkillTools.activationSuccessful(player, SkillType.HERBALISM, greenThumbMaxChance, greenThumbMaxLevel)) { else if (SkillTools.activationSuccessful(player, SkillType.HERBALISM, greenThumbMaxChance, greenThumbMaxLevel)) {
PlayerInventory playerInventory = player.getInventory();
ItemStack seed = HerbalismBlock.getHerbalismBlock(blockState.getType()).getDropItem();
if (!playerInventory.containsAtLeast(seed, 1)) {
return false;
}
playerInventory.removeItem(seed); playerInventory.removeItem(seed);
player.updateInventory(); // Needed until replacement available player.updateInventory(); // Needed until replacement available