New beta!

bugged.

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>1.4.06-dev5</version>
+    <version>1.4.06-beta5</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <issueManagement>

src/main/java/com/gmail/nossr50/api/ExperienceAPI.java

@@ -506,11 +506,7 @@ public final class ExperienceAPI {
         int powerLevel = 0;
         PlayerProfile profile = getOfflineProfile(playerName);
 
-        for (SkillType type : SkillType.values()) {
-            if (type.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType type : SkillType.nonChildSkills()) {
             powerLevel += profile.getSkillLevel(type);
         }
 

src/main/java/com/gmail/nossr50/commands/McmmoCommand.java

@@ -62,52 +62,52 @@ public class McmmoCommand implements CommandExecutor {
     private void displayPartyCommands(CommandSender sender) {
         if (Permissions.party(sender)) {
             sender.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            sender.sendMessage("/party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
-            sender.sendMessage("/party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
-            sender.sendMessage("/party quit " + LocaleLoader.getString("Commands.Party.Quit"));
+            sender.sendMessage(" /party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
+            sender.sendMessage(" /party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
+            sender.sendMessage(" /party quit " + LocaleLoader.getString("Commands.Party.Quit"));
 
             if (Permissions.partyChat(sender)) {
-                sender.sendMessage("/party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
+                sender.sendMessage(" /party chat " + LocaleLoader.getString("Commands.Party.Toggle"));
             }
 
-            sender.sendMessage("/party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
-            sender.sendMessage("/party accept " + LocaleLoader.getString("Commands.Party.Accept"));
+            sender.sendMessage(" /party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
+            sender.sendMessage(" /party accept " + LocaleLoader.getString("Commands.Party.Accept"));
 
             if (Permissions.partySubcommand(sender, PartySubcommandType.TELEPORT)) {
-                sender.sendMessage("/party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
+                sender.sendMessage(" /party teleport " + LocaleLoader.getString("Commands.Party.Teleport"));
             }
         }
     }
 
     private void displayOtherCommands(CommandSender sender) {
         sender.sendMessage(LocaleLoader.getString("Commands.Other"));
-        sender.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
-        sender.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
+        sender.sendMessage(" /mcstats " + LocaleLoader.getString("Commands.Stats"));
+        sender.sendMessage(" /mctop " + LocaleLoader.getString("Commands.Leaderboards"));
 
         if (Permissions.skillreset(sender)) {
-            sender.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
+            sender.sendMessage(" /skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
         }
 
         if (Permissions.mcability(sender)) {
-            sender.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+            sender.sendMessage(" /mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
         }
 
         if (Permissions.adminChat(sender)) {
-            sender.sendMessage("/adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+            sender.sendMessage(" /adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
         }
 
         if (Permissions.inspect(sender)) {
-            sender.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+            sender.sendMessage(" /inspect " + LocaleLoader.getString("Commands.Inspect"));
         }
 
         if (Permissions.mmoedit(sender)) {
-            sender.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+            sender.sendMessage(" /mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
         }
 
         if (Permissions.mcgod(sender)) {
-            sender.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+            sender.sendMessage(" /mcgod " + LocaleLoader.getString("Commands.mcgod"));
         }
 
-        sender.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
+        sender.sendMessage(" /<skill>" + LocaleLoader.getString("Commands.SkillInfo"));
     }
 }

src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java

@@ -2,7 +2,9 @@ package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -21,6 +23,10 @@ public class AddlevelsCommand extends ExperienceCommand {
     @Override
     protected void handleCommand(SkillType skill) {
         profile.addLevels(skill, value);
+
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value));
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java

@@ -2,7 +2,9 @@ package com.gmail.nossr50.commands.experience;
 
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -21,6 +23,10 @@ public class MmoeditCommand extends ExperienceCommand {
     @Override
     protected void handleCommand(SkillType skill) {
         profile.modifySkill(skill, value);
+
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, value - profile.getSkillLevel(skill)));
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java

@@ -3,8 +3,10 @@ package com.gmail.nossr50.commands.experience;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -84,13 +86,11 @@ public class SkillresetCommand extends ExperienceCommand {
 
     @Override
     protected boolean permissionsCheckSelf(CommandSender sender) {
-        // TODO Auto-generated method stub
         return false;
     }
 
     @Override
     protected boolean permissionsCheckOthers(CommandSender sender) {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -102,6 +102,10 @@ public class SkillresetCommand extends ExperienceCommand {
         }
 
         profile.modifySkill(skill, 0);
+
+        if (player != null) {
+            mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerLevelUpEvent(player, skill, 0 - profile.getSkillLevel(skill)));
+        }
     }
 
     @Override

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

@@ -55,11 +55,15 @@ public class PtpCommand implements TabExecutor {
                 Player player = mcMMOPlayer.getPlayer();
 
                 long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
-                int recentlyhurt_cooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
+                int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
 
-                if (!SkillUtils.cooldownOver(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)) {
-                    player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)));
-                    return true;
+                if (hurtCooldown > 0) {
+                    int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
+
+                    if (timeRemaining > 0) {
+                        player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
+                        return true;
+                    }
                 }
 
                 if (args[0].equalsIgnoreCase("accept")) {
@@ -74,9 +78,13 @@ public class PtpCommand implements TabExecutor {
                 int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
                 long lastTeleport = mcMMOPlayer.getLastTeleport();
 
-                if (!SkillUtils.cooldownOver(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player)) {
-                    player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player)));
-                    return true;
+                if (ptpCooldown > 0) {
+                    int timeRemaining = SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, ptpCooldown, player);
+
+                    if (timeRemaining > 0) {
+                        player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
+                        return true;
+                    }
                 }
 
                 sendTeleportRequest(sender, player, args[0]);

src/main/java/com/gmail/nossr50/config/Config.java

@@ -297,5 +297,5 @@ public class Config extends AutoUpdateConfigLoader {
 
     /* XP Formula Multiplier */
     public int getFormulaMultiplierCurve() { return config.getInt("Experience.Formula.Curve_Modifier", 20); }
-    public double getForumulaMultiplier(SkillType skill) { return config.getDouble("Experience.Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
+    public double getFormulaSkillModifier(SkillType skill) { return config.getDouble("Experience.Formula.Modifier." + StringUtils.getCapitalized(skill.toString())); }
 }

src/main/java/com/gmail/nossr50/config/WorldConfig.java

@@ -1,49 +0,0 @@
-package com.gmail.nossr50.config;
-
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.StringUtils;
-
-public class WorldConfig extends ConfigLoader {
-
-    private static WorldConfig instance;
-
-    public WorldConfig() {
-        super("worlds.yml");
-    }
-
-    @Override
-    protected void loadKeys() { }
-
-    public static WorldConfig getInstance() {
-        if (instance == null) {
-            instance = new WorldConfig();
-        }
-
-        return instance;
-    }
-    
-    
-    // World settings
-    public boolean isSkillEnabled(SkillType skillType, String world) {
-        String skill = StringUtils.getCapitalized(skillType.toString());
-        return config.getBoolean("Worlds." + world + ".Skills." + skill + ".Enabled", isSkillEnabled(skill));
-    }
-
-    public boolean isAbilityEnabled(SkillType skillType, String world) {
-        String skill = StringUtils.getCapitalized(skillType.toString());
-        return config.getBoolean("Worlds." + world + ".Skills." + skill + ".AbilityEnabled", isAbilityEnabled(skill));
-    }
-
-    public boolean isBlockStoreEnabled(String world) { return config.getBoolean("Worlds." + world + ".BlockStore", isBlockStoreEnabled()); }
-
-    public boolean isMobHealthEnabled(String world) { return config.getBoolean("Worlds." + world + ".MobHealthBar", isMobHealthEnabled()); }
-
-    // Default settings
-    private boolean isSkillEnabled(String skill) { return config.getBoolean("Default.Skills." + skill + ".Enabled", true); }
-
-    private boolean isAbilityEnabled(String skill) { return config.getBoolean("Default.Skills." + skill + ".AbilityEnabled", true); }
-
-    private boolean isBlockStoreEnabled() { return config.getBoolean("Default.BlockStore", true); }
-
-    private boolean isMobHealthEnabled() { return config.getBoolean("Default.MobHealthBar", true); }
-}

src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java

@@ -294,11 +294,7 @@ public final class FlatfileDatabaseManager {
 
         Map<String, Integer> skills = new HashMap<String, Integer>();
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skill : SkillType.nonChildSkills()) {
             skills.put(skill.name(), getPlayerRank(playerName, playerStatHash.get(skill)));
         }
 

src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java

@@ -415,11 +415,7 @@ public final class SQLDatabaseManager {
 
         if (checkConnected()) {
             try {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
-
+                for (SkillType skillType : SkillType.nonChildSkills()) {
                     String skillName = skillType.name().toLowerCase();
                     String sql = "SELECT COUNT(*) AS rank FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id WHERE " + skillName + " > 0 " +
                                  "AND " + skillName + " > (SELECT " + skillName + " FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON user_id = id " +

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -441,11 +441,7 @@ public class McMMOPlayer {
     public int getPowerLevel() {
         int powerLevel = 0;
 
-        for (SkillType type : SkillType.values()) {
-            if (type.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType type : SkillType.nonChildSkills()) {
             if (Permissions.skillEnabled(player, type)) {
                 powerLevel += profile.getSkillLevel(type);
             }

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

@@ -49,11 +49,7 @@ public class PlayerProfile {
             skillsDATS.put(abilityType, 0);
         }
 
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skillType : SkillType.nonChildSkills()) {
             skills.put(skillType, 0);
             skillsXp.put(skillType, 0F);
         }

src/main/java/com/gmail/nossr50/datatypes/skills/AbilityType.java

@@ -68,6 +68,13 @@ public enum AbilityType {
             null),
 
     LEAF_BLOWER(
+            null,
+            null,
+            null,
+            null,
+            null),
+
+    BLOCK_CRACKER(
             null,
             null,
             null,
@@ -144,7 +151,6 @@ public enum AbilityType {
      * @return true if the player has permissions, false otherwise
      */
     public boolean getPermissions(Player player) {
-
         switch (this) {
             case BERSERK:
                 return Permissions.berserk(player);
@@ -152,6 +158,9 @@ public enum AbilityType {
             case BLAST_MINING:
                 return Permissions.remoteDetonation(player);
 
+            case BLOCK_CRACKER:
+                return Permissions.blockCracker(player);
+
             case GIGA_DRILL_BREAKER:
                 return Permissions.gigaDrillBreaker(player);
 
@@ -189,6 +198,9 @@ public enum AbilityType {
             case BERSERK:
                 return (BlockUtils.affectedByGigaDrillBreaker(blockState) || blockState.getType() == Material.SNOW);
 
+            case BLOCK_CRACKER:
+                return BlockUtils.affectedByBlockCracker(blockState);
+
             case GIGA_DRILL_BREAKER:
                 return BlockUtils.affectedByGigaDrillBreaker(blockState);
 

src/main/java/com/gmail/nossr50/datatypes/skills/SkillType.java

@@ -108,7 +108,7 @@ public enum SkillType {
     }
 
     public double getXpModifier() {
-        return Config.getInstance().getForumulaMultiplier(this);
+        return Config.getInstance().getFormulaSkillModifier(this);
     }
 
     public static SkillType getSkill(String skillName) {

src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java

@@ -17,7 +17,7 @@ public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {
 
     public McMMOPlayerLevelUpEvent(Player player, SkillType skill, int levelsGained) {
         super(player, skill);
-        this.setLevelsGained(levelsGained);
+        this.levelsGained = levelsGained;
     }
 
     /**

src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.events.skills.fishing;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
+
+public class McMMOPlayerFishingTreasureEvent extends McMMOPlayerSkillEvent implements Cancellable {
+
+    private boolean cancelled = false;
+    private ItemStack treasure;
+    private int xp;
+
+    public McMMOPlayerFishingTreasureEvent(Player player, ItemStack treasure, int xp) {
+        super(player, SkillType.FISHING);
+        this.treasure = treasure;
+        this.xp = xp;
+    }
+
+    public ItemStack getTreasure() {
+        return treasure;
+    }
+
+    public void setTreasure(ItemStack item) {
+        this.treasure = item;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean newValue) {
+        this.cancelled = newValue;
+    }
+
+    public int getXp() {
+        return xp;
+    }
+
+    public void setXp(int xp) {
+        this.xp = xp;
+    }
+}

src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java

@@ -0,0 +1,21 @@
+package com.gmail.nossr50.events.skills.fishing;
+
+import java.util.Map;
+
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+public class McMMOPlayerMagicHunterEvent extends McMMOPlayerFishingTreasureEvent {
+
+    private Map<Enchantment, Integer> enchants;
+
+    public McMMOPlayerMagicHunterEvent(Player player, ItemStack treasure, int xp, Map<Enchantment, Integer> enchants) {
+        super(player, treasure, xp);
+        this.enchants = enchants;
+    }
+
+    public Map<Enchantment, Integer> getEnchantments() {
+        return enchants;
+    }
+}

src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java

@@ -0,0 +1,36 @@
+package com.gmail.nossr50.events.skills.fishing;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.inventory.ItemStack;
+
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent;
+
+public class McMMOPlayerShakeEvent extends McMMOPlayerSkillEvent implements Cancellable {
+
+    private boolean cancelled = false;
+    private ItemStack drop;
+
+    public McMMOPlayerShakeEvent(Player player, ItemStack drop) {
+        super(player, SkillType.FISHING);
+        this.drop = drop;
+    }
+
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean newValue) {
+        this.cancelled = newValue;
+    }
+
+    public ItemStack getDrop() {
+        return drop;
+    }
+
+    public void setDrop(ItemStack drop) {
+        this.drop = drop;
+    }
+
+}

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -22,21 +22,18 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.skills.ToolType;
 import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
 import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
-import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 import com.gmail.nossr50.runnables.StickyPistonTrackerTask;
 import com.gmail.nossr50.skills.excavation.ExcavationManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
-import com.gmail.nossr50.skills.unarmed.UnarmedManager;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
 import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.ItemUtils;
@@ -59,10 +56,6 @@ public class BlockListener implements Listener {
      */
     @EventHandler(priority = EventPriority.MONITOR)
     public void onBlockPistonExtend(BlockPistonExtendEvent event) {
-        if (!WorldConfig.getInstance().isBlockStoreEnabled(event.getBlock().getWorld().getName()) || !HiddenConfig.getInstance().getChunkletsEnabled()) {
-            return;
-        }
-
         List<Block> blocks = event.getBlocks();
         BlockFace direction = event.getDirection();
         Block futureEmptyBlock = event.getBlock().getRelative(direction); // Block that would be air after piston is finished
@@ -77,9 +70,11 @@ public class BlockListener implements Listener {
         }
 
         for (Block b : blocks) {
-            if (b.getRelative(direction).hasMetadata(mcMMO.blockMetadataKey)) {
-                mcMMO.getPlaceStore().setTrue(b.getRelative(direction));
-                b.getRelative(direction).removeMetadata(mcMMO.blockMetadataKey, plugin);
+            Block nextBlock = b.getRelative(direction);
+
+            if (nextBlock.hasMetadata(mcMMO.blockMetadataKey)) {
+                mcMMO.getPlaceStore().setTrue(nextBlock);
+                nextBlock.removeMetadata(mcMMO.blockMetadataKey, plugin);
             }
         }
     }
@@ -93,10 +88,6 @@ public class BlockListener implements Listener {
     public void onBlockPistonRetract(BlockPistonRetractEvent event) {
         if (event.isSticky()) {
             // Needed only because under some circumstances Minecraft doesn't move the block
-            if (!WorldConfig.getInstance().isBlockStoreEnabled(event.getBlock().getWorld().getName()) || !HiddenConfig.getInstance().getChunkletsEnabled()) {
-                return;
-            }
-
             new StickyPistonTrackerTask(event.getDirection(), event.getBlock()).runTaskLater(plugin, 2);
         }
     }
@@ -115,15 +106,14 @@ public class BlockListener implements Listener {
         }
 
         BlockState blockState = event.getBlock().getState();
-        int blockId = blockState.getTypeId();
 
         /* Check if the blocks placed should be monitored so they do not give out XP in the future */
         if (BlockUtils.shouldBeWatched(blockState)) {
             mcMMO.getPlaceStore().setTrue(blockState);
         }
 
-        if (Repair.anvilMessagesEnabled && (blockId == Repair.repairAnvilId || blockId == Repair.salvageAnvilId)) {
-            UserManager.getPlayer(player).getRepairManager().placedAnvilCheck(blockId);
+        if (Repair.anvilMessagesEnabled && BlockUtils.isMcMMOAnvil(blockState)) {
+            UserManager.getPlayer(player).getRepairManager().placedAnvilCheck(blockState.getTypeId());
         }
     }
 
@@ -155,61 +145,47 @@ public class BlockListener implements Listener {
 
         /* HERBALISM */
         if (BlockUtils.affectedByGreenTerra(blockState)) {
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.HERBALISM, blockState.getWorld().getName())) {
-                HerbalismManager herbalismManager = mcMMOPlayer.getHerbalismManager();
+            HerbalismManager herbalismManager = mcMMOPlayer.getHerbalismManager();
 
-                /* Green Terra */
-                if (herbalismManager.canActivateAbility()) {
-                    SkillUtils.abilityCheck(mcMMOPlayer, SkillType.HERBALISM);
-                }
+            /* Green Terra */
+            if (herbalismManager.canActivateAbility()) {
+                SkillUtils.abilityCheck(mcMMOPlayer, SkillType.HERBALISM);
+            }
 
-                /*
-                 * We don't check the block store here because Herbalism has too many unusual edge cases.
-                 * Instead, we check it inside the drops handler.
-                 */
-                if (Permissions.skillEnabled(player, SkillType.HERBALISM)) {
-                    herbalismManager.herbalismBlockCheck(blockState);
-                }
+            /*
+             * We don't check the block store here because herbalism has too many unusual edge cases.
+             * Instead, we check it inside the drops handler.
+             */
+            if (Permissions.skillEnabled(player, SkillType.HERBALISM)) {
+                herbalismManager.herbalismBlockCheck(blockState);
             }
         }
 
         /* MINING */
-        else if (BlockUtils.affectedBySuperBreaker(blockState)) {
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, blockState.getWorld().getName())) {
-                if (ItemUtils.isPickaxe(heldItem) && Permissions.skillEnabled(player, SkillType.MINING) && !mcMMO.getPlaceStore().isTrue(blockState)) {
-                    MiningManager miningManager = mcMMOPlayer.getMiningManager();
-                    miningManager.miningBlockCheck(blockState);
-                }
-            }
+        else if (BlockUtils.affectedBySuperBreaker(blockState) && ItemUtils.isPickaxe(heldItem) && Permissions.skillEnabled(player, SkillType.MINING) && !mcMMO.getPlaceStore().isTrue(blockState)) {
+            MiningManager miningManager = mcMMOPlayer.getMiningManager();
+            miningManager.miningBlockCheck(blockState);
         }
 
         /* WOOD CUTTING */
-        else if (BlockUtils.isLog(blockState)) {
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.WOODCUTTING, blockState.getWorld().getName())) {
-                if (Permissions.skillEnabled(player, SkillType.WOODCUTTING) && !mcMMO.getPlaceStore().isTrue(blockState)) {
-                    WoodcuttingManager woodcuttingManager = mcMMOPlayer.getWoodcuttingManager();
+        else if (BlockUtils.isLog(blockState) && Permissions.skillEnabled(player, SkillType.WOODCUTTING) && !mcMMO.getPlaceStore().isTrue(blockState)) {
+            WoodcuttingManager woodcuttingManager = mcMMOPlayer.getWoodcuttingManager();
 
-                    if (woodcuttingManager.canUseTreeFeller(heldItem)) {
-                        woodcuttingManager.processTreeFeller(blockState);
-                    }
-                    else {
-                        woodcuttingManager.woodcuttingBlockCheck(blockState);
-                    }
-                }
+            if (woodcuttingManager.canUseTreeFeller(heldItem)) {
+                woodcuttingManager.processTreeFeller(blockState);
+            }
+            else {
+                woodcuttingManager.woodcuttingBlockCheck(blockState);
             }
         }
 
         /* EXCAVATION */
-        else if (BlockUtils.affectedByGigaDrillBreaker(blockState)) {
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.EXCAVATION, blockState.getWorld().getName())) {
-                if (ItemUtils.isShovel(heldItem) && Permissions.skillEnabled(player, SkillType.EXCAVATION) && !mcMMO.getPlaceStore().isTrue(blockState)) {
-                    ExcavationManager excavationManager = mcMMOPlayer.getExcavationManager();
-                    excavationManager.excavationBlockCheck(blockState);
+        else if (BlockUtils.affectedByGigaDrillBreaker(blockState) && ItemUtils.isShovel(heldItem) && Permissions.skillEnabled(player, SkillType.EXCAVATION) && !mcMMO.getPlaceStore().isTrue(blockState)) {
+            ExcavationManager excavationManager = mcMMOPlayer.getExcavationManager();
+            excavationManager.excavationBlockCheck(blockState);
 
-                    if (mcMMOPlayer.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER)) {
-                        excavationManager.gigaDrillBreaker(blockState);
-                    }
-                }
+            if (mcMMOPlayer.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER)) {
+                excavationManager.gigaDrillBreaker(blockState);
             }
         }
 
@@ -238,10 +214,6 @@ public class BlockListener implements Listener {
         ItemStack heldItem = player.getItemInHand();
 
         if (ItemUtils.isSword(heldItem)) {
-            if (!WorldConfig.getInstance().isSkillEnabled(SkillType.HERBALISM, blockState.getWorld().getName())) {
-                return;
-            }
-
             HerbalismManager herbalismManager = UserManager.getPlayer(player).getHerbalismManager();
 
             if (herbalismManager.canUseHylianLuck()) {
@@ -252,10 +224,6 @@ public class BlockListener implements Listener {
             }
         }
         else if (ItemUtils.isPickaxe(heldItem) && !heldItem.containsEnchantment(Enchantment.SILK_TOUCH)) {
-            if (!WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, blockState.getWorld().getName())) {
-                return;
-            }
-
             SmeltingManager smeltingManager = UserManager.getPlayer(player).getSmeltingManager();
 
             if (smeltingManager.canUseFluxMining(blockState)) {
@@ -354,41 +322,31 @@ public class BlockListener implements Listener {
         ItemStack heldItem = player.getItemInHand();
         Block block = event.getBlock();
         BlockState blockState = block.getState();
-        HerbalismManager herbalismManager = mcMMOPlayer.getHerbalismManager();
 
         /*
          * ABILITY TRIGGER CHECKS
          *
          * We don't need to check permissions here because they've already been checked for the ability to even activate.
          */
-        if (herbalismManager.canGreenTerraBlock(blockState)) {
-            if (herbalismManager.processGreenTerra(blockState)) {
+        if (mcMMOPlayer.getAbilityMode(AbilityType.GREEN_TERRA) && BlockUtils.canMakeMossy(blockState)) {
+            if (mcMMOPlayer.getHerbalismManager().processGreenTerra(blockState)) {
                 blockState.update(true);
             }
         }
-        else if (mcMMOPlayer.getAbilityMode(AbilityType.BERSERK)) {
+        else if (mcMMOPlayer.getAbilityMode(AbilityType.BERSERK) && heldItem.getType() == Material.AIR) {
             if (SkillUtils.triggerCheck(player, block, AbilityType.BERSERK)) {
-                if (heldItem.getType() == Material.AIR) {
-                    plugin.getServer().getPluginManager().callEvent(new FakePlayerAnimationEvent(player));
-
-                    event.setInstaBreak(true);
-                    player.playSound(block.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.getPopPitch());
-                }
+                event.setInstaBreak(true);
+                player.playSound(block.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.getPopPitch());
             }
-            // Another perm check for the cracked blocks activation
-            else if (BlockUtils.affectedByBlockCracker(blockState)) {
-                UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
-
-                if (unarmedManager.canUseBlockCracker() && SkillUtils.blockBreakSimulate(block, player, false) && unarmedManager.blockCrackerCheck(blockState)) {
+            else if (Permissions.blockCracker(player) && SkillUtils.triggerCheck(player, block, AbilityType.BLOCK_CRACKER)) {
+                if (mcMMOPlayer.getUnarmedManager().blockCrackerCheck(blockState)) {
                     blockState.update();
                 }
             }
         }
-        else if (BlockUtils.isLeaves(blockState)) {
-            if (mcMMOPlayer.getWoodcuttingManager().canUseLeafBlower(heldItem) && SkillUtils.blockBreakSimulate(block, player, true)) {
-                event.setInstaBreak(true);
-                player.playSound(blockState.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.getPopPitch());
-            }
+        else if (mcMMOPlayer.getWoodcuttingManager().canUseLeafBlower(heldItem) && SkillUtils.triggerCheck(player, block, AbilityType.LEAF_BLOWER)) {
+            event.setInstaBreak(true);
+            player.playSound(blockState.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.getPopPitch());
         }
     }
 }

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -33,9 +33,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
 import com.gmail.nossr50.party.PartyManager;
@@ -61,9 +59,6 @@ public class EntityListener implements Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityShootBow(EntityShootBowEvent event) {
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.ARCHERY, event.getEntity().getWorld().getName())) {
-            return;
-        }
         ItemStack bow = event.getBow();
 
         if (bow != null) {
@@ -199,10 +194,6 @@ public class EntityListener implements Listener {
 
             switch (cause) {
                 case FALL:
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.ACROBATICS, player.getWorld().getName())) {
-                        break;
-                    }
-
                     AcrobaticsManager acrobaticsManager = mcMMOPlayer.getAcrobaticsManager();
 
                     if (acrobaticsManager.canRoll()) {
@@ -216,10 +207,6 @@ public class EntityListener implements Listener {
                     break;
 
                 case BLOCK_EXPLOSION:
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, player.getWorld().getName())) {
-                        break;
-                    }
-
                     MiningManager miningManager = mcMMOPlayer.getMiningManager();
 
                     if (miningManager.canUseDemolitionsExpertise()) {
@@ -244,10 +231,6 @@ public class EntityListener implements Listener {
             Tameable pet = (Tameable) livingEntity;
             AnimalTamer owner = pet.getOwner();
 
-            if (!WorldConfig.getInstance().isSkillEnabled(SkillType.TAMING, livingEntity.getWorld().getName())) {
-                return;
-            }
-
             if (Taming.canPreventDamage(pet, owner)) {
                 Player player = (Player) owner;
                 Wolf wolf = (Wolf) pet;
@@ -373,10 +356,6 @@ public class EntityListener implements Listener {
                 return;
             }
 
-            if (!WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, entity.getWorld().getName())) {
-                return;
-            }
-
             MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
 
             if (miningManager.canUseBiggerBombs()) {
@@ -391,7 +370,7 @@ public class EntityListener implements Listener {
      * @param event The event to modify
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEntityExplode(EntityExplodeEvent event) {
+    public void onEnitityExplode(EntityExplodeEvent event) {
         Entity entity = event.getEntity();
 
         if (entity instanceof TNTPrimed && entity.hasMetadata(mcMMO.tntMetadataKey)) {
@@ -402,10 +381,6 @@ public class EntityListener implements Listener {
                 return;
             }
 
-            if (!WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, entity.getWorld().getName())) {
-                return;
-            }
-
             MiningManager miningManager = UserManager.getPlayer(player).getMiningManager();
 
             if (miningManager.canUseBlastMining()) {
@@ -452,10 +427,6 @@ public class EntityListener implements Listener {
                 case GOLDEN_CARROT: /* RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ 1000 */
                 case MUSHROOM_SOUP: /* RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
                 case PUMPKIN_PIE:   /* RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ 1000 */
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.HERBALISM, player.getWorld().getName())) {
-                        return;
-                    }
-
                     if (Permissions.farmersDiet(player)) {
                         event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(Herbalism.farmersDietRankLevel1, newFoodLevel));
                     }
@@ -465,30 +436,18 @@ public class EntityListener implements Listener {
                 case MELON:            /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
                 case POISONOUS_POTATO: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
                 case POTATO_ITEM:      /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.HERBALISM, player.getWorld().getName())) {
-                        return;
-                    }
-
                     if (Permissions.farmersDiet(player)) {
                         event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(Herbalism.farmersDietRankLevel2, newFoodLevel));
                     }
                     return;
 
                 case COOKED_FISH: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.FISHING, player.getWorld().getName())) {
-                        return;
-                    }
-
                     if (Permissions.fishermansDiet(player)) {
                         event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel1, newFoodLevel));
                     }
                     return;
 
                 case RAW_FISH:    /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.FISHING, player.getWorld().getName())) {
-                        return;
-                    }
-
                     if (Permissions.fishermansDiet(player)) {
                         event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel2, newFoodLevel));
                     }
@@ -510,10 +469,6 @@ public class EntityListener implements Listener {
         Player player = (Player) event.getOwner();
         LivingEntity entity = event.getEntity();
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.TAMING, player.getWorld().getName())) {
-            return;
-        }
-
         if (Misc.isNPCEntity(player) || Misc.isNPCEntity(entity) || entity.hasMetadata(mcMMO.entityMetadataKey)) {
             return;
         }
@@ -535,10 +490,6 @@ public class EntityListener implements Listener {
             Player player = (Player) target;
             Tameable tameable = (Tameable) entity;
 
-            if (!WorldConfig.getInstance().isSkillEnabled(SkillType.TAMING, player.getWorld().getName())) {
-                return;
-            }
-
             if (!CombatUtils.isFriendlyPet(player, tameable)) {
                 return;
             }

src/main/java/com/gmail/nossr50/listeners/InventoryListener.java

@@ -26,7 +26,6 @@ import org.bukkit.metadata.MetadataValue;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
 import com.gmail.nossr50.util.ItemUtils;
@@ -46,10 +45,6 @@ public class InventoryListener implements Listener {
     public void onInventoryOpen(InventoryOpenEvent event) {
         HumanEntity player = event.getPlayer();
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.SMELTING, player.getWorld().getName())) {
-            return;
-        }
-
         if (Misc.isNPCEntity(player)) {
             return;
         }
@@ -80,10 +75,6 @@ public class InventoryListener implements Listener {
             return;
         }
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.SMELTING, player.getWorld().getName())) {
-            return;
-        }
-
         Inventory inventory = event.getInventory();
 
         if (inventory instanceof FurnaceInventory) {
@@ -108,10 +99,6 @@ public class InventoryListener implements Listener {
         Block furnaceBlock = event.getBlock();
         BlockState furnaceState = furnaceBlock.getState();
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.SMELTING, furnaceState.getWorld().getName())) {
-            return;
-        }
-
         if (furnaceState instanceof Furnace) {
             ItemStack smelting = ((Furnace) furnaceState).getInventory().getSmelting();
             List<MetadataValue> metadata = furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey);
@@ -134,10 +121,6 @@ public class InventoryListener implements Listener {
         Block furnaceBlock = event.getBlock();
         BlockState furnaceState = furnaceBlock.getState();
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.SMELTING, furnaceState.getWorld().getName())) {
-            return;
-        }
-
         if (furnaceState instanceof Furnace) {
             ItemStack smelting = ((Furnace) furnaceState).getInventory().getSmelting();
             List<MetadataValue> metadata = furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey);
@@ -168,10 +151,6 @@ public class InventoryListener implements Listener {
         Block furnaceBlock = event.getBlock();
         BlockState furnaceState = furnaceBlock.getState();
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.SMELTING, furnaceState.getWorld().getName())) {
-            return;
-        }
-
         if (furnaceState instanceof Furnace) {
             ItemStack result = ((Furnace) furnaceState).getInventory().getResult();
             List<MetadataValue> metadata = furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey);

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -31,14 +31,12 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.ShareHandler;
-import com.gmail.nossr50.runnables.skills.AbilityDisableTask;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.fishing.FishingManager;
 import com.gmail.nossr50.skills.herbalism.HerbalismManager;
@@ -127,16 +125,6 @@ public class PlayerListener implements Listener {
             mcMMOPlayer.removeParty();
             player.sendMessage(LocaleLoader.getString("Party.Forbidden"));
         }
-        
-        for (AbilityType abilityType : AbilityType.values()) {
-            if (mcMMOPlayer.getAbilityMode(abilityType)) {
-                if (!WorldConfig.getInstance().isAbilityEnabled(SkillType.byAbility(abilityType), player.getWorld().getName())) {
-                    // Make sure to handle any important deactivation processes
-                    new AbilityDisableTask(mcMMOPlayer, abilityType).run();
-                }
-            }
-        }
-            
     }
 
     /**
@@ -182,10 +170,6 @@ public class PlayerListener implements Listener {
     public void onPlayerFish(PlayerFishEvent event) {
         Player player = event.getPlayer();
 
-        if (!WorldConfig.getInstance().isSkillEnabled(SkillType.FISHING, player.getWorld().getName())) {
-            return;
-        }
-
         if (Misc.isNPCEntity(player) || !Permissions.skillEnabled(player, SkillType.FISHING)) {
             return;
         }
@@ -196,10 +180,10 @@ public class PlayerListener implements Listener {
             case FISHING:
                 if (!Permissions.krakenBypass(player)) {
                     event.setCancelled(fishingManager.exploitPrevention());
-                }
 
-                if (event.isCancelled()) {
-                    return;
+                    if (event.isCancelled()) {
+                        return;
+                    }
                 }
 
                 if (fishingManager.canMasterAngler()) {
@@ -225,7 +209,7 @@ public class PlayerListener implements Listener {
 
             case IN_GROUND:
                 Fish hook = event.getHook();
-                Block block = hook.getLocation().getBlock();
+                Block block = event.getPlayer().getTargetBlock(null, 100);
 
                 if (fishingManager.canIceFish(block)) {
                     event.setCancelled(true);
@@ -361,10 +345,6 @@ public class PlayerListener implements Listener {
 
                 /* REPAIR CHECKS */
                 if (blockID == Repair.repairAnvilId && Permissions.skillEnabled(player, SkillType.REPAIR) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.REPAIR, player.getWorld().getName())) {
-                        break;
-                    }
-
                     RepairManager repairManager = mcMMOPlayer.getRepairManager();
                     event.setCancelled(true);
 
@@ -376,10 +356,6 @@ public class PlayerListener implements Listener {
                 }
                 /* SALVAGE CHECKS */
                 else if (blockID == Repair.salvageAnvilId && Permissions.salvage(player) && Repair.isSalvageable(heldItem) && !ItemUtils.isChainmailArmor(heldItem)) {
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.REPAIR, player.getWorld().getName())) {
-                        break;
-                    }
-
                     RepairManager repairManager = mcMMOPlayer.getRepairManager();
                     event.setCancelled(true);
 
@@ -391,10 +367,6 @@ public class PlayerListener implements Listener {
                 }
                 /* BLAST MINING CHECK */
                 else if (miningManager.canDetonate()) {
-                    if (!WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, player.getWorld().getName())) {
-                        break;
-                    }
-
                     if (blockID == Material.TNT.getId()) {
                         event.setCancelled(true); // Don't detonate the TNT if they're too close
                     }
@@ -408,10 +380,6 @@ public class PlayerListener implements Listener {
             case LEFT_CLICK_BLOCK:
                 blockID = block.getTypeId();
 
-                if (!WorldConfig.getInstance().isSkillEnabled(SkillType.REPAIR, player.getWorld().getName())) {
-                    break;
-                }
-
                 /* REPAIR CHECKS */
                 if (blockID == Repair.repairAnvilId && Permissions.skillEnabled(player, SkillType.REPAIR) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
                     RepairManager repairManager = mcMMOPlayer.getRepairManager();
@@ -436,10 +404,6 @@ public class PlayerListener implements Listener {
                 break;
 
             case RIGHT_CLICK_AIR:
-                if (!WorldConfig.getInstance().isSkillEnabled(SkillType.MINING, player.getWorld().getName())) {
-                    break;
-                }
-
                 /* BLAST MINING CHECK */
                 if (miningManager.canDetonate()) {
                     miningManager.remoteDetonation();
@@ -496,10 +460,6 @@ public class PlayerListener implements Listener {
                     ChimaeraWing.activationCheck(player);
                 }
 
-                if (!WorldConfig.getInstance().isSkillEnabled(SkillType.HERBALISM, player.getWorld().getName())) {
-                    break;
-                }
-
                 /* GREEN THUMB CHECK */
                 HerbalismManager herbalismManager = mcMMOPlayer.getHerbalismManager();
 
@@ -540,10 +500,6 @@ public class PlayerListener implements Listener {
             case LEFT_CLICK_AIR:
             case LEFT_CLICK_BLOCK:
 
-                if (!WorldConfig.getInstance().isSkillEnabled(SkillType.TAMING, player.getWorld().getName())) {
-                    break;
-                }
-
                 /* CALL OF THE WILD CHECKS */
                 if (player.isSneaking() && Permissions.callOfTheWild(player)) {
                     Material type = heldItem.getType();

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -16,7 +16,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.config.mods.CustomArmorConfig;
 import com.gmail.nossr50.config.mods.CustomBlockConfig;
 import com.gmail.nossr50.config.mods.CustomEntityConfig;
@@ -277,7 +276,6 @@ public class mcMMO extends JavaPlugin {
         TreasureConfig.getInstance();
         HiddenConfig.getInstance();
         AdvancedConfig.getInstance();
-        WorldConfig.getInstance();
         new ChildConfig();
 
         List<Repairable> repairables = new ArrayList<Repairable>();

src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java

@@ -31,8 +31,8 @@ public class McrankCommandDisplayTask extends BukkitRunnable {
         sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Heading"));
         sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Player", playerName));
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill() || (player != null && !Permissions.skillEnabled(player, skill))) {
+        for (SkillType skill : SkillType.nonChildSkills()) {
+            if (player != null && !Permissions.skillEnabled(player, skill)) {
                 continue;
             }
 

src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java

@@ -28,8 +28,6 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
     private void checkChimaeraWingTeleport() {
         Player player = mcMMOPlayer.getPlayer();
         Location previousLocation = mcMMOPlayer.getTeleportCommenceLocation();
-        long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
-        ItemStack inHand = player.getItemInHand();
 
         mcMMOPlayer.setTeleportCommenceLocation(null);
 
@@ -38,16 +36,23 @@ public class ChimaeraWingWarmup extends BukkitRunnable {
             return;
         }
 
+        ItemStack inHand = player.getItemInHand();
+
         if (!ItemUtils.isChimaeraWing(inHand) || inHand.getAmount() < Config.getInstance().getChimaeraUseCost()) {
             player.sendMessage(LocaleLoader.getString("Skills.NeedMore", LocaleLoader.getString("Item.ChimaeraWing.Name")));
             return;
         }
 
-        int recentlyhurt_cooldown = Config.getInstance().getChimaeraRecentlyHurtCooldown();
+        long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
+        int hurtCooldown = Config.getInstance().getChimaeraRecentlyHurtCooldown();
 
-        if (!SkillUtils.cooldownOver(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)) {
-            player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)));
-            return;
+        if (hurtCooldown > 0) {
+            int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
+
+            if (timeRemaining > 0) {
+                player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
+                return;
+            }
         }
 
         ChimaeraWing.chimaeraExecuteTeleport();

src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java

@@ -47,11 +47,15 @@ public class TeleportationWarmup extends BukkitRunnable {
             return;
         }
 
-        int recentlyhurt_cooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
+        int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
 
-        if (!SkillUtils.cooldownOver(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, teleportingPlayer)) {
-            teleportingPlayer.sendMessage(LocaleLoader.getString("Item.Injured.Wait", SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, teleportingPlayer)));
-            return;
+        if (hurtCooldown > 0) {
+            int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, teleportingPlayer);
+
+            if (timeRemaining > 0) {
+                teleportingPlayer.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
+                return;
+            }
         }
 
         PtpCommand.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);

src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java

@@ -11,6 +11,7 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityDeactivateEvent;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.skills.ParticleEffectUtils;
+import com.gmail.nossr50.util.skills.PerksUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class AbilityDisableTask extends BukkitRunnable {
@@ -59,6 +60,6 @@ public class AbilityDisableTask extends BukkitRunnable {
         }
 
         SkillUtils.sendSkillMessage(player, ability.getAbilityPlayerOff(player));
-        new AbilityCooldownTask(mcMMOPlayer, ability).runTaskLaterAsynchronously(mcMMO.p, ability.getCooldown() * 20);
+        new AbilityCooldownTask(mcMMOPlayer, ability).runTaskLaterAsynchronously(mcMMO.p, PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * 20);
     }
 }

src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java

@@ -19,44 +19,42 @@ public class ChildConfig extends AutoUpdateConfigLoader {
     protected void loadKeys() {
         config.setDefaults(YamlConfiguration.loadConfiguration(plugin.getResource("child.yml")));
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill()) {
-                plugin.debug("Finding parents of " + skill.name());
+        for (SkillType skill : SkillType.childSkills()) {
+            plugin.debug("Finding parents of " + skill.name());
 
-                List<String> parentNames = config.getStringList(StringUtils.getCapitalized(skill.name()));
-                EnumSet<SkillType> parentSkills = EnumSet.noneOf(SkillType.class);
-                boolean useDefaults = false; // If we had an error we back out and use defaults
+            List<String> parentNames = config.getStringList(StringUtils.getCapitalized(skill.name()));
+            EnumSet<SkillType> parentSkills = EnumSet.noneOf(SkillType.class);
+            boolean useDefaults = false; // If we had an error we back out and use defaults
 
-                for (String name : parentNames) {
-                    try {
-                        SkillType parentSkill = Enum.valueOf(SkillType.class, name.toUpperCase());
-                        FamilyTree.enforceNotChildSkill(parentSkill);
-                        parentSkills.add(parentSkill);
-                    }
-                    catch (IllegalArgumentException ex) {
-                        plugin.getLogger().warning(name + " is not a valid skill type, or is a child skill!");
-                        useDefaults = true;
-                        break;
-                    }
+            for (String name : parentNames) {
+                try {
+                    SkillType parentSkill = SkillType.valueOf(name.toUpperCase());
+                    FamilyTree.enforceNotChildSkill(parentSkill);
+                    parentSkills.add(parentSkill);
                 }
-
-                if (useDefaults) {
-                    parentSkills.clear();
-                    for (String name : config.getDefaults().getStringList(StringUtils.getCapitalized(skill.name()))) {
-                        /* We do less checks in here because it's from inside our jar.
-                         * If they're dedicated enough to have modified it, they can have the errors it may produce.
-                         * Alternatively, this can be used to allow child skills to be parent skills, provided there are no circular dependencies this is an advanced sort of configuration.
-                         */
-                        parentSkills.add(SkillType.valueOf(name.toUpperCase()));
-                    }
+                catch (IllegalArgumentException ex) {
+                    plugin.getLogger().warning(name + " is not a valid skill type, or is a child skill!");
+                    useDefaults = true;
+                    break;
                 }
+            }
 
-                // Register them
-                for (SkillType parentSkill : parentSkills) {
-                    plugin.debug("Registering " + parentSkill.name() + " as parent of " + skill.name());
-                    FamilyTree.registerParent(skill, parentSkill);
+            if (useDefaults) {
+                parentSkills.clear();
+                for (String name : config.getDefaults().getStringList(StringUtils.getCapitalized(skill.name()))) {
+                    /* We do less checks in here because it's from inside our jar.
+                     * If they're dedicated enough to have modified it, they can have the errors it may produce.
+                     * Alternatively, this can be used to allow child skills to be parent skills, provided there are no circular dependencies this is an advanced sort of configuration.
+                     */
+                    parentSkills.add(SkillType.valueOf(name.toUpperCase()));
                 }
             }
+
+            // Register them
+            for (SkillType parentSkill : parentSkills) {
+                plugin.debug("Registering " + parentSkill.name() + " as parent of " + skill.name());
+                FamilyTree.registerParent(skill, parentSkill);
+            }
         }
 
         FamilyTree.closeRegistration();

src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -2,7 +2,9 @@ package com.gmail.nossr50.skills.fishing;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -37,6 +39,9 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.treasure.FishingTreasure;
 import com.gmail.nossr50.datatypes.treasure.ShakeTreasure;
 import com.gmail.nossr50.events.fake.FakePlayerFishEvent;
+import com.gmail.nossr50.events.skills.fishing.McMMOPlayerFishingTreasureEvent;
+import com.gmail.nossr50.events.skills.fishing.McMMOPlayerMagicHunterEvent;
+import com.gmail.nossr50.events.skills.fishing.McMMOPlayerShakeEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.skills.KrakenAttackTask;
 import com.gmail.nossr50.skills.SkillManager;
@@ -138,12 +143,12 @@ public class FishingManager extends SkillManager {
     }
 
     public boolean exploitPrevention() {
-        if (!AdvancedConfig.getInstance().getKrakenEnabled()) {
+        if (!AdvancedConfig.getInstance().getKrakenEnabled() || !getPlayer().getTargetBlock(null, 100).isLiquid()) {
             return false;
         }
 
         long currentTime = System.currentTimeMillis();
-        boolean hasFished = currentTime < fishingTimestamp + FISHING_COOLDOWN_SECONDS;
+        boolean hasFished = (currentTime < fishingTimestamp + FISHING_COOLDOWN_SECONDS);
 
         fishingTries = hasFished ? fishingTries + 1 : Math.max(fishingTries - 1, 0);
         fishingTimestamp = currentTime;
@@ -269,13 +274,43 @@ public class FishingManager extends SkillManager {
             treasureXp = treasure.getXp();
             ItemStack treasureDrop = treasure.getDrop().clone(); // Not cloning is bad, m'kay?
 
-            if (Permissions.magicHunter(player) && ItemUtils.isEnchantable(treasureDrop) && handleMagicHunter(treasureDrop)) {
-                player.sendMessage(LocaleLoader.getString("Fishing.MagicFound"));
+            McMMOPlayerFishingTreasureEvent event;
+            Map<Enchantment, Integer> enchants = new HashMap<Enchantment, Integer>();
+
+            if (Permissions.magicHunter(player) && ItemUtils.isEnchantable(treasureDrop)) {
+                enchants = handleMagicHunter(treasureDrop);
+                event = new McMMOPlayerMagicHunterEvent(player, treasureDrop, treasureXp, enchants);
+            }
+            else {
+                event = new McMMOPlayerFishingTreasureEvent(player, treasureDrop, treasureXp);
+            }
+
+            mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+            treasureDrop = event.getTreasure();
+            treasureXp = event.getXp();
+
+            if (event.isCancelled()) {
+                treasureDrop = null;
+                treasureXp = 0;
             }
 
             // Drop the original catch at the feet of the player and set the treasure as the real catch
-            Misc.dropItem(player.getEyeLocation(), fishingCatch.getItemStack());
-            fishingCatch.setItemStack(treasureDrop);
+            if (treasureDrop != null) {
+                boolean enchanted = false;
+
+                if (!enchants.isEmpty()) {
+                    treasureDrop.addUnsafeEnchantments(enchants);
+                    enchanted = true;
+                }
+
+                if (enchanted) {
+                    player.sendMessage(LocaleLoader.getString("Fishing.MagicFound"));
+                }
+
+                Misc.dropItem(player.getEyeLocation(), fishingCatch.getItemStack());
+                fishingCatch.setItemStack(treasureDrop);
+            }
         }
 
         applyXpGain(Config.getInstance().getFishingBaseXP() + treasureXp);
@@ -351,6 +386,14 @@ public class FishingManager extends SkillManager {
                     break;
             }
 
+            McMMOPlayerShakeEvent event = new McMMOPlayerShakeEvent(getPlayer(), drop);
+
+            drop = event.getDrop();
+
+            if (event.isCancelled() || drop == null) {
+                return;
+            }
+
             Misc.dropItem(target.getLocation(), drop);
             CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1)); // Make it so you can shake a mob no more than 4 times.
         }
@@ -399,7 +442,7 @@ public class FishingManager extends SkillManager {
      * @param treasureDrop The {@link ItemStack} to enchant
      * @return true if the item has been enchanted
      */
-    private boolean handleMagicHunter(ItemStack treasureDrop) {
+    private Map<Enchantment, Integer> handleMagicHunter(ItemStack treasureDrop) {
         Player player = getPlayer();
         int activationChance = this.activationChance;
 
@@ -407,8 +450,10 @@ public class FishingManager extends SkillManager {
             activationChance *= Fishing.STORM_MODIFIER;
         }
 
+        Map<Enchantment, Integer> enchants = new HashMap<Enchantment, Integer>();
+
         if (Misc.getRandom().nextInt(activationChance) > getLootTier() * AdvancedConfig.getInstance().getFishingMagicMultiplier()) {
-            return false;
+            return enchants;
         }
 
         List<Enchantment> possibleEnchantments = getPossibleEnchantments(treasureDrop);
@@ -416,7 +461,6 @@ public class FishingManager extends SkillManager {
         // This make sure that the order isn't always the same, for example previously Unbreaking had a lot more chance to be used than any other enchant
         Collections.shuffle(possibleEnchantments, Misc.getRandom());
 
-        boolean enchanted = false;
         int specificChance = 1;
 
         for (Enchantment possibleEnchantment : possibleEnchantments) {
@@ -424,13 +468,12 @@ public class FishingManager extends SkillManager {
                 continue;
             }
 
-            treasureDrop.addEnchantment(possibleEnchantment, Math.max(Misc.getRandom().nextInt(possibleEnchantment.getMaxLevel()) + 1, possibleEnchantment.getStartLevel()));
+            enchants.put(possibleEnchantment, Math.max(Misc.getRandom().nextInt(possibleEnchantment.getMaxLevel()) + 1, possibleEnchantment.getStartLevel()));
 
             specificChance++;
-            enchanted = true;
         }
 
-        return enchanted;
+        return enchants;
     }
 
     private List<Enchantment> getPossibleEnchantments(ItemStack treasureDrop) {

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -287,9 +287,10 @@ public class MiningManager extends SkillManager {
 
         long oldTime = profile.getSkillDATS(AbilityType.BLAST_MINING) * Misc.TIME_CONVERSION_FACTOR;
         int cooldown = AbilityType.BLAST_MINING.getCooldown();
+        int timeRemaining = SkillUtils.calculateTimeLeft(oldTime, cooldown, player);
 
-        if (!SkillUtils.cooldownOver(oldTime, cooldown, player)) {
-            player.sendMessage(LocaleLoader.getString("Skills.TooTired", SkillUtils.calculateTimeLeft(oldTime, cooldown, player)));
+        if (timeRemaining > 0) {
+            player.sendMessage(LocaleLoader.getString("Skills.TooTired", timeRemaining));
             return false;
         }
 

src/main/java/com/gmail/nossr50/util/BlockUtils.java

@@ -7,7 +7,7 @@ import org.bukkit.material.CocoaPlant;
 import org.bukkit.material.CocoaPlant.CocoaPlantSize;
 import org.bukkit.material.NetherWarts;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.skills.repair.Repair;
 
 public final class BlockUtils {
     private BlockUtils() {}
@@ -306,9 +306,9 @@ public final class BlockUtils {
      * @param blockState The {@link BlockState} of the block to check
      * @return true if the block is an mcMMO anvil, false otherwise
      */
-    private static boolean isMcMMOAnvil(BlockState blockState) {
+    public static boolean isMcMMOAnvil(BlockState blockState) {
         int blockId = blockState.getTypeId();
 
-        return blockId == Config.getInstance().getRepairAnvilId() || blockId == Config.getInstance().getSalvageAnvilId();
+        return blockId == Repair.repairAnvilId || blockId == Repair.salvageAnvilId;
     }
 }

src/main/java/com/gmail/nossr50/util/ChimaeraWing.java

@@ -35,9 +35,13 @@ public final class ChimaeraWing {
      * @param player Player whose item usage to check
      */
     public static void activationCheck(Player player) {
+        if (!Config.getInstance().getChimaeraEnabled()) {
+            return;
+        }
+
         ItemStack inHand = player.getItemInHand();
 
-        if (!Config.getInstance().getChimaeraEnabled() || !ItemUtils.isChimaeraWing(inHand)) {
+        if (!ItemUtils.isChimaeraWing(inHand)) {
             return;
         }
 
@@ -48,32 +52,43 @@ public final class ChimaeraWing {
 
         mcMMOPlayer = UserManager.getPlayer(player);
 
-        location = player.getLocation();
-        int amount = inHand.getAmount();
-        long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
-        long lastTeleport = mcMMOPlayer.getLastTeleport();
-
         if (mcMMOPlayer.getTeleportCommenceLocation() != null) {
             return;
         }
 
-        if (Config.getInstance().getChimaeraCooldown() > 0 && !SkillUtils.cooldownOver(lastTeleport * Misc.TIME_CONVERSION_FACTOR, Config.getInstance().getChimaeraCooldown(), player)) {
-            player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, Config.getInstance().getChimaeraCooldown(), player)));
-            return;
-        }
-
-        int recentlyhurt_cooldown = Config.getInstance().getChimaeraRecentlyHurtCooldown();
-
-        if (!SkillUtils.cooldownOver(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)) {
-            player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, recentlyhurt_cooldown, player)));
-            return;
-        }
+        int amount = inHand.getAmount();
 
         if (amount < Config.getInstance().getChimaeraUseCost()) {
             player.sendMessage(LocaleLoader.getString("Skills.NeedMore", LocaleLoader.getString("Item.ChimaeraWing.Name")));
             return;
         }
 
+        long lastTeleport = mcMMOPlayer.getLastTeleport();
+        int cooldown = Config.getInstance().getChimaeraCooldown();
+
+        if (cooldown > 0 ) {
+            int timeRemaining = SkillUtils.calculateTimeLeft(lastTeleport * Misc.TIME_CONVERSION_FACTOR, cooldown, player);
+
+            if (timeRemaining > 0) {
+                player.sendMessage(LocaleLoader.getString("Item.Generic.Wait", timeRemaining));
+                return;
+            }
+        }
+
+        long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
+        int hurtCooldown = Config.getInstance().getChimaeraRecentlyHurtCooldown();
+
+        if (hurtCooldown > 0) {
+            int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
+
+            if (timeRemaining > 0) {
+                player.sendMessage(LocaleLoader.getString("Item.Injured.Wait", timeRemaining));
+                return;
+            }
+        }
+
+        location = player.getLocation();
+
         if (Config.getInstance().getChimaeraPreventUseUnderground()) {
             if (location.getY() < player.getWorld().getHighestBlockYAt(location)) {
                 player.setItemInHand(new ItemStack(getChimaeraWing(amount - Config.getInstance().getChimaeraUseCost())));

src/main/java/com/gmail/nossr50/util/HardcoreManager.java

@@ -21,11 +21,7 @@ public final class HardcoreManager {
         PlayerProfile playerProfile = UserManager.getPlayer(player).getProfile();
         int totalLost = 0;
 
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skillType : SkillType.nonChildSkills()) {
             int playerSkillLevel = playerProfile.getSkillLevel(skillType);
 
             if (playerSkillLevel <= 0) {
@@ -52,11 +48,7 @@ public final class HardcoreManager {
         PlayerProfile victimProfile = UserManager.getPlayer(victim).getProfile();
         int totalStolen = 0;
 
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skillType : SkillType.nonChildSkills()) {
             int killerSkillLevel = killerProfile.getSkillLevel(skillType);
             int victimSkillLevel = victimProfile.getSkillLevel(skillType);
 

src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java

@@ -10,7 +10,6 @@ import org.bukkit.metadata.FixedMetadataValue;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.datatypes.MobHealthbarType;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.runnables.MobHealthDisplayUpdaterTask;
@@ -45,10 +44,6 @@ public final class MobHealthbarUtils {
             return;
         }
 
-        if (!WorldConfig.getInstance().isMobHealthEnabled(player.getWorld().getName())) {
-            return;
-        }
-
         PlayerProfile profile = UserManager.getPlayer(player).getProfile();
 
         if (profile.getMobHealthbarType() == null) {

src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java

@@ -17,7 +17,6 @@ import org.bukkit.block.BlockState;
 import org.bukkit.entity.Entity;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionZDirectory;
 
 public class HashChunkManager implements ChunkManager {
@@ -304,10 +303,6 @@ public class HashChunkManager implements ChunkManager {
             return false;
         }
 
-        if (!WorldConfig.getInstance().isBlockStoreEnabled(world.getName())) {
-            return false;
-        }
-
         int cx = x / 16;
         int cz = z / 16;
         String key = world.getName() + "," + cx + "," + cz;
@@ -351,10 +346,6 @@ public class HashChunkManager implements ChunkManager {
             return;
         }
 
-        if (!WorldConfig.getInstance().isBlockStoreEnabled(world.getName())) {
-            return;
-        }
-
         int cx = x / 16;
         int cz = z / 16;
 
@@ -401,10 +392,6 @@ public class HashChunkManager implements ChunkManager {
             return;
         }
 
-        if (!WorldConfig.getInstance().isBlockStoreEnabled(world.getName())) {
-            return;
-        }
-
         int cx = x / 16;
         int cz = z / 16;
 

src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java

@@ -182,8 +182,8 @@ public class ScoreboardManager {
         PlayerProfile profile = mcMMOPlayer.getProfile();
         Server server = mcMMO.p.getServer();
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill() || !Permissions.skillEnabled(player, skill)) {
+        for (SkillType skill : SkillType.nonChildSkills()) {
+            if (!Permissions.skillEnabled(player, skill)) {
                 continue;
             }
 
@@ -201,8 +201,8 @@ public class ScoreboardManager {
 
         Map<String, Integer> skills = Config.getInstance().getUseMySQL() ? SQLDatabaseManager.readSQLRank(playerName) : FlatfileDatabaseManager.getPlayerRanks(playerName);
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill() || !Permissions.skillEnabled(player, skill)) {
+        for (SkillType skill : SkillType.nonChildSkills()) {
+            if (!Permissions.skillEnabled(player, skill)) {
                 continue;
             }
 
@@ -228,11 +228,7 @@ public class ScoreboardManager {
 
         Map<String, Integer> skills = Config.getInstance().getUseMySQL() ? SQLDatabaseManager.readSQLRank(targetName) : FlatfileDatabaseManager.getPlayerRanks(targetName);
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skill : SkillType.nonChildSkills()) {
             rank = skills.get(skill.name());
 
             if (rank != null) {
@@ -257,8 +253,8 @@ public class ScoreboardManager {
         int powerLevel = 0;
         int skillLevel;
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill() || !Permissions.skillEnabled(target, skill)) {
+        for (SkillType skill : SkillType.nonChildSkills()) {
+            if (!Permissions.skillEnabled(target, skill)) {
                 continue;
             }
 
@@ -277,11 +273,7 @@ public class ScoreboardManager {
         int powerLevel = 0;
         int skillLevel;
 
-        for (SkillType skill : SkillType.values()) {
-            if (skill.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skill : SkillType.nonChildSkills()) {
             skillLevel = targetProfile.getSkillLevel(skill);
             objective.getScore(server.getOfflinePlayer(SkillUtils.getSkillName(skill))).setScore(skillLevel);
             powerLevel += skillLevel;

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -20,7 +20,6 @@ import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.WorldConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
@@ -66,111 +65,103 @@ public final class CombatUtils {
             ItemStack heldItem = player.getItemInHand();
 
             if (target instanceof Tameable) {
-                if (WorldConfig.getInstance().isSkillEnabled(SkillType.TAMING, player.getWorld().getName())) {
-                    if (heldItem.getType() == Material.BONE) {
-                        TamingManager tamingManager = mcMMOPlayer.getTamingManager();
+                if (heldItem.getType() == Material.BONE) {
+                    TamingManager tamingManager = mcMMOPlayer.getTamingManager();
 
-                        if (tamingManager.canUseBeastLore()) {
-                            tamingManager.beastLore(target);
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-
-                    if (isFriendlyPet(player, (Tameable) target)) {
+                    if (tamingManager.canUseBeastLore()) {
+                        tamingManager.beastLore(target);
+                        event.setCancelled(true);
                         return;
                     }
                 }
+
+                if (isFriendlyPet(player, (Tameable) target)) {
+                    return;
+                }
             }
 
             if (ItemUtils.isSword(heldItem)) {
-                if (WorldConfig.getInstance().isSkillEnabled(SkillType.SWORDS, player.getWorld().getName())) {
-                    if (!shouldProcessSkill(target, SkillType.SWORDS)) {
-                        return;
+                if (!shouldProcessSkill(target, SkillType.SWORDS)) {
+                    return;
+                }
+
+                if (Permissions.skillEnabled(player, SkillType.SWORDS)) {
+                    SwordsManager swordsManager = mcMMOPlayer.getSwordsManager();
+
+                    if (swordsManager.canActivateAbility()) {
+                        SkillUtils.abilityCheck(mcMMOPlayer, SkillType.SWORDS);
                     }
 
-                    if (Permissions.skillEnabled(player, SkillType.SWORDS)) {
-                        SwordsManager swordsManager = mcMMOPlayer.getSwordsManager();
-
-                        if (swordsManager.canActivateAbility()) {
-                            SkillUtils.abilityCheck(mcMMOPlayer, SkillType.SWORDS);
-                        }
-
-                        if (swordsManager.canUseBleed()) {
-                            swordsManager.bleedCheck(target);
-                        }
-
-                        if (swordsManager.canUseSerratedStrike()) {
-                            swordsManager.serratedStrikes(target, event.getDamage());
-                        }
-
-                        startGainXp(mcMMOPlayer, target, SkillType.SWORDS);
+                    if (swordsManager.canUseBleed()) {
+                        swordsManager.bleedCheck(target);
                     }
+
+                    if (swordsManager.canUseSerratedStrike()) {
+                        swordsManager.serratedStrikes(target, event.getDamage());
+                    }
+
+                    startGainXp(mcMMOPlayer, target, SkillType.SWORDS);
                 }
             }
             else if (ItemUtils.isAxe(heldItem)) {
-                if (WorldConfig.getInstance().isSkillEnabled(SkillType.AXES, player.getWorld().getName())) {
-                    if (!shouldProcessSkill(target, SkillType.AXES)) {
-                        return;
+                if (!shouldProcessSkill(target, SkillType.AXES)) {
+                    return;
+                }
+
+                if (Permissions.skillEnabled(player, SkillType.AXES)) {
+                    AxesManager axesManager = mcMMOPlayer.getAxesManager();
+
+                    if (axesManager.canActivateAbility()) {
+                        SkillUtils.abilityCheck(mcMMOPlayer, SkillType.AXES);
                     }
 
-                    if (Permissions.skillEnabled(player, SkillType.AXES)) {
-                        AxesManager axesManager = mcMMOPlayer.getAxesManager();
-
-                        if (axesManager.canActivateAbility()) {
-                            SkillUtils.abilityCheck(mcMMOPlayer, SkillType.AXES);
-                        }
-
-                        if (axesManager.canUseAxeMastery()) {
-                            event.setDamage(axesManager.axeMasteryCheck(event.getDamage()));
-                        }
-
-                        if (axesManager.canCriticalHit(target)) {
-                            event.setDamage(axesManager.criticalHitCheck(target, event.getDamage()));
-                        }
-
-                        if (axesManager.canImpact(target)) {
-                            axesManager.impactCheck(target);
-                        }
-                        else if (axesManager.canGreaterImpact(target)) {
-                            event.setDamage(axesManager.greaterImpactCheck(target, event.getDamage()));
-                        }
-
-                        if (axesManager.canUseSkullSplitter(target)) {
-                            axesManager.skullSplitterCheck(target, event.getDamage());
-                        }
-
-                        startGainXp(mcMMOPlayer, target, SkillType.AXES);
+                    if (axesManager.canUseAxeMastery()) {
+                        event.setDamage(axesManager.axeMasteryCheck(event.getDamage()));
                     }
+
+                    if (axesManager.canCriticalHit(target)) {
+                        event.setDamage(axesManager.criticalHitCheck(target, event.getDamage()));
+                    }
+
+                    if (axesManager.canImpact(target)) {
+                        axesManager.impactCheck(target);
+                    }
+                    else if (axesManager.canGreaterImpact(target)) {
+                        event.setDamage(axesManager.greaterImpactCheck(target, event.getDamage()));
+                    }
+
+                    if (axesManager.canUseSkullSplitter(target)) {
+                        axesManager.skullSplitterCheck(target, event.getDamage());
+                    }
+
+                    startGainXp(mcMMOPlayer, target, SkillType.AXES);
                 }
             }
             else if (heldItem.getType() == Material.AIR) {
-                if (WorldConfig.getInstance().isSkillEnabled(SkillType.UNARMED, player.getWorld().getName())) {
-                    if (!shouldProcessSkill(target, SkillType.UNARMED)) {
-                        return;
+                if (!shouldProcessSkill(target, SkillType.UNARMED)) {
+                    return;
+                }
+
+                if (Permissions.skillEnabled(player, SkillType.UNARMED)) {
+                    UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
+
+                    if (unarmedManager.canActivateAbility()) {
+                        SkillUtils.abilityCheck(mcMMOPlayer, SkillType.UNARMED);
                     }
 
-                    if (Permissions.skillEnabled(player, SkillType.UNARMED)) {
-                        UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
-
-                        if (unarmedManager.canActivateAbility()) {
-                            SkillUtils.abilityCheck(mcMMOPlayer, SkillType.UNARMED);
-                        }
-
-                        if (unarmedManager.canUseIronArm()) {
-                            event.setDamage(unarmedManager.ironArmCheck(event.getDamage()));
-                        }
-
-                        if (unarmedManager.canUseBerserk()) {
-                            event.setDamage(unarmedManager.berserkDamage(event.getDamage()));
-                        }
-
-                        if (unarmedManager.canDisarm(target)) {
-                            unarmedManager.disarmCheck((Player) target);
-                        }
-
-                        startGainXp(mcMMOPlayer, target, SkillType.UNARMED);
+                    if (unarmedManager.canUseIronArm()) {
+                        event.setDamage(unarmedManager.ironArmCheck(event.getDamage()));
                     }
+
+                    if (unarmedManager.canUseBerserk()) {
+                        event.setDamage(unarmedManager.berserkDamage(event.getDamage()));
+                    }
+
+                    if (unarmedManager.canDisarm(target)) {
+                        unarmedManager.disarmCheck((Player) target);
+                    }
+
+                    startGainXp(mcMMOPlayer, target, SkillType.UNARMED);
                 }
             }
         }
@@ -178,10 +169,6 @@ public final class CombatUtils {
         switch (damager.getType()) {
             case WOLF:
                 Wolf wolf = (Wolf) damager;
-                
-                if (!WorldConfig.getInstance().isSkillEnabled(SkillType.TAMING, wolf.getWorld().getName())) {
-                    break;
-                }
 
                 if (wolf.isTamed() && wolf.getOwner() instanceof Player) {
                     Player master = (Player) wolf.getOwner();
@@ -219,11 +206,7 @@ public final class CombatUtils {
             case ARROW:
                 LivingEntity shooter = ((Arrow) damager).getShooter();
 
-                if (!WorldConfig.getInstance().isSkillEnabled(SkillType.ARCHERY, shooter.getWorld().getName())) {
-                    break;
-                }
-
-                // Break instead of return due to Dodge/Counter/Deflect abilities
+                /* Break instead of return due to Dodge/Counter/Deflect abilities */
                 if (shooter == null || !(shooter instanceof Player)) {
                     break;
                 }
@@ -285,45 +268,39 @@ public final class CombatUtils {
             }
 
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.ACROBATICS, player.getWorld().getName())) {
-                AcrobaticsManager acrobaticsManager = mcMMOPlayer.getAcrobaticsManager();
+            AcrobaticsManager acrobaticsManager = mcMMOPlayer.getAcrobaticsManager();
 
-                if (acrobaticsManager.canDodge(damager)) {
-                    event.setDamage(acrobaticsManager.dodgeCheck(event.getDamage()));
+            if (acrobaticsManager.canDodge(damager)) {
+                event.setDamage(acrobaticsManager.dodgeCheck(event.getDamage()));
+            }
+
+            if (ItemUtils.isSword(player.getItemInHand())) {
+                if (!shouldProcessSkill(target, SkillType.SWORDS)) {
+                    return;
+                }
+
+                SwordsManager swordsManager = mcMMOPlayer.getSwordsManager();
+
+                if (swordsManager.canUseCounterAttack(damager)) {
+                    swordsManager.counterAttackChecks((LivingEntity) damager, event.getDamage());
                 }
             }
 
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.SWORDS, player.getWorld().getName())) {
-                if (ItemUtils.isSword(player.getItemInHand())) {
-                    if (!shouldProcessSkill(target, SkillType.SWORDS)) {
-                        return;
-                    }
+            if (damager.getType() == EntityType.ARROW) {
+                LivingEntity shooter = ((Arrow) damager).getShooter();
 
-                    SwordsManager swordsManager = mcMMOPlayer.getSwordsManager();
-
-                    if (swordsManager.canUseCounterAttack(damager)) {
-                        swordsManager.counterAttackChecks((LivingEntity) damager, event.getDamage());
-                    }
+                if (shooter instanceof Player || !SkillType.UNARMED.getPVEEnabled()) {
+                    return;
                 }
-            }
 
-            if (WorldConfig.getInstance().isSkillEnabled(SkillType.UNARMED, player.getWorld().getName())) {
-                if (damager.getType() == EntityType.ARROW) {
-                    LivingEntity shooter = ((Arrow) damager).getShooter();
+                UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
 
-                    if (shooter instanceof Player || !SkillType.UNARMED.getPVEEnabled()) {
+                if (unarmedManager.canDeflect()) {
+                    event.setCancelled(unarmedManager.deflectCheck());
+
+                    if (event.isCancelled()) {
                         return;
                     }
-
-                    UnarmedManager unarmedManager = mcMMOPlayer.getUnarmedManager();
-
-                    if (unarmedManager.canDeflect()) {
-                        event.setCancelled(unarmedManager.deflectCheck());
-
-                        if (event.isCancelled()) {
-                            return;
-                        }
-                    }
                 }
             }
         }

src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java

@@ -18,8 +18,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.WorldConfig;
-import com.gmail.nossr50.config.spout.SpoutConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
@@ -57,25 +55,6 @@ public class SkillUtils {
         return currentFoodLevel + foodChange;
     }
 
-    /**
-     * Checks to see if the cooldown for an item or ability is expired.
-     *
-     * @param oldTime The time the ability or item was last used
-     * @param cooldown The amount of time that must pass between uses
-     * @param player The player whose cooldown is being checked
-     * @return true if the cooldown is over, false otherwise
-     */
-    public static boolean cooldownOver(long oldTime, int cooldown, Player player) {
-        long currentTime = System.currentTimeMillis();
-        int adjustedCooldown = PerksUtils.handleCooldownPerks(player, cooldown);
-
-        if (currentTime - oldTime >= (adjustedCooldown * Misc.TIME_CONVERSION_FACTOR)) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Calculate the time remaining until the cooldown expires.
      *
@@ -98,15 +77,14 @@ public class SkillUtils {
             return;
         }
 
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-        AbilityType ability = skill.getAbility();
-        ToolType tool = skill.getTool();
         ItemStack inHand = player.getItemInHand();
 
         if (ModUtils.isCustomTool(inHand) && !ModUtils.getToolFromItemStack(inHand).isAbilityEnabled()) {
             return;
         }
 
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
+
         if (!mcMMOPlayer.getAbilityUse()) {
             return;
         }
@@ -118,6 +96,8 @@ public class SkillUtils {
         }
 
         PlayerProfile playerProfile = mcMMOPlayer.getProfile();
+        AbilityType ability = skill.getAbility();
+        ToolType tool = skill.getTool();
 
         /*
          * Woodcutting & Axes need to be treated differently.
@@ -125,8 +105,10 @@ public class SkillUtils {
          */
         if (ability.getPermissions(player) && tool.inHand(inHand) && !mcMMOPlayer.getToolPreparationMode(tool)) {
             if (skill != SkillType.WOODCUTTING && skill != SkillType.AXES) {
-                if (!mcMMOPlayer.getAbilityMode(ability) && !cooldownOver(playerProfile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)) {
-                    player.sendMessage(LocaleLoader.getString("Skills.TooTired", calculateTimeLeft(playerProfile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)));
+                int timeRemaining = calculateTimeLeft(playerProfile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player);
+
+                if (!mcMMOPlayer.getAbilityMode(ability) && timeRemaining > 0) {
+                    player.sendMessage(LocaleLoader.getString("Skills.TooTired", timeRemaining));
                     return;
                 }
             }
@@ -204,11 +186,7 @@ public class SkillUtils {
             return isLocalizedSkill(skillName);
         }
 
-        if (SkillType.getSkill(skillName) != null) {
-            return true;
-        }
-
-        return false;
+        return SkillType.getSkill(skillName) != null;
     }
 
     private static boolean isLocalizedSkill(String skillName) {
@@ -236,15 +214,11 @@ public class SkillUtils {
      * @return true if the player has combat skills, false otherwise
      */
     public static boolean hasCombatSkills(Player player) {
-        if (Permissions.skillEnabled(player, SkillType.AXES)
+        return Permissions.skillEnabled(player, SkillType.AXES)
                 || Permissions.skillEnabled(player, SkillType.ARCHERY)
                 || Permissions.skillEnabled(player, SkillType.SWORDS)
                 || Permissions.skillEnabled(player, SkillType.TAMING)
-                || Permissions.skillEnabled(player, SkillType.UNARMED)) {
-            return true;
-        }
-
-        return false;
+                || Permissions.skillEnabled(player, SkillType.UNARMED);
     }
 
     /**
@@ -254,15 +228,11 @@ public class SkillUtils {
      * @return true if the player has gathering skills, false otherwise
      */
     public static boolean hasGatheringSkills(Player player) {
-        if (Permissions.skillEnabled(player, SkillType.EXCAVATION)
+        return Permissions.skillEnabled(player, SkillType.EXCAVATION)
                 || Permissions.skillEnabled(player, SkillType.FISHING)
                 || Permissions.skillEnabled(player, SkillType.HERBALISM)
                 || Permissions.skillEnabled(player, SkillType.MINING)
-                || Permissions.skillEnabled(player, SkillType.WOODCUTTING)) {
-            return true;
-        }
-
-        return false;
+                || Permissions.skillEnabled(player, SkillType.WOODCUTTING);
     }
 
     /**
@@ -272,13 +242,9 @@ public class SkillUtils {
      * @return true if the player has misc skills, false otherwise
      */
     public static boolean hasMiscSkills(Player player) {
-        if (Permissions.skillEnabled(player, SkillType.ACROBATICS)
+        return Permissions.skillEnabled(player, SkillType.ACROBATICS)
                 || Permissions.skillEnabled(player, SkillType.SMELTING)
-                || Permissions.skillEnabled(player, SkillType.REPAIR)) {
-            return true;
-        }
-
-        return false;
+                || Permissions.skillEnabled(player, SkillType.REPAIR);
     }
 
     /**
@@ -295,23 +261,21 @@ public class SkillUtils {
 
         Player player = mcMMOPlayer.getPlayer();
         PlayerProfile playerProfile = mcMMOPlayer.getProfile();
-        
-        if (!WorldConfig.getInstance().isAbilityEnabled(type, player.getWorld().getName())) {
-            return;
-        }
+
+        int timeRemaining = calculateTimeLeft(playerProfile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player);
 
         /*
          * Axes and Woodcutting are odd because they share the same tool.
          * We show them the too tired message when they take action.
          */
         if (type == SkillType.WOODCUTTING || type == SkillType.AXES) {
-            if (!mcMMOPlayer.getAbilityMode(ability) && !cooldownOver(playerProfile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)) {
-                player.sendMessage(LocaleLoader.getString("Skills.TooTired", calculateTimeLeft(playerProfile.getSkillDATS(ability) * Misc.TIME_CONVERSION_FACTOR, ability.getCooldown(), player)));
+            if (!mcMMOPlayer.getAbilityMode(ability) && timeRemaining > 0) {
+                player.sendMessage(LocaleLoader.getString("Skills.TooTired", timeRemaining));
                 return;
             }
         }
 
-        if (!mcMMOPlayer.getAbilityMode(ability) && cooldownOver(playerProfile.getSkillDATS(ability), ability.getCooldown(), player)) {
+        if (!mcMMOPlayer.getAbilityMode(ability) && timeRemaining <= 0) {
             McMMOPlayerAbilityActivateEvent event = new McMMOPlayerAbilityActivateEvent(player, type);
             mcMMO.p.getServer().getPluginManager().callEvent(event);
 
@@ -353,6 +317,7 @@ public class SkillUtils {
 
         switch (ability) {
             case BERSERK:
+            case BLOCK_CRACKER:
             case LEAF_BLOWER:
                 if (!ability.blockCheck(block.getState())) {
                     activate = false;
@@ -511,11 +476,7 @@ public class SkillUtils {
         FakeBlockBreakEvent breakEvent = new FakeBlockBreakEvent(block, player);
         pluginManger.callEvent(breakEvent);
 
-        if (!damageEvent.isCancelled() && !breakEvent.isCancelled()) {
-            return true;
-        }
-
-        return false;
+        return !damageEvent.isCancelled() && !breakEvent.isCancelled();
     }
 
     public static boolean activationSuccessful(Player player, SkillType skill, double maxChance, int maxLevel) {

src/main/java/com/gmail/nossr50/util/spout/SpoutUtils.java

@@ -204,11 +204,7 @@ public class SpoutUtils {
         }
 
         // Standard XP Icons
-        for (SkillType skillType : SkillType.values()) {
-            if (skillType.isChildSkill()) {
-                continue;
-            }
-
+        for (SkillType skillType : SkillType.nonChildSkills()) {
             String skillName = StringUtils.getCapitalized(skillType.toString());
 
             files.add(writeFile(skillName + ".png", hudStandardDirectory));

src/main/resources/locale/locale_en_US.properties

@@ -497,7 +497,7 @@ Commands.Reset.Single=[[GREEN]]Your {0} skill level has been reset successfully.
 Commands.Reset=[[RED]]Reset a skill's level to 0
 Commands.Skill.Invalid=[[RED]]That is not a valid skillname!
 Commands.Skill.Leaderboard=[[YELLOW]]--mcMMO [[BLUE]]{0}[[YELLOW]] Leaderboard--
-Commands.SkillInfo=/<skill> [[RED]]- View detailed information about a skill
+Commands.SkillInfo=[[RED]]- View detailed information about a skill
 Commands.Stats.Self=YOUR STATS
 Commands.Stats=[[RED]]- View your mcMMO stats
 Commands.ToggleAbility=[[RED]]- Toggle ability activation with right click

src/main/resources/worlds.yml

@@ -1,40 +0,0 @@
-Default:
-    Skills:
-        Acrobatics:
-            Enabled: true
-        Archery:
-            Enabled: true
-        Axes:
-            Enabled: true
-            AbilityEnabled: true
-        Excavation:
-            Enabled: true
-            AbilityEnabled: true
-        Fishing:
-            Enabled: true
-        Herbalism:
-            Enabled: true
-            AbilityEnabled: true
-        Mining:
-            Enabled: true
-            AbilityEnabled: true
-        Repair:
-            Enabled: true
-        Smelting:
-            Enabled: true
-        Swords:
-            Enabled: true
-            AbilityEnabled: true
-        Taming:
-            Enabled: true
-        Unarmed:
-            Enabled: true
-            AbilityEnabled: true
-        Woodcutting:
-            Enabled: true
-            AbilityEnabled: true
-    BlockStore: true
-    MobHealthBar: true
-Worlds:
-    ExampleWorldName:
-        MobHealthBar: true