EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 03:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Assorted bug fixes & cleanup.

Browse Source
This commit is contained in:
GJ
2012-03-09 01:23:32 -05:00
parent 9dfcbf1797
commit 6e8cfe5ec9
5 changed files with 136 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ public class Herbalism
public static void greenTerra(Player player, Block block){
PlayerInventory inventory = player.getInventory();
boolean hasSeeds = inventory.contains(Material.SEEDS);
if(block.getType() == Material.COBBLESTONE || block.getType() == Material.DIRT){
if(block.getType() == Material.COBBLESTONE || block.getType() == Material.DIRT || block.getType() == Material.SMOOTH_BRICK){
if(!hasSeeds)
player.sendMessage("You need more seeds to spread Green Terra");
if(hasSeeds && block.getType() != Material.WHEAT)

36
src/main/java/com/gmail/nossr50/skills/Skills.java
View File

@ -4,6 +4,7 @@ import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.block.Block;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@ -305,4 +306,39 @@ public class Skills
}
}
}
public static boolean triggerCheck(Player player, Block block, AbilityType ability) {
boolean activate = true;
PlayerProfile PP = Users.getProfile(player);
if (!ability.getPermissions(player)) {
activate = false;
return activate;
}
if (!ability.equals(AbilityType.LEAF_BLOWER)) {
if (!ability.getMode(PP)) {
activate = false;
return activate;
}
}
switch (ability) {
case BERSERK:
case GIGA_DRILL_BREAKER:
case SUPER_BREAKER:
case LEAF_BLOWER:
if (!m.blockBreakSimulate(block, player, true)) {
activate = false;
break;
}
if (!ability.blockCheck(block)) {
activate = false;
break;
}
default:
break;
}
return activate;
}
}