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

Fixed Green Terra not working.

Browse Source
This commit is contained in:
GJ 2012-03-10 00:20:43 -05:00
parent 358c333c70
commit 5d55af8183
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -229,9 +229,10 @@ public class mcBlockListener implements Listener {
/* /*
* ABILITY TRIGGER CHECKS * ABILITY TRIGGER CHECKS
*/ */
if (PP.getGreenTerraMode() && Skills.triggerCheck(player, block, AbilityType.GREEN_TERRA)) { if (PP.getGreenTerraMode() && mcPermissions.getInstance().herbalismAbility(player)) {
Herbalism.greenTerra(player, block); Herbalism.greenTerra(player, block);
} }
if (PP.getGigaDrillBreakerMode() && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) { if (PP.getGigaDrillBreakerMode() && Skills.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) { if (LoadProperties.excavationRequiresShovel && ItemChecks.isShovel(inhand)) {
event.setInstaBreak(true); event.setInstaBreak(true);

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

@ -22,18 +22,18 @@ public class Herbalism
public static void greenTerra(Player player, Block block){ public static void greenTerra(Player player, Block block){
PlayerInventory inventory = player.getInventory(); PlayerInventory inventory = player.getInventory();
boolean hasSeeds = inventory.contains(Material.SEEDS); boolean hasSeeds = inventory.contains(Material.SEEDS);
if(block.getType() == Material.COBBLESTONE || block.getType() == Material.DIRT || block.getType() == Material.SMOOTH_BRICK){ if(block.getType().equals(Material.COBBLESTONE) || block.getType().equals(Material.DIRT) || block.getType().equals(Material.SMOOTH_BRICK)){
if(!hasSeeds) if(!hasSeeds)
player.sendMessage("You need more seeds to spread Green Terra"); player.sendMessage("You need more seeds to spread Green Terra");
if(hasSeeds && block.getType() != Material.WHEAT) if(hasSeeds && !block.getType().equals(Material.WHEAT))
{ {
inventory.removeItem(new ItemStack(Material.SEEDS, 1)); inventory.removeItem(new ItemStack(Material.SEEDS, 1));
player.updateInventory(); player.updateInventory();
if(LoadProperties.enableSmoothToMossy && block.getType() == Material.SMOOTH_BRICK) if(LoadProperties.enableSmoothToMossy && block.getType().equals(Material.SMOOTH_BRICK))
block.setData((byte)1); block.setData((byte) 0x1);
if(LoadProperties.enableDirtToGrass && block.getType() == Material.DIRT) if(LoadProperties.enableDirtToGrass && block.getType().equals(Material.DIRT))
block.setType(Material.GRASS); block.setType(Material.GRASS);
if(LoadProperties.enableCobbleToMossy && block.getType() == Material.COBBLESTONE) if(LoadProperties.enableCobbleToMossy && block.getType().equals(Material.COBBLESTONE))
block.setType(Material.MOSSY_COBBLESTONE); block.setType(Material.MOSSY_COBBLESTONE);
} }
} }