Weekly beta release.

PLEASE READ THE CHANGELOG.
We don't have to pass the event anymore.
2026-02-18 09:43:00 +01:00 · 2013-02-16 00:01:36 -05:00 · 2013-02-16 00:00:24 -05:00 · 2013-02-15 22:48:24 -05:00 · 2013-02-15 22:48:24 -05:00 · 2013-02-15 22:48:24 -05:00
147 changed files with 3628 additions and 2407 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -30,6 +30,17 @@ Version 1.4.00-dev
 + Added Shears, Buckets, Fishing Rods, Flint & Steel, Carrot Sticks, and Bows to the list of items that can be Salvaged
 + Added the "wait" music disc to the default fishing treasures
 + Added "Chinese (Taiwan)" localization files (zh_TW)
+ + Added '/hardcore' and '/vampirism' commands for toggling these modes on or off.
+ + Added Block Cracker to Unarmed's Berserk, turn smooth brick into cracked smooth brick
+ + Added config option to disable automatic zip backups.
+ = Fixed Green Thumb on wheat not working properly at rank 4
+ = Fixed Green Thumb and Green Terra consuming twice the amount of seed needed
+ = Fixed Green Terra not also checking Green Thumb permissions
+ = Fixed bug where splash potions could raise a player's unarmed level
+ = Fixed bug where fired arrows could raise skill levels other than Archery
+ = Fixed /ptp telporting the target to the player, rather than the other way around.
+ = Fixed Impact reducing the durability of non-armor equipped blocks
+ = Fixed Impact reducing improperly the durability of armors (as a consequence it is now more effective)
 = Fixed multiple commands not working properly on offline players
 = Fixed /mmoedit not giving feedback when modifying another players stats
 = Fixed the guide usage string showing up every time /skillname was called
@@ -51,9 +62,12 @@ Version 1.4.00-dev
 = Fixed Experience.Gains.Mobspawners.Enabled not being used correctly (the check was inverted)
 = Fixed bug where Iron Grip was using the attacker's skill values rather than the defender's.
 = Fixed a bug where /party kick would trigger the PartyChangeEvent for the wrong player
+ = Fixed /party kick not working on offline players
 = Fixed a bug where party join messages weren't displayed
+ = Fixed a bug where a new party leader wasn't appointed, after the previous party leader left
 = Fixed a bug where Disarm and Deflect had wrong values
 = Fixed Magic Hunter (Fishing ability) favoring certain enchants
+ ! Config files are now backed up even when running in SQL mode
 ! Changed /p and /a to use /partychat and /adminchat as the default command name. The use of /p, /pc, /a, and /ac is still supported.
 ! We're now using Bukkit sounds instead of Spout sounds.
 ! It is now possible to use a negative number for Max_Level in treasures.yml to not use a maximum level, changed default file accordingly
@@ -61,6 +75,7 @@ Version 1.4.00-dev
 ! Changed how Berserk handles not picking up items to avoid listening to PlayerPickupItemEvent
 ! Moved Hylian Luck into a separate listener since it actually cancels the event and shouldn't just be on MONITOR.
 ! Changed how Tree Feller is handled, it should now put less stress on the CPU
+ ! Changed Tree Feller to work on huge mushrooms
 ! Changed Fisherman's Diet and Farmer's Diet to use two seperate config values
 ! Major refactoring - please take note, this WILL break any mcMMO-related plugin not properly hooking into the API.
 ! Changed the way party commands work, use /party ? to check how to use the new commands
@@ -70,10 +85,12 @@ Version 1.4.00-dev
 ! Changed BeastLore: Now also displays offline player names
 ! Changed backup task to include ALL config files
 ! Deprecated most functions in ExperienceAPI, replaced them with identical versions that use a String for the SkillName rather than the SkillType enum values
+ ! Changed Super Breaker & Giga Drill Breaker to be an enchantment-based boost, rather than an instabreak.
+ ! Changed locales to fall back on English when translated strings cannot be found.
 - Removed Party "master/apprentice" system. Replaced with the new party XP share feature.
 - Removed unused "healthbar" files from the resources
 - Removed config options for disabling commands from the config.yml. This should instead be done through permissions.
- - Removed Chimaera Wing
+ - Removed /mcc command. Replaced with /mcmmo [?|help|commands]

 Version 1.3.14
 + Added new Hylian Luck skill to Herbalism.
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.gmail.nossr50.mcMMO</groupId>
    <artifactId>mcMMO</artifactId>
-    <version>1.4.00-beta2</version>
+    <version>1.4.00-beta3</version>
    <name>mcMMO</name>
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
    <issueManagement>
@@ -99,12 +99,12 @@
                <configuration>
                    <artifactSet>
                        <includes>
-                            <include>org.mcstats.bukkit:metrics</include>
+                            <include>com.turt2live.metrics:MetricsExtension</include>
                        </includes>
                    </artifactSet>
                    <relocations>
                        <relocation>
-                            <pattern>org.mcstats</pattern>
+                            <pattern>com.turt2live.metrics</pattern>
                            <shadedPattern>com.gmail.nossr50.util.mcstats</shadedPattern>
                        </relocation>
                    </relocations>
@@ -152,8 +152,8 @@
                <updatePolicy>always</updatePolicy>
                <checksumPolicy>fail</checksumPolicy>
            </snapshots>
-            <id>Plugin Metrics</id>
-            <url>http://repo.mcstats.org/content/repositories/public</url>
+            <id>Plugin MetricsExtension</id>
+            <url>http://repo.turt2live.com</url>
        </repository>
    </repositories>
    <dependencies>
@@ -178,9 +178,10 @@
            <scope>test</scope>
        </dependency>
        <dependency>
-            <groupId>org.mcstats.bukkit</groupId>
-            <artifactId>metrics</artifactId>
-            <version>R6</version>
+            <groupId>com.turt2live.metrics</groupId>
+            <artifactId>MetricsExtension</artifactId>
+            <version>0.0.2-SNAPSHOT</version>
+            <type>jar</type>
            <scope>compile</scope>
        </dependency>
    </dependencies>
--- a/src/main/java/com/gmail/nossr50/api/PartyAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/PartyAPI.java
@@ -1,7 +1,9 @@
 package com.gmail.nossr50.api;

+import java.util.ArrayList;
 import java.util.List;

+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.party.Party;
@@ -69,15 +71,14 @@ public final class PartyAPI {
     */
    public static void addToParty(Player player, String partyName) {
        Party party = PartyManager.getParty(partyName);
-        String playerName = player.getName();

        if (party == null) {
            party = new Party();
            party.setName(partyName);
-            party.setLeader(playerName);
+            party.setLeader(player.getName());
        }

-        PartyManager.addToParty(playerName, Users.getPlayer(player), party);
+        PartyManager.addToParty(player, Users.getPlayer(player), party);
    }

    /**
@@ -88,7 +89,7 @@ public final class PartyAPI {
     * @param player The player to remove
     */
    public static void removeFromParty(Player player) {
-        PartyManager.removeFromParty(player.getName(), Users.getPlayer(player).getParty());
+        PartyManager.removeFromParty(player, Users.getPlayer(player).getParty());
    }

    /**
@@ -122,8 +123,28 @@ public final class PartyAPI {
     *
     * @param player The player to check
     * @return all the players in the player's party
+     * @deprecated
     */
+    @Deprecated
    public static List<String> getAllMembers(Player player) {
+        List<String> memberNames = new ArrayList<String>();
+
+        for (OfflinePlayer member : PartyManager.getAllMembers(player)) {
+            memberNames.add(member.getName());
+        }
+
+        return memberNames;
+    }
+
+    /**
+     * Get a list of all players in this player's party.
+     * </br>
+     * This function is designed for API usage.
+     *
+     * @param player The player to check
+     * @return all the players in the player's party
+     */
+    public static List<OfflinePlayer> getOnlineAndOfflineMembers(Player player) {
        return PartyManager.getAllMembers(player);
    }

--- a/src/main/java/com/gmail/nossr50/chat/ChatManager.java
+++ b/src/main/java/com/gmail/nossr50/chat/ChatManager.java
@@ -10,7 +10,6 @@ import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.util.Permissions;

 public final class ChatManager {
    public ChatManager () {}
@@ -30,14 +29,8 @@ public final class ChatManager {

        String adminMessage = chatEvent.getMessage();

-        for (Player otherPlayer : mcMMO.p.getServer().getOnlinePlayers()) {
-            if (Permissions.adminChat(otherPlayer) || otherPlayer.isOp()) {
-                otherPlayer.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage);
-            }
-        }
-
-        displayName = ChatColor.stripColor(displayName);
-        mcMMO.p.getLogger().info("[A]<" + displayName + "> " + adminMessage);
+        mcMMO.p.getServer().broadcast(LocaleLoader.getString("Commands.AdminChat.Prefix", displayName) + adminMessage, "mcmmo.chat.adminchat");
+        mcMMO.p.getLogger().info("[A]<" + ChatColor.stripColor(displayName) + "> " + adminMessage);
    }

    public static void handleAdminChat(Plugin plugin, String senderName, String message) {
@@ -65,8 +58,7 @@ public final class ChatManager {
            member.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", displayName) + partyMessage);
        }

-        displayName = ChatColor.stripColor(displayName);
-        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + displayName + "> " + partyMessage);
+        mcMMO.p.getLogger().info("[P](" + partyName + ")" + "<" + ChatColor.stripColor(displayName) + "> " + partyMessage);
    }

    public static void handlePartyChat(Plugin plugin, Party party, String senderName, String message) {
--- a/src/main/java/com/gmail/nossr50/chat/commands/ChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/chat/commands/ChatCommand.java
@@ -29,26 +29,29 @@ public abstract class ChatCommand implements CommandExecutor {

            if (chatMode.isEnabled(mcMMOPlayer)) {
                disableChatMode(sender);
-                return true;
+            }
+            else {
+                enableChatMode(sender);
            }

-            enableChatMode(sender);
            return true;

        default:
            if (args.length == 1) {
-                if (!(sender instanceof Player)) {
-                    return false;
-                }
-
-                mcMMOPlayer = Users.getPlayer((Player) sender);
-
                if (args[0].equalsIgnoreCase("on")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
+                    }
+
                    enableChatMode(sender);
                    return true;
                }

                if (args[0].equalsIgnoreCase("off")) {
+                    if (!(sender instanceof Player)) {
+                        return false;
+                    }
+
                    disableChatMode(sender);
                    return true;
                }
--- a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java
+++ b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java
@@ -7,40 +7,10 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Permissions;

 public final class CommandHelper {
    private CommandHelper() {}

-    /**
-     * Checks for command permissions.
-     *
-     * @param sender The command sender
-     * @param permission The permission to check
-     * @return true if the sender is a player without permissions, false otherwise
-     */
-    public static boolean noCommandPermissions(CommandSender sender, String permission) {
-        if (sender instanceof Player) {
-            Player player = (Player) sender;
-
-            if (!Permissions.hasPermission(player, permission)) {
-                player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public static boolean noCommandPermissions(Player player, String permission) {
-        if (!Permissions.hasPermission(player, permission)) {
-            player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission"));
-            return true;
-        }
-
-        return false;
-    }
-
    public static boolean noConsoleUsage(CommandSender sender) {
        if (!(sender instanceof Player)) {
            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
@@ -61,23 +31,23 @@ public final class CommandHelper {
        if (SkillTools.hasGatheringSkills(inspect)) {
            display.sendMessage(LocaleLoader.getString("Stats.Header.Gathering"));

-            if (Permissions.excavation(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.excavation")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Excavation.Listener"), profile.getSkillLevel(SkillType.EXCAVATION), profile.getSkillXpLevel(SkillType.EXCAVATION), profile.getXpToLevel(SkillType.EXCAVATION)));
            }

-            if (Permissions.fishing(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.fishing")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Fishing.Listener"), profile.getSkillLevel(SkillType.FISHING), profile.getSkillXpLevel(SkillType.FISHING), profile.getXpToLevel(SkillType.FISHING)));
            }

-            if (Permissions.herbalism(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.fishing")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Herbalism.Listener"), profile.getSkillLevel(SkillType.HERBALISM), profile.getSkillXpLevel(SkillType.HERBALISM), profile.getXpToLevel(SkillType.HERBALISM)));
            }

-            if (Permissions.mining(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.mining")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Mining.Listener"), profile.getSkillLevel(SkillType.MINING), profile.getSkillXpLevel(SkillType.MINING), profile.getXpToLevel(SkillType.MINING)));
            }

-            if (Permissions.woodcutting(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.woodcutting")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Woodcutting.Listener"), profile.getSkillLevel(SkillType.WOODCUTTING), profile.getSkillXpLevel(SkillType.WOODCUTTING), profile.getXpToLevel(SkillType.WOODCUTTING)));
            }
        }
@@ -98,23 +68,23 @@ public final class CommandHelper {
        if (SkillTools.hasCombatSkills(inspect)) {
            display.sendMessage(LocaleLoader.getString("Stats.Header.Combat"));

-            if (Permissions.axes(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.axes")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Axes.Listener"), profile.getSkillLevel(SkillType.AXES), profile.getSkillXpLevel(SkillType.AXES), profile.getXpToLevel(SkillType.AXES)));
            }

-            if (Permissions.archery(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.archery")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Archery.Listener"), profile.getSkillLevel(SkillType.ARCHERY), profile.getSkillXpLevel(SkillType.ARCHERY), profile.getXpToLevel(SkillType.ARCHERY)));
            }

-            if (Permissions.swords(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.swords")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Swords.Listener"), profile.getSkillLevel(SkillType.SWORDS), profile.getSkillXpLevel(SkillType.SWORDS), profile.getXpToLevel(SkillType.SWORDS)));
            }

-            if (Permissions.taming(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.taming")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Taming.Listener"), profile.getSkillLevel(SkillType.TAMING), profile.getSkillXpLevel(SkillType.TAMING), profile.getXpToLevel(SkillType.TAMING)));
            }

-            if (Permissions.unarmed(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.unarmed")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Unarmed.Listener"), profile.getSkillLevel(SkillType.UNARMED), profile.getSkillXpLevel(SkillType.UNARMED), profile.getXpToLevel(SkillType.UNARMED)));
            }
        }
@@ -135,11 +105,11 @@ public final class CommandHelper {
        if (SkillTools.hasMiscSkills(inspect)) {
            display.sendMessage(LocaleLoader.getString("Stats.Header.Misc"));

-            if (Permissions.acrobatics(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.acrobatics")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Acrobatics.Listener"), profile.getSkillLevel(SkillType.ACROBATICS), profile.getSkillXpLevel(SkillType.ACROBATICS), profile.getXpToLevel(SkillType.ACROBATICS)));
            }

-            if (Permissions.repair(inspect)) {
+            if (inspect.hasPermission("mcmmo.skills.repair")) {
                display.sendMessage(LocaleLoader.getString("Skills.Stats", LocaleLoader.getString("Repair.Listener"), profile.getSkillLevel(SkillType.REPAIR), profile.getSkillXpLevel(SkillType.REPAIR), profile.getXpToLevel(SkillType.REPAIR)));
            }
        }
--- a/src/main/java/com/gmail/nossr50/commands/CommandRegistrationHelper.java
+++ b/src/main/java/com/gmail/nossr50/commands/CommandRegistrationHelper.java
@@ -10,10 +10,12 @@ import com.gmail.nossr50.chat.commands.AdminChatCommand;
 import com.gmail.nossr50.chat.commands.PartyChatCommand;
 import com.gmail.nossr50.commands.admin.AddlevelsCommand;
 import com.gmail.nossr50.commands.admin.AddxpCommand;
+import com.gmail.nossr50.commands.admin.HardcoreCommand;
 import com.gmail.nossr50.commands.admin.McgodCommand;
 import com.gmail.nossr50.commands.admin.McrefreshCommand;
 import com.gmail.nossr50.commands.admin.MmoeditCommand;
 import com.gmail.nossr50.commands.admin.SkillresetCommand;
+import com.gmail.nossr50.commands.admin.VampirismCommand;
 import com.gmail.nossr50.commands.admin.XprateCommand;
 import com.gmail.nossr50.commands.player.InspectCommand;
 import com.gmail.nossr50.commands.player.McabilityCommand;
@@ -27,6 +29,7 @@ import com.gmail.nossr50.database.commands.McremoveCommand;
 import com.gmail.nossr50.database.commands.MmoupdateCommand;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.commands.PartyCommand;
+import com.gmail.nossr50.party.commands.PtpCommand;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsCommand;
 import com.gmail.nossr50.skills.archery.ArcheryCommand;
 import com.gmail.nossr50.skills.axes.AxesCommand;
@@ -39,11 +42,12 @@ import com.gmail.nossr50.skills.smelting.SmeltingCommand;
 import com.gmail.nossr50.skills.swords.SwordsCommand;
 import com.gmail.nossr50.skills.taming.TamingCommand;
 import com.gmail.nossr50.skills.unarmed.UnarmedCommand;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingCommand;
 import com.gmail.nossr50.spout.commands.MchudCommand;
 import com.gmail.nossr50.spout.commands.XplockCommand;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;

 public final class CommandRegistrationHelper {
    private CommandRegistrationHelper() {};
@@ -52,12 +56,12 @@ public final class CommandRegistrationHelper {
    public static void registerSkillCommands() {
        for (SkillType skill : SkillType.values()) {
            String commandName = skill.toString().toLowerCase();
-            String localizedName = LocaleLoader.getString(Misc.getCapitalized(commandName) + ".SkillName").toLowerCase();
+            String localizedName = SkillTools.getSkillName(skill);

            PluginCommand command;

            command = mcMMO.p.getCommand(commandName);
-            command.setDescription(LocaleLoader.getString("Commands.Description.Skill", Misc.getCapitalized(localizedName)));
+            command.setDescription(LocaleLoader.getString("Commands.Description.Skill", StringUtils.getCapitalized(localizedName)));
            command.setPermission("mcmmo.commands." + commandName);
            command.setPermissionMessage(permissionsMessage);
            command.setUsage(LocaleLoader.getString("Commands.Usage.0", localizedName));
@@ -211,10 +215,10 @@ public final class CommandRegistrationHelper {
    public static void registerMcmmoCommand() {
        PluginCommand command = mcMMO.p.getCommand("mcmmo");
        command.setDescription(LocaleLoader.getString("Commands.Description.mcmmo"));
-        command.setPermission("mcmmo.commands.mcmmo");
+        command.setPermission("mcmmo.commands.mcmmo;mcmmo.commands.mcmmo.help");
        command.setPermissionMessage(permissionsMessage);
        command.setUsage(LocaleLoader.getString("Commands.Usage.0", "mcmmo"));
-        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "mcmmo", "?"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "mcmmo", "help"));
        command.setExecutor(new McmmoCommand());
    }

@@ -324,4 +328,34 @@ public final class CommandRegistrationHelper {
        command.setPermissionMessage(permissionsMessage);
        command.setExecutor(new PartyCommand());
    }
+
+    public static void registerPtpCommand() {
+        PluginCommand command = mcMMO.p.getCommand("ptp");
+        command.setDescription(LocaleLoader.getString("Commands.Description.ptp"));
+        command.setPermission("mcmmo.commands.ptp;mcmmo.commands.ptp.accept;mcmmo.commands.ptp.acceptall;mcmmo.commands.ptp.toggle");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "ptp", "<toggle|accept|acceptall>"));
+        command.setExecutor(new PtpCommand());
+    }
+
+    public static void registerHardcoreCommand() {
+        PluginCommand command = mcMMO.p.getCommand("hardcore");
+        command.setDescription(LocaleLoader.getString("Commands.Description.hardcore"));
+        command.setPermission("mcmmo.commands.hardcore;mcmmo.commands.hardcore.toggle;mcmmo.commands.hardcore.modify");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "hardcore", "[on|off]"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "hardcore", "<" + LocaleLoader.getString("Commands.Usage.Rate") + ">"));
+        command.setExecutor(new HardcoreCommand());
+    }
+
+    public static void registerVampirismCommand() {
+        PluginCommand command = mcMMO.p.getCommand("vampirism");
+        command.setDescription(LocaleLoader.getString("Commands.Description.vampirism"));
+        command.setPermission("mcmmo.commands.vampirism;mcmmo.commands.vampirism.toggle;mcmmo.commands.vampirism.modify");
+        command.setPermissionMessage(permissionsMessage);
+        command.setUsage(LocaleLoader.getString("Commands.Usage.1", "vampirism", "[on|off]"));
+        command.setUsage(command.getUsage() + "\n" + LocaleLoader.getString("Commands.Usage.1", "vampirism", "<" + LocaleLoader.getString("Commands.Usage.Rate") + ">"));
+        command.setExecutor(new VampirismCommand());
+    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/admin/AddlevelsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/AddlevelsCommand.java
@@ -10,8 +10,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.Users;

 public class AddlevelsCommand implements CommandExecutor{
@@ -20,10 +19,11 @@ public class AddlevelsCommand implements CommandExecutor{
        PlayerProfile profile;
        int levels;
        boolean allSkills = false;
+        SkillType skill = null;

        switch (args.length) {
        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels")) {
+            if (!sender.hasPermission("mcmmo.commands.addlevels")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -40,11 +40,11 @@ public class AddlevelsCommand implements CommandExecutor{
                return true;
            }

-            if (!Misc.isInt(args[1])) {
+            if (!StringUtils.isInt(args[1])) {
                return false;
            }

-            levels = Integer.valueOf(args[1]);
+            levels = Integer.parseInt(args[1]);
            profile = Users.getPlayer((Player) sender).getProfile();

            if (allSkills) {
@@ -57,20 +57,21 @@ public class AddlevelsCommand implements CommandExecutor{
                }
            }
            else {
-                profile.addLevels(SkillType.getSkill(args[0]), levels);
+                skill = SkillType.getSkill(args[0]);
+                profile.addLevels(skill, levels);
            }

            if (allSkills) {
                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
            }
            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, Misc.getCapitalized(args[0])));
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillTools.getSkillName(skill)));
            }

            return true;

        case 3:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addlevels.others")) {
+            if (!sender.hasPermission("mcmmo.commands.addlevels.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -83,12 +84,12 @@ public class AddlevelsCommand implements CommandExecutor{
                return true;
            }

-            if (!Misc.isInt(args[2])) {
+            if (!StringUtils.isInt(args[2])) {
                return false;
            }

            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);
-            levels = Integer.valueOf(args[2]);
+            levels = Integer.parseInt(args[2]);

            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
            if (mcMMOPlayer == null) {
@@ -109,7 +110,8 @@ public class AddlevelsCommand implements CommandExecutor{
                    }
                }
                else {
-                    profile.addLevels(SkillType.getSkill(args[1]), levels);
+                    skill = SkillType.getSkill(args[1]);
+                    profile.addLevels(skill, levels);
                }

                profile.save(); // Since this is a temporary profile, we save it here.
@@ -129,8 +131,9 @@ public class AddlevelsCommand implements CommandExecutor{
                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.1", levels));
                }
                else {
-                    profile.addLevels(SkillType.getSkill(args[1]), levels);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, Misc.getCapitalized(args[1])));
+                    skill = SkillType.getSkill(args[1]);
+                    profile.addLevels(skill, levels);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.1", levels, SkillTools.getSkillName(skill)));
                }
            }

@@ -138,7 +141,7 @@ public class AddlevelsCommand implements CommandExecutor{
                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
            }
            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", Misc.getCapitalized(args[1]), args[0]));
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillTools.getSkillName(skill), args[0]));
            }

            return true;
--- a/src/main/java/com/gmail/nossr50/commands/admin/AddxpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/AddxpCommand.java
@@ -4,14 +4,12 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.Users;

 public class AddxpCommand implements CommandExecutor {
@@ -21,10 +19,11 @@ public class AddxpCommand implements CommandExecutor {
        McMMOPlayer mcMMOPlayer;
        PlayerProfile profile;
        boolean allSkills = false;
+        SkillType skill = null;

        switch (args.length) {
        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp")) {
+            if (!sender.hasPermission("mcmmo.commands.addxp")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -41,11 +40,11 @@ public class AddxpCommand implements CommandExecutor {
                return true;
            }

-            if (!Misc.isInt(args[1])) {
+            if (!StringUtils.isInt(args[1])) {
                return false;
            }

-            xp = Integer.valueOf(args[1]);
+            xp = Integer.parseInt(args[1]);
            mcMMOPlayer = Users.getPlayer((Player) sender);
            profile = mcMMOPlayer.getProfile();

@@ -61,14 +60,16 @@ public class AddxpCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
            }
            else {
-                mcMMOPlayer.applyXpGain(SkillType.getSkill(args[0]), xp);
-                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, Misc.getCapitalized(args[0])));
+                skill = SkillType.getSkill(args[0]);
+
+                mcMMOPlayer.applyXpGain(skill, xp);
+                sender.sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillTools.getSkillName(skill)));
            }

            return true;

        case 3:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.addxp.others")) {
+            if (!sender.hasPermission("mcmmo.commands.addxp.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -81,12 +82,12 @@ public class AddxpCommand implements CommandExecutor {
                return true;
            }

-            if (!Misc.isInt(args[2])) {
+            if (!StringUtils.isInt(args[2])) {
                return false;
            }

            mcMMOPlayer = Users.getPlayer(args[0]);
-            xp = Integer.valueOf(args[2]);
+            xp = Integer.parseInt(args[2]);

            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
            if (mcMMOPlayer == null) {
@@ -108,7 +109,8 @@ public class AddxpCommand implements CommandExecutor {
                    }
                }
                else {
-                    profile.setSkillXpLevel(SkillType.getSkill(args[1]), xp);
+                    skill = SkillType.getSkill(args[1]);
+                    profile.setSkillXpLevel(skill, xp);
                }

                profile.save(); // Since this is a temporary profile, we save it here.
@@ -126,8 +128,9 @@ public class AddxpCommand implements CommandExecutor {
                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardAll", xp));
                }
                else {
-                    mcMMOPlayer.applyXpGain(SkillType.getSkill(args[1]), xp);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, Misc.getCapitalized(args[1])));
+                    skill = SkillType.getSkill(args[1]);
+                    mcMMOPlayer.applyXpGain(skill, xp);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.addxp.AwardSkill", xp, SkillTools.getSkillName(skill)));
                }
            }

@@ -135,7 +138,7 @@ public class AddxpCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
            }
            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", Misc.getCapitalized(args[1]), args[0]));
+                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", SkillTools.getSkillName(skill), args[0]));
            }

            return true;
--- a/src/main/java/com/gmail/nossr50/commands/admin/HardcoreCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/HardcoreCommand.java
@@ -0,0 +1,85 @@
+package com.gmail.nossr50.commands.admin;
+
+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+
+public class HardcoreCommand implements CommandExecutor{
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+        case 0:
+            if (!sender.hasPermission("mcmmo.commands.hardcore.toggle")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            if (Config.getInstance().getHardcoreEnabled()) {
+                disableHardcore();
+            }
+            else {
+                enableHardcore();
+            }
+
+            return true;
+
+        case 1:
+            if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                if (!sender.hasPermission("mcmmo.commands.hardcore.toggle")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                enableHardcore();
+                return true;
+            }
+
+            if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                if (!sender.hasPermission("mcmmo.commands.hardcore.toggle")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                disableHardcore();
+                return true;
+            }
+
+            if (!StringUtils.isDouble(args[0])) {
+                return false;
+            }
+
+            if (!sender.hasPermission("mcmmo.commands.hardcore.modify")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            DecimalFormat percent = new DecimalFormat("##0.00%");
+            double newPercent = Double.parseDouble(args[0]);
+
+            Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
+            sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    private void disableHardcore() {
+        Config.getInstance().setHardcoreEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled"));
+    }
+
+    private void enableHardcore() {
+        Config.getInstance().setHardcoreEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled"));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/admin/McgodCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/McgodCommand.java
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class McgodCommand implements CommandExecutor {
@@ -18,7 +17,7 @@ public class McgodCommand implements CommandExecutor {

        switch (args.length) {
        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcgod")) {
+            if (!sender.hasPermission("mcmmo.commands.mcgod")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -45,7 +44,7 @@ public class McgodCommand implements CommandExecutor {
            return true;

        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcgod.others")) {
+            if (!sender.hasPermission("mcmmo.commands.mcgod.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
--- a/src/main/java/com/gmail/nossr50/commands/admin/McrefreshCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/McrefreshCommand.java
@@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.util.Users;

 public class McrefreshCommand implements CommandExecutor {
@@ -18,7 +18,7 @@ public class McrefreshCommand implements CommandExecutor {

        switch (args.length) {
        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrefresh")) {
+            if (!sender.hasPermission("mcmmo.commands.mcrefresh")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -33,12 +33,13 @@ public class McrefreshCommand implements CommandExecutor {
            profile.resetCooldowns();
            profile.resetToolPrepMode();
            profile.resetAbilityMode();
+            SkillTools.handleAbilitySpeedDecrease((Player) sender); //Remove enchants left over

            sender.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
            return true;

        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrefresh.others")) {
+            if (!sender.hasPermission("mcmmo.commands.mcrefresh.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -68,6 +69,7 @@ public class McrefreshCommand implements CommandExecutor {
            profile.resetCooldowns();
            profile.resetToolPrepMode();
            profile.resetAbilityMode();
+            SkillTools.handleAbilitySpeedDecrease(player); //Remove enchants left over

            player.sendMessage(LocaleLoader.getString("Ability.Generic.Refresh"));
            sender.sendMessage(LocaleLoader.getString("Commands.mcrefresh.Success", args[0]));
--- a/src/main/java/com/gmail/nossr50/commands/admin/MmoeditCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/MmoeditCommand.java
@@ -10,8 +10,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.Users;

 public class MmoeditCommand implements CommandExecutor {
@@ -20,10 +19,11 @@ public class MmoeditCommand implements CommandExecutor {
        PlayerProfile profile;
        int newValue;
        boolean allSkills = false;
+        SkillType skill = null;

        switch (args.length) {
        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mmoedit")) {
+            if (!sender.hasPermission("mcmmo.commands.mmoedit")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -40,11 +40,11 @@ public class MmoeditCommand implements CommandExecutor {
                return true;
            }

-            if (!Misc.isInt(args[1])) {
+            if (!StringUtils.isInt(args[1])) {
                return false;
            }

-            newValue = Integer.valueOf(args[1]);
+            newValue = Integer.parseInt(args[1]);
            profile = Users.getPlayer((Player) sender).getProfile();

            if (allSkills) {
@@ -59,14 +59,15 @@ public class MmoeditCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
            }
            else {
-                profile.modifySkill(SkillType.getSkill(args[0]), newValue);
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", Misc.getCapitalized(args[0]), newValue));
+                skill = SkillType.getSkill(args[0]);
+                profile.modifySkill(skill, newValue);
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1", SkillTools.getSkillName(skill), newValue));
            }

            return true;

        case 3:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mmoedit.others")) {
+            if (!sender.hasPermission("mcmmo.commands.mmoedit.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -79,11 +80,11 @@ public class MmoeditCommand implements CommandExecutor {
                return true;
            }

-            if (!Misc.isInt(args[2])) {
+            if (!StringUtils.isInt(args[2])) {
                return false;
            }

-            newValue = Integer.valueOf(args[2]);
+            newValue = Integer.parseInt(args[2]);
            McMMOPlayer mcMMOPlayer = Users.getPlayer(args[0]);

            // If the mcMMOPlayer doesn't exist, create a temporary profile and check if it's present in the database. If it's not, abort the process.
@@ -105,7 +106,8 @@ public class MmoeditCommand implements CommandExecutor {
                    }
                }
                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), newValue);
+                    skill = SkillType.getSkill(args[1]);
+                    profile.modifySkill(skill, newValue);
                }

                profile.save(); // Since this is a temporary profile, we save it here.
@@ -125,8 +127,9 @@ public class MmoeditCommand implements CommandExecutor {
                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.AllSkills.1", newValue));
                }
                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), newValue);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1",  Misc.getCapitalized(args[1]), newValue));
+                    skill = SkillType.getSkill(args[1]);
+                    profile.modifySkill(skill, newValue);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.1",  SkillTools.getSkillName(skill), newValue));
                }
            }

@@ -134,7 +137,7 @@ public class MmoeditCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
            }
            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", Misc.getCapitalized(args[1]), args[0]));
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", SkillTools.getSkillName(skill), args[0]));
            }

            return true;
--- a/src/main/java/com/gmail/nossr50/commands/admin/SkillresetCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/SkillresetCommand.java
@@ -10,8 +10,6 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class SkillresetCommand implements CommandExecutor {
@@ -19,10 +17,12 @@ public class SkillresetCommand implements CommandExecutor {
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        PlayerProfile profile;
        boolean allSkills = false;
+        SkillType skill = null;
+        String skillName = "";

        switch (args.length) {
        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset")) {
+            if (!sender.hasPermission("mcmmo.commands.skillreset")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -39,30 +39,16 @@ public class SkillresetCommand implements CommandExecutor {
                return true;
            }

+            profile = Users.getPlayer((Player) sender).getProfile();
+
            if (allSkills) {
                for (SkillType skillType : SkillType.values()) {
                    if (skillType.isChildSkill()) {
                        continue;
                    }

-                    if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset." + args[0].toLowerCase())) {
+                    if (!sender.hasPermission("mcmmo.commands.skillreset." + skillType.toString().toLowerCase())) {
                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-                }
-            }
-            else {
-                if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset." + args[0].toLowerCase())) {
-                    sender.sendMessage(command.getPermissionMessage());
-                    return true;
-                }
-            }
-
-            profile = Users.getPlayer((Player) sender).getProfile();
-
-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
                        continue;
                    }

@@ -72,14 +58,22 @@ public class SkillresetCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Commands.Reset.All"));
            }
            else {
-                profile.modifySkill(SkillType.getSkill(args[0]), 0);
-                sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", Misc.getCapitalized(args[0])));
+                skill = SkillType.getSkill(args[0]);
+                skillName = SkillTools.getSkillName(skill);
+
+                if (!sender.hasPermission("mcmmo.commands.skillreset." + skill.toString().toLowerCase())) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                profile.modifySkill(skill, 0);
+                sender.sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
            }

            return true;

        case 2:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others")) {
+            if (!sender.hasPermission("mcmmo.commands.skillreset.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -92,20 +86,11 @@ public class SkillresetCommand implements CommandExecutor {
                return true;
            }

-            if (allSkills) {
-                for (SkillType skillType : SkillType.values()) {
-                    if (skillType.isChildSkill()) {
-                        continue;
-                    }
+            if (!allSkills) {
+                skill = SkillType.getSkill(args[1]);
+                skillName = SkillTools.getSkillName(skill);

-                    if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others." + args[1].toLowerCase())) {
-                        sender.sendMessage(command.getPermissionMessage());
-                        return true;
-                    }
-                }
-            }
-            else {
-                if (!Permissions.hasPermission(sender, "mcmmo.commands.skillreset.others." + args[1].toLowerCase())) {
+                if (!sender.hasPermission("mcmmo.commands.skillreset.others." + skill.toString().toLowerCase())) {
                    sender.sendMessage(command.getPermissionMessage());
                    return true;
                }
@@ -128,11 +113,16 @@ public class SkillresetCommand implements CommandExecutor {
                            continue;
                        }

+                        if (!sender.hasPermission("mcmmo.commands.skillreset.others." + skillType.toString().toLowerCase())) {
+                            sender.sendMessage(command.getPermissionMessage());
+                            continue;
+                        }
+
                        profile.modifySkill(skillType, 0);
                    }
                }
                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), 0);
+                    profile.modifySkill(skill, 0);
                }

                profile.save(); // Since this is a temporary profile, we save it here.
@@ -146,14 +136,19 @@ public class SkillresetCommand implements CommandExecutor {
                            continue;
                        }

+                        if (!sender.hasPermission("mcmmo.commands.skillreset.others." + skillType.toString().toLowerCase())) {
+                            sender.sendMessage(command.getPermissionMessage());
+                            continue;
+                        }
+
                        profile.modifySkill(skillType, 0);
                    }

                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.All"));
                }
                else {
-                    profile.modifySkill(SkillType.getSkill(args[1]), 0);
-                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", Misc.getCapitalized(args[1])));
+                    profile.modifySkill(skill, 0);
+                    mcMMOPlayer.getPlayer().sendMessage(LocaleLoader.getString("Commands.Reset.Single", skillName));
                }
            }

@@ -161,7 +156,7 @@ public class SkillresetCommand implements CommandExecutor {
                sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", args[0]));
            }
            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", Misc.getCapitalized(args[1]), args[0]));
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoedit.Modified.2", skillName, args[0]));
            }

            return true;
--- a/src/main/java/com/gmail/nossr50/commands/admin/VampirismCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/VampirismCommand.java
@@ -0,0 +1,90 @@
+package com.gmail.nossr50.commands.admin;
+
+import java.text.DecimalFormat;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+
+public class VampirismCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getHardcoreEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Hardcore.Disabled"));
+            return true;
+        }
+
+        switch (args.length) {
+        case 0:
+            if (!sender.hasPermission("mcmmo.commands.vampirism.toggle")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            if (Config.getInstance().getHardcoreVampirismEnabled()) {
+                disableVampirism();
+            }
+            else {
+                enableVampirism();
+            }
+
+            return true;
+
+        case 1:
+            if (args[0].equalsIgnoreCase("on") || args[0].equalsIgnoreCase("true") || args[0].equalsIgnoreCase("enabled")) {
+                if (!sender.hasPermission("mcmmo.commands.vampirism.toggle")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                enableVampirism();
+                return true;
+            }
+
+            if (args[0].equalsIgnoreCase("off") || args[0].equalsIgnoreCase("false") || args[0].equalsIgnoreCase("disabled")) {
+                if (!sender.hasPermission("mcmmo.commands.vampirism.toggle")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                disableVampirism();
+                return true;
+            }
+
+            if (!StringUtils.isDouble(args[0])) {
+                return false;
+            }
+
+            if (!sender.hasPermission("mcmmo.commands.vampirism.modify")) {
+                sender.sendMessage(command.getPermissionMessage());
+                return true;
+            }
+
+            DecimalFormat percent = new DecimalFormat("##0.00%");
+            double newPercent = Double.parseDouble(args[0]);
+
+            Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
+            sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    private void disableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(false);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled"));
+    }
+
+    private void enableVampirism() {
+        Config.getInstance().setHardcoreVampirismEnabled(true);
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled"));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java
@@ -3,13 +3,11 @@ package com.gmail.nossr50.commands.admin;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;

 public class XprateCommand implements CommandExecutor {
    private static double originalRate = Config.getInstance().getExperienceGainsGlobalMultiplier();
@@ -22,16 +20,13 @@ public class XprateCommand implements CommandExecutor {
                return false;
            }

-            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.reset")) {
+            if (!sender.hasPermission("mcmmo.commands.xprate.reset")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }

            if (mcMMO.p.isXPEventEnabled()) {
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    player.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
-                }
-
+                mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.over"));
                mcMMO.p.toggleXpEventEnabled();
            }

@@ -39,11 +34,11 @@ public class XprateCommand implements CommandExecutor {
            return true;

        case 2:
-            if (!Misc.isInt(args[0])) {
+            if (!StringUtils.isInt(args[0])) {
                return false;
            }

-            if (!Permissions.hasPermission(sender, "mcmmo.commands.xprate.set")) {
+            if (!sender.hasPermission("mcmmo.commands.xprate.set")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -53,14 +48,12 @@ public class XprateCommand implements CommandExecutor {
            }

            mcMMO.p.setXPEventEnabled(Boolean.valueOf(args[1]));
-            int newXpRate = Misc.getInt(args[0]);
+            int newXpRate = Integer.parseInt(args[0]);
            Config.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);

            if (mcMMO.p.isXPEventEnabled()) {
-                for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-                    player.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
-                    player.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
-                }
+                mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.0"));
+                mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.xprate.started.1", newXpRate));
            }
            else {
                sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
--- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -11,7 +11,6 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class InspectCommand implements CommandExecutor {
@@ -21,7 +20,7 @@ public class InspectCommand implements CommandExecutor {

        switch (args.length) {
        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.inspect")) {
+            if (!sender.hasPermission("mcmmo.commands.inspect")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -37,7 +36,7 @@ public class InspectCommand implements CommandExecutor {
                    return true;
                }

-                if (sender instanceof Player && !Permissions.inspectOffline((Player) sender)) {
+                if (sender instanceof Player && !sender.hasPermission("mcmmo.commands.inspect.offline")) {
                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
                    return true;
                }
@@ -68,7 +67,7 @@ public class InspectCommand implements CommandExecutor {
                if (sender instanceof Player) {
                    Player inspector = (Player) sender;

-                    if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !Permissions.inspectFar(inspector)) {
+                    if (!Misc.isNear(inspector.getLocation(), target.getLocation(), 5.0) && !inspector.hasPermission("mcmmo.commands.inspect.far")) {
                        sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
                        return true;
                    }
--- a/src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McabilityCommand.java
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class McabilityCommand implements CommandExecutor {
@@ -18,7 +17,7 @@ public class McabilityCommand implements CommandExecutor {

        switch (args.length) {
        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability")) {
+            if (!sender.hasPermission("mcmmo.commands.mcability")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -36,7 +35,7 @@ public class McabilityCommand implements CommandExecutor {
            return true;

        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcability.others")) {
+            if (!sender.hasPermission("mcmmo.commands.mcability.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
--- a/src/main/java/com/gmail/nossr50/commands/player/MccCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MccCommand.java
@@ -1,79 +0,0 @@
-package com.gmail.nossr50.commands.player;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-
-//TODO: Rework this whole thing. It's ugly. Also is missing all the admin & spout commands.
-public class MccCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandHelper.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        if (!Permissions.hasPermission(sender, "mcmmo.commands.mcc")) {
-            return true;
-        }
-
-        Player player = (Player) sender;
-
-        player.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
-
-        if (Permissions.party(player)) {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Commands"));
-            player.sendMessage("/party create <" + LocaleLoader.getString("Commands.Usage.PartyName") + "> " + LocaleLoader.getString("Commands.Party1"));
-            player.sendMessage("/party join <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party2"));
-            player.sendMessage("/party quit " + LocaleLoader.getString("Commands.Party.Quit"));
-
-            if (Permissions.partyChat(player)) {
-                player.sendMessage("/p " + LocaleLoader.getString("Commands.Party.Toggle"));
-            }
-
-            player.sendMessage("/party invite <" + LocaleLoader.getString("Commands.Usage.Player") + "> " + LocaleLoader.getString("Commands.Party.Invite"));
-            player.sendMessage("/party accept " + LocaleLoader.getString("Commands.Party.Accept"));
-
-            if (Permissions.partyTeleport(player)) {
-                player.sendMessage("/ptp " + LocaleLoader.getString("Commands.Party.Teleport"));
-            }
-        }
-
-        player.sendMessage(LocaleLoader.getString("Commands.Other"));
-        player.sendMessage("/mcstats " + LocaleLoader.getString("Commands.Stats"));
-        player.sendMessage("/mctop " + LocaleLoader.getString("Commands.Leaderboards"));
-
-        if (Permissions.skillReset(player)) {
-            player.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
-        }
-
-        if (Permissions.mcAbility(player)) {
-            player.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
-        }
-
-        if (Permissions.adminChat(player)) {
-            player.sendMessage("/a " + LocaleLoader.getString("Commands.AdminToggle"));
-        }
-
-        if (Permissions.inspect(player)) {
-            player.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
-        }
-
-        if (Permissions.mmoedit(player)) {
-            player.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
-        }
-
-        if (Permissions.mcgod(player)) {
-            player.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
-        }
-
-        player.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
-        player.sendMessage("/mcmmo " + LocaleLoader.getString("Commands.ModDescription"));
-
-        return true;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/player/McmmoCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McmmoCommand.java
@@ -10,13 +10,13 @@ import org.getspout.spoutapi.player.SpoutPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Anniversary;

 public class McmmoCommand implements CommandExecutor {
    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

-        if (args.length == 0 || (args.length == 1 && args[0].equals("?"))) {
+        switch (args.length) {
+        case 0:
            String description = LocaleLoader.getString("mcMMO.Description");
            String[] mcSplit = description.split(",");
            sender.sendMessage(mcSplit);
@@ -32,11 +32,76 @@ public class McmmoCommand implements CommandExecutor {
            }

            sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
-
-            Anniversary.anniversaryCheck(sender);
            return true;
+
+        case 1:
+            if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help") || args[0].equalsIgnoreCase("commands")) {
+                if (!sender.hasPermission("mcmmo.commands.mcmmo.help")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mcc.Header"));
+                displayPartyCommands(sender);
+                displayOtherCommands(sender);
+
+            }
+            return true;
+
+        default:
+            return false;
+        }
+    }
+
+    private void displayPartyCommands(CommandSender sender) {
+        if (sender.hasPermission("mcmmo.commands.party")) {
+            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"));
+
+            if (sender.hasPermission("mcmmo.chat.party")) {
+                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"));
+
+            if (sender.hasPermission("mcmmo.commands.ptp")) {
+                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"));
+
+        if (sender.hasPermission("mcmmo.commands.skillreset")) {
+            sender.sendMessage("/skillreset <skill|all> " + LocaleLoader.getString("Commands.Reset"));
        }

-        return false;
+        if (sender.hasPermission("mcmmo.commands.mcability")) {
+            sender.sendMessage("/mcability " + LocaleLoader.getString("Commands.ToggleAbility"));
+        }
+
+        if (sender.hasPermission("mcmmo.chat.admin")) {
+            sender.sendMessage("/adminchat " + LocaleLoader.getString("Commands.AdminToggle"));
+        }
+
+        if (sender.hasPermission("mcmmo.commands.inspect")) {
+            sender.sendMessage("/inspect " + LocaleLoader.getString("Commands.Inspect"));
+        }
+
+        if (sender.hasPermission("mcmmo.commands.mmoedit")) {
+            sender.sendMessage("/mmoedit " + LocaleLoader.getString("Commands.mmoedit"));
+        }
+
+        if (sender.hasPermission("mcmmo.commands.mcgod")) {
+            sender.sendMessage("/mcgod " + LocaleLoader.getString("Commands.mcgod"));
+        }
+
+        sender.sendMessage(LocaleLoader.getString("Commands.SkillInfo"));
    }
 }
--- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
@@ -16,7 +16,6 @@ import com.gmail.nossr50.runnables.McRankAsync;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class McrankCommand implements CommandExecutor {
@@ -24,7 +23,7 @@ public class McrankCommand implements CommandExecutor {
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
        switch (args.length) {
        case 0:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank")) {
+            if (!sender.hasPermission("mcmmo.commands.mcrank")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -44,7 +43,7 @@ public class McrankCommand implements CommandExecutor {
            return true;

        case 1:
-            if (!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others")) {
+            if (!sender.hasPermission("mcmmo.commands.mcrank.others")) {
                sender.sendMessage(command.getPermissionMessage());
                return true;
            }
@@ -59,7 +58,7 @@ public class McrankCommand implements CommandExecutor {
                    return true;
                }

-                if (sender instanceof Player && !!Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.offline")) {
+                if (sender instanceof Player && !!sender.hasPermission("mcmmo.commands.mcrank.others.offline")) {
                    sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
                    return true;
                }
@@ -67,7 +66,7 @@ public class McrankCommand implements CommandExecutor {
            else {
                Player target = mcMMOPlayer.getPlayer();

-                if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !Permissions.hasPermission(sender, "mcmmo.commands.mcrank.others.far")) {
+                if (sender instanceof Player && !Misc.isNear(((Player) sender).getLocation(), target.getLocation(), 5.0) && !sender.hasPermission("mcmmo.commands.mcrank.others.far")) {
                    sender.sendMessage(LocaleLoader.getString("Inspect.TooFar"));
                    return true;
                }
@@ -100,10 +99,10 @@ public class McrankCommand implements CommandExecutor {
            }

            if (rankInts[1] == 0) {
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.getSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
            }
            else {
-                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), String.valueOf(rankInts[0])));
+                sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.getSkillName(skillType), rankInts[0]));
            }
        }

@@ -111,10 +110,10 @@ public class McrankCommand implements CommandExecutor {
        int[] rankInts = Leaderboard.getPlayerRank(playerName);

        if (rankInts[1] == 0) {
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overalll", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", LocaleLoader.getString("Commands.mcrank.Unranked"))); // Don't bother showing ranking for players without skills
        }
        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", String.valueOf(rankInts[0])));
+            sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Overall", rankInts[0]));
        }
    }

--- a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
@@ -35,10 +35,10 @@ public class McstatsCommand implements CommandExecutor {
            int powerLevelCap = Config.getInstance().getPowerLevelCap();

            if (powerLevelCap != Integer.MAX_VALUE) {
-                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", String.valueOf(mcMMOPlayer.getPowerLevel()), String.valueOf(powerLevelCap)));
+                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", mcMMOPlayer.getPowerLevel(), powerLevelCap));
            }
            else {
-                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", String.valueOf(mcMMOPlayer.getPowerLevel())));
+                player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", mcMMOPlayer.getPowerLevel()));
            }

            return true;
--- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -1,20 +1,19 @@
 package com.gmail.nossr50.commands.player;

-import java.util.ArrayList;
-import java.util.HashMap;
-
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

-import com.gmail.nossr50.commands.CommandHelper;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.database.Leaderboard;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.runnables.McTopAsync;
 import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.StringUtils;

 public class MctopCommand implements CommandExecutor {
    @Override
@@ -23,18 +22,15 @@ public class MctopCommand implements CommandExecutor {

        switch (args.length) {
        case 0:
-            display(1, "ALL", sender, useMySQL);
+            display(1, "ALL", sender, useMySQL, command);
            return true;

        case 1:
-            if (Misc.isInt(args[0])) {
-                display(Integer.valueOf(args[0]), "ALL", sender, useMySQL);
+            if (StringUtils.isInt(args[0])) {
+                display(Integer.parseInt(args[0]), "ALL", sender, useMySQL, command);
            }
            else if (SkillTools.isSkill(args[0])) {
-                display(1, args[0], sender, useMySQL);
-            }
-            else if (SkillTools.isLocalizedSkill(args[0])) {
-                display(1, SkillTools.translateLocalizedSkill(args[0]), sender, useMySQL);
+                display(1, SkillType.getSkill(args[0]).toString(), sender, useMySQL, command);
            }
            else {
                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
@@ -43,15 +39,12 @@ public class MctopCommand implements CommandExecutor {
            return true;

        case 2:
-            if (!Misc.isInt(args[1])) {
+            if (!StringUtils.isInt(args[1])) {
                return false;
            }

            if (SkillTools.isSkill(args[0])) {
-                display(Integer.valueOf(args[1]), args[0], sender, useMySQL);
-            }
-            else if (SkillTools.isLocalizedSkill(args[0])) {
-                display(Integer.valueOf(args[1]), SkillTools.translateLocalizedSkill(args[0]), sender, useMySQL);
+                display(Integer.parseInt(args[1]), SkillType.getSkill(args[0]).toString(), sender, useMySQL, command);
            }
            else {
                sender.sendMessage(LocaleLoader.getString("Commands.Skill.Invalid"));
@@ -64,22 +57,23 @@ public class MctopCommand implements CommandExecutor {
        }
    }

-    private void display(int page, String skill, CommandSender sender, boolean sql) {
+    private void display(int page, String skill, CommandSender sender, boolean sql, Command command) {
        if (sql) {
            if (skill.equalsIgnoreCase("all")) {
-                sqlDisplay(page, "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing", sender);
+                sqlDisplay(page, "taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing", sender, command);
            }
            else {
-                sqlDisplay(page, skill, sender);
+                sqlDisplay(page, skill, sender, command);
            }
        }
        else {
-            flatfileDisplay(page, skill, sender);
+            flatfileDisplay(page, skill, sender, command);
        }
    }

-    private void flatfileDisplay(int page, String skill, CommandSender sender) {
-        if (!skill.equalsIgnoreCase("all") && CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mctop." + skill.toLowerCase())) {
+    private void flatfileDisplay(int page, String skill, CommandSender sender, Command command) {
+        if (!skill.equalsIgnoreCase("all") && !sender.hasPermission("mcmmo.commands.mctop." + skill.toLowerCase())) {
+            sender.sendMessage(command.getPermissionMessage());
            return;
        }

@@ -91,7 +85,7 @@ public class MctopCommand implements CommandExecutor {
            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
        }
        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", Misc.getCapitalized(skill)));
+            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", StringUtils.getCapitalized(skill)));
        }

        int n = (page * 10) - 9; // Position
@@ -114,33 +108,7 @@ public class MctopCommand implements CommandExecutor {
        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
    }

-    private void sqlDisplay(int page, String query, CommandSender sender) {
-        if (!query.equalsIgnoreCase("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
-            if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.mctop." + query.toLowerCase())) {
-                return;
-            }
-        }
-        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
-        HashMap<Integer, ArrayList<String>> userslist = Database.read("SELECT " + query + ", user, NOW() FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON (user_id = id) WHERE " + query + " > 0 ORDER BY " + query + " DESC, user LIMIT "+((page * 10) - 10)+",10");
-
-        if (query.equals("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
-            sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", Misc.getCapitalized(query)));
-        }
-
-        int place = (page * 10) - 9;
-        for (int i = 1; i <= 10; i++) {
-            if (userslist.get(i) == null) {
-                break;
-            }
-
-         // Format: 1. Playername - skill value
-            sender.sendMessage(String.valueOf(place) + ". " + ChatColor.GREEN + userslist.get(i).get(1) + " - " + ChatColor.WHITE + userslist.get(i).get(0));
-            place++;
-        }
-
-        sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
+    private void sqlDisplay(int page, String query, CommandSender sender, Command command) {
+        Bukkit.getScheduler().runTaskAsynchronously(mcMMO.p, new McTopAsync(page, query, sender, command));
    }
 }
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -36,6 +36,7 @@ public class Config extends ConfigLoader {
    public int getSaveInterval() { return config.getInt("General.Save_Interval", 10); }
    public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
+    public boolean getBackupsEnabled() { return config.getBoolean("General.Generate_Backups", true); }
    public boolean getPartyDisplayNames() { return config.getBoolean("Commands.p.Use_Display_Names", true); }
    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.a.Use_Display_Names", true); }

@@ -70,9 +71,16 @@ public class Config extends ConfigLoader {

    /* Hardcore Mode */
    public boolean getHardcoreEnabled() { return config.getBoolean("Hardcore.Enabled", false); }
-    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75); }
-    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5); }
+    public void setHardcoreEnabled(boolean enabled) { config.set("Hardcore.Enabled", enabled); }
+
+    public double getHardcoreDeathStatPenaltyPercentage() { return config.getDouble("Hardcore.Death_Stat_Loss_Penalty_Percentage", 75.0); }
+    public void setHardcoreDeathStatPenaltyPercentage(double value) { config.set("Hardcore.Death_Stat_Loss_Penalty_Percentage", value); }
+
+    public double getHardcoreVampirismStatLeechPercentage() { return config.getDouble("Hardcore.Vampirism_Stat_Leech_Percentage", 5.0); }
+    public void setHardcoreVampirismStatLeechPercentage(double value) { config.set("Hardcore.Vampirism_Stat_Leech_Percentage", value); }
+
    public boolean getHardcoreVampirismEnabled() { return config.getBoolean("Hardcore.Vampirism", false); }
+    public void setHardcoreVampirismEnabled(boolean enabled) { config.set("Hardcore.Vampirism", enabled); }

    /* SMP Mods */
    public boolean getToolModsEnabled() { return config.getBoolean("Mods.Tool_Mods_Enabled", false); }
@@ -80,6 +88,11 @@ public class Config extends ConfigLoader {
    public boolean getBlockModsEnabled() { return config.getBoolean("Mods.Block_Mods_Enabled", false); }
    public boolean getEntityModsEnabled() { return config.getBoolean("Mods.Entity_Mods_Enabled", false); }

+    /* Items */
+    public int getChimaeraCost() { return config.getInt("Items.Chimaera_Wing.Feather_Cost", 10); }
+    public int getChimaeraItemId() { return config.getInt("Items.Chimaera_Wing.Item_ID", 288); }
+    public boolean getChimaeraEnabled() { return config.getBoolean("Items.Chimaera_Wing.Enabled", true); }
+
    /* PARTY SETTINGS */
    public int getAutoPartyKickInterval() { return config.getInt("Party.AutoKick_Interval", 12); }
    public int getAutoPartyKickTime() { return config.getInt("Party.Old_Party_Member_Cutoff", 7); }
@@ -249,6 +262,9 @@ public class Config extends ConfigLoader {
    public int getSmeltingXPLapis() { return config.getInt("Experience.Smelting.Lapis", 40); }
    public int getSmeltingXPEmerald() { return config.getInt("Experience.Smelting.Emerald", 100); }

+    /* Unarmed */
+    public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }
+
    /* Taming */
    public int getTamingXPWolf() { return config.getInt("Experience.Taming.Animal_Taming.Wolf", 250); }
    public int getTamingXPOcelot() { return config.getInt("Experience.Taming.Animal_Taming.Ocelot", 500); }
@@ -260,6 +276,9 @@ public class Config extends ConfigLoader {
    public int getWoodcuttingXPBirch() { return config.getInt("Experience.Woodcutting.Birch", 90); }
    public int getWoodcuttingXPSpruce() { return config.getInt("Experience.Woodcutting.Spruce", 80); }
    public int getWoodcuttingXPJungle() { return config.getInt("Experience.Woodcutting.Jungle", 100); }
+    public int getWoodcuttingXPHugeBrownMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Brown", 70); }
+    public int getWoodcuttingXPHugeRedMushroom() { return config.getInt("Experience.Woodcutting.Huge_Mushroom_Red", 70); }
+    

    public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
    public boolean getBirchDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Birch", true); }
--- a/src/main/java/com/gmail/nossr50/database/Database.java
+++ b/src/main/java/com/gmail/nossr50/database/Database.java
@@ -173,13 +173,14 @@ public final class Database {
            write("ALTER TABLE `" + tablePrefix + "experience` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
            write("ALTER TABLE `" + tablePrefix + "cooldowns` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
            write("ALTER TABLE `" + tablePrefix + "skills` ADD FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON DELETE CASCADE;");
+            break;

        case FISHING:
            sql = "SELECT * FROM  `" + tablePrefix + "experience` ORDER BY  `" + tablePrefix + "experience`.`fishing` ASC LIMIT 0 , 30";
            break;

        case INDEX:
-            if (read("SHOW INDEX FROM " + tablePrefix + "skills").size() != 13) {
+            if (read("SHOW INDEX FROM " + tablePrefix + "skills").size() != 13 && checkConnected()) {
                mcMMO.p.getLogger().info("Indexing tables, this may take a while on larger databases");
                write("ALTER TABLE `" + tablePrefix + "skills` ADD INDEX `idx_taming` (`taming`) USING BTREE, "
                        + "ADD INDEX `idx_mining` (`mining`) USING BTREE, "
@@ -579,9 +580,9 @@ public final class Database {
    }

    private static void printErrors(SQLException ex) {
-        System.out.println("SQLException: " + ex.getMessage());
-        System.out.println("SQLState: " + ex.getSQLState());
-        System.out.println("VendorError: " + ex.getErrorCode());
+        mcMMO.p.getLogger().severe("SQLException: " + ex.getMessage());
+        mcMMO.p.getLogger().severe("SQLState: " + ex.getSQLState());
+        mcMMO.p.getLogger().severe("VendorError: " + ex.getErrorCode());
    }

    public static void profileCleanup(String playerName) {
--- a/src/main/java/com/gmail/nossr50/database/Leaderboard.java
+++ b/src/main/java/com/gmail/nossr50/database/Leaderboard.java
@@ -15,7 +15,7 @@ import org.bukkit.Bukkit;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;

 public final class Leaderboard {
    private static HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
@@ -71,64 +71,64 @@ public final class Leaderboard {

                players.add(p);

-                if (character.length > 1 && Misc.isInt(character[1])) {
-                    mining.add(new PlayerStat(p, Integer.valueOf(character[1])));
-                    powerLevel += Integer.valueOf(character[1]);
+                if (character.length > 1 && StringUtils.isInt(character[1])) {
+                    mining.add(new PlayerStat(p, Integer.parseInt(character[1])));
+                    powerLevel += Integer.parseInt(character[1]);
                }

-                if (character.length > 5 && Misc.isInt(character[5])) {
-                    woodcutting.add(new PlayerStat(p, Integer.valueOf(character[5])));
-                    powerLevel += Integer.valueOf(character[5]);
+                if (character.length > 5 && StringUtils.isInt(character[5])) {
+                    woodcutting.add(new PlayerStat(p, Integer.parseInt(character[5])));
+                    powerLevel += Integer.parseInt(character[5]);
                }

-                if (character.length > 7 && Misc.isInt(character[7])) {
-                    repair.add(new PlayerStat(p, Integer.valueOf(character[7])));
-                    powerLevel += Integer.valueOf(character[7]);
+                if (character.length > 7 && StringUtils.isInt(character[7])) {
+                    repair.add(new PlayerStat(p, Integer.parseInt(character[7])));
+                    powerLevel += Integer.parseInt(character[7]);
                }

-                if (character.length > 8 && Misc.isInt(character[8])) {
-                    unarmed.add(new PlayerStat(p, Integer.valueOf(character[8])));
-                    powerLevel += Integer.valueOf(character[8]);
+                if (character.length > 8 && StringUtils.isInt(character[8])) {
+                    unarmed.add(new PlayerStat(p, Integer.parseInt(character[8])));
+                    powerLevel += Integer.parseInt(character[8]);
                }

-                if (character.length > 9 && Misc.isInt(character[9])) {
-                    herbalism.add(new PlayerStat(p, Integer.valueOf(character[9])));
-                    powerLevel += Integer.valueOf(character[9]);
+                if (character.length > 9 && StringUtils.isInt(character[9])) {
+                    herbalism.add(new PlayerStat(p, Integer.parseInt(character[9])));
+                    powerLevel += Integer.parseInt(character[9]);
                }

-                if (character.length > 10 && Misc.isInt(character[10])) {
-                    excavation.add(new PlayerStat(p, Integer.valueOf(character[10])));
-                    powerLevel += Integer.valueOf(character[10]);
+                if (character.length > 10 && StringUtils.isInt(character[10])) {
+                    excavation.add(new PlayerStat(p, Integer.parseInt(character[10])));
+                    powerLevel += Integer.parseInt(character[10]);
                }

-                if (character.length > 11 && Misc.isInt(character[11])) {
-                    archery.add(new PlayerStat(p, Integer.valueOf(character[11])));
-                    powerLevel += Integer.valueOf(character[11]);
+                if (character.length > 11 && StringUtils.isInt(character[11])) {
+                    archery.add(new PlayerStat(p, Integer.parseInt(character[11])));
+                    powerLevel += Integer.parseInt(character[11]);
                }

-                if (character.length > 12 && Misc.isInt(character[12])) {
-                    swords.add(new PlayerStat(p, Integer.valueOf(character[12])));
-                    powerLevel += Integer.valueOf(character[12]);
+                if (character.length > 12 && StringUtils.isInt(character[12])) {
+                    swords.add(new PlayerStat(p, Integer.parseInt(character[12])));
+                    powerLevel += Integer.parseInt(character[12]);
                }

-                if (character.length > 13 && Misc.isInt(character[13])) {
-                    axes.add(new PlayerStat(p, Integer.valueOf(character[13])));
-                    powerLevel += Integer.valueOf(character[13]);
+                if (character.length > 13 && StringUtils.isInt(character[13])) {
+                    axes.add(new PlayerStat(p, Integer.parseInt(character[13])));
+                    powerLevel += Integer.parseInt(character[13]);
                }

-                if (character.length > 14 && Misc.isInt(character[14])) {
-                    acrobatics.add(new PlayerStat(p, Integer.valueOf(character[14])));
-                    powerLevel += Integer.valueOf(character[14]);
+                if (character.length > 14 && StringUtils.isInt(character[14])) {
+                    acrobatics.add(new PlayerStat(p, Integer.parseInt(character[14])));
+                    powerLevel += Integer.parseInt(character[14]);
                }

-                if (character.length > 24 && Misc.isInt(character[24])) {
-                    taming.add(new PlayerStat(p, Integer.valueOf(character[24])));
-                    powerLevel += Integer.valueOf(character[24]);
+                if (character.length > 24 && StringUtils.isInt(character[24])) {
+                    taming.add(new PlayerStat(p, Integer.parseInt(character[24])));
+                    powerLevel += Integer.parseInt(character[24]);
                }

-                if (character.length > 34 && Misc.isInt(character[34])) {
-                    fishing.add(new PlayerStat(p, Integer.valueOf(character[34])));
-                    powerLevel += Integer.valueOf(character[34]);
+                if (character.length > 34 && StringUtils.isInt(character[34])) {
+                    fishing.add(new PlayerStat(p, Integer.parseInt(character[34])));
+                    powerLevel += Integer.parseInt(character[34]);
                }

                powerLevels.add(new PlayerStat(p, powerLevel));
@@ -279,7 +279,7 @@ public final class Leaderboard {
                    writer.append(line).append("\r\n");
                }
                else {
-                    System.out.println("User found, removing...");
+                    mcMMO.p.getLogger().info("User found, removing...");
                    worked = true;
                    continue; //Skip the player
                }
@@ -355,11 +355,11 @@ public final class Leaderboard {
                String[] splitLine = line.split(":");

                if (splitLine.length > 37) {
-                    if (currentTime - (Misc.getLong(line.split(":")[37]) * 1000) <= purgeTime) {
+                    if (currentTime - (StringUtils.getLong(line.split(":")[37]) * 1000) <= purgeTime) {
                        writer.append(line).append("\r\n");
                    }
                    else {
-                        System.out.println("User found, removing...");
+                        mcMMO.p.getLogger().info("User found, removing...");
                        removedPlayers++;
                        continue; //Skip the player
                    }
--- a/src/main/java/com/gmail/nossr50/database/runnables/SQLConversionTask.java
+++ b/src/main/java/com/gmail/nossr50/database/runnables/SQLConversionTask.java
@@ -7,6 +7,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.database.Database;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;

 public class SQLConversionTask implements Runnable {
    private String tablePrefix = Config.getInstance().getMySQLTablePrefix();
@@ -175,34 +176,34 @@ public class SQLConversionTask implements Runnable {
                    Database.write("UPDATE "
                            + tablePrefix
                            + "skills SET "
-                            + "  taming = taming+" + Misc.getInt(taming)
-                            + ", mining = mining+" + Misc.getInt(mining)
-                            + ", repair = repair+" + Misc.getInt(repair)
-                            + ", woodcutting = woodcutting+" + Misc.getInt(woodcutting)
-                            + ", unarmed = unarmed+" + Misc.getInt(unarmed)
-                            + ", herbalism = herbalism+" + Misc.getInt(herbalism)
-                            + ", excavation = excavation+" + Misc.getInt(excavation)
-                            + ", archery = archery+" + Misc.getInt(archery)
-                            + ", swords = swords+" + Misc.getInt(swords)
-                            + ", axes = axes+" + Misc.getInt(axes)
-                            + ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
-                            + ", fishing = fishing+" + Misc.getInt(fishing)
+                            + "  taming = taming+" + StringUtils.getInt(taming)
+                            + ", mining = mining+" + StringUtils.getInt(mining)
+                            + ", repair = repair+" + StringUtils.getInt(repair)
+                            + ", woodcutting = woodcutting+" + StringUtils.getInt(woodcutting)
+                            + ", unarmed = unarmed+" + StringUtils.getInt(unarmed)
+                            + ", herbalism = herbalism+" + StringUtils.getInt(herbalism)
+                            + ", excavation = excavation+" + StringUtils.getInt(excavation)
+                            + ", archery = archery+" + StringUtils.getInt(archery)
+                            + ", swords = swords+" + StringUtils.getInt(swords)
+                            + ", axes = axes+" + StringUtils.getInt(axes)
+                            + ", acrobatics = acrobatics+" + StringUtils.getInt(acrobatics)
+                            + ", fishing = fishing+" + StringUtils.getInt(fishing)
                            + " WHERE user_id = " + id);
                    Database.write("UPDATE "
                            + tablePrefix
                            + "experience SET "
-                            + "  taming = " + Misc.getInt(tamingXP)
-                            + ", mining = " + Misc.getInt(miningXP)
-                            + ", repair = " + Misc.getInt(repairXP)
-                            + ", woodcutting = " + Misc.getInt(woodCuttingXP)
-                            + ", unarmed = " + Misc.getInt(unarmedXP)
-                            + ", herbalism = " + Misc.getInt(herbalismXP)
-                            + ", excavation = " + Misc.getInt(excavationXP)
-                            + ", archery = " + Misc.getInt(archeryXP)
-                            + ", swords = " + Misc.getInt(swordsXP)
-                            + ", axes = " + Misc.getInt(axesXP)
-                            + ", acrobatics = " + Misc.getInt(acrobaticsXP)
-                            + ", fishing = " + Misc.getInt(fishingXP)
+                            + "  taming = " + StringUtils.getInt(tamingXP)
+                            + ", mining = " + StringUtils.getInt(miningXP)
+                            + ", repair = " + StringUtils.getInt(repairXP)
+                            + ", woodcutting = " + StringUtils.getInt(woodCuttingXP)
+                            + ", unarmed = " + StringUtils.getInt(unarmedXP)
+                            + ", herbalism = " + StringUtils.getInt(herbalismXP)
+                            + ", excavation = " + StringUtils.getInt(excavationXP)
+                            + ", archery = " + StringUtils.getInt(archeryXP)
+                            + ", swords = " + StringUtils.getInt(swordsXP)
+                            + ", axes = " + StringUtils.getInt(axesXP)
+                            + ", acrobatics = " + StringUtils.getInt(acrobaticsXP)
+                            + ", fishing = " + StringUtils.getInt(fishingXP)
                            + " WHERE user_id = " + id);
                }
                else {
@@ -237,39 +238,39 @@ public class SQLConversionTask implements Runnable {
                    Database.write("UPDATE "
                            + tablePrefix
                            + "skills SET "
-                            + "  taming = taming+" + Misc.getInt(taming)
-                            + ", mining = mining+" + Misc.getInt(mining)
-                            + ", repair = repair+" + Misc.getInt(repair)
-                            + ", woodcutting = woodcutting+" + Misc.getInt(woodcutting)
-                            + ", unarmed = unarmed+" + Misc.getInt(unarmed)
-                            + ", herbalism = herbalism+" + Misc.getInt(herbalism)
-                            + ", excavation = excavation+" + Misc.getInt(excavation)
-                            + ", archery = archery+" + Misc.getInt(archery)
-                            + ", swords = swords+" + Misc.getInt(swords)
-                            + ", axes = axes+" + Misc.getInt(axes)
-                            + ", acrobatics = acrobatics+" + Misc.getInt(acrobatics)
-                            + ", fishing = fishing+" + Misc.getInt(fishing)
+                            + "  taming = taming+" + StringUtils.getInt(taming)
+                            + ", mining = mining+" + StringUtils.getInt(mining)
+                            + ", repair = repair+" + StringUtils.getInt(repair)
+                            + ", woodcutting = woodcutting+" + StringUtils.getInt(woodcutting)
+                            + ", unarmed = unarmed+" + StringUtils.getInt(unarmed)
+                            + ", herbalism = herbalism+" + StringUtils.getInt(herbalism)
+                            + ", excavation = excavation+" + StringUtils.getInt(excavation)
+                            + ", archery = archery+" + StringUtils.getInt(archery)
+                            + ", swords = swords+" + StringUtils.getInt(swords)
+                            + ", axes = axes+" + StringUtils.getInt(axes)
+                            + ", acrobatics = acrobatics+" + StringUtils.getInt(acrobatics)
+                            + ", fishing = fishing+" + StringUtils.getInt(fishing)
                            + " WHERE user_id = " + id);
                    Database.write("UPDATE "
                            + tablePrefix
                            + "experience SET "
-                            + "  taming = " + Misc.getInt(tamingXP)
-                            + ", mining = " + Misc.getInt(miningXP)
-                            + ", repair = " + Misc.getInt(repairXP)
-                            + ", woodcutting = " + Misc.getInt(woodCuttingXP)
-                            + ", unarmed = " + Misc.getInt(unarmedXP)
-                            + ", herbalism = " + Misc.getInt(herbalismXP)
-                            + ", excavation = " + Misc.getInt(excavationXP)
-                            + ", archery = " + Misc.getInt(archeryXP)
-                            + ", swords = " + Misc.getInt(swordsXP)
-                            + ", axes = " + Misc.getInt(axesXP)
-                            + ", acrobatics = " + Misc.getInt(acrobaticsXP)
-                            + ", fishing = " + Misc.getInt(fishingXP)
+                            + "  taming = " + StringUtils.getInt(tamingXP)
+                            + ", mining = " + StringUtils.getInt(miningXP)
+                            + ", repair = " + StringUtils.getInt(repairXP)
+                            + ", woodcutting = " + StringUtils.getInt(woodCuttingXP)
+                            + ", unarmed = " + StringUtils.getInt(unarmedXP)
+                            + ", herbalism = " + StringUtils.getInt(herbalismXP)
+                            + ", excavation = " + StringUtils.getInt(excavationXP)
+                            + ", archery = " + StringUtils.getInt(archeryXP)
+                            + ", swords = " + StringUtils.getInt(swordsXP)
+                            + ", axes = " + StringUtils.getInt(axesXP)
+                            + ", acrobatics = " + StringUtils.getInt(acrobaticsXP)
+                            + ", fishing = " + StringUtils.getInt(fishingXP)
                            + " WHERE user_id = " + id);
                }
            }

-            System.out.println("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB");
+            mcMMO.p.getLogger().info("[mcMMO] MySQL Updated from users file, " + theCount + " items added/updated to MySQL DB");
            in.close();
        }
        catch (Exception e) {
--- a/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java
@@ -16,7 +16,6 @@ import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.spout.huds.SpoutHud;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;

 public class McMMOPlayer {
    private Player player;
@@ -50,7 +49,7 @@ public class McMMOPlayer {
                continue;
            }

-            if (type.getPermissions(player)) {
+            if (player.hasPermission("mcmmo.skills." + type.toString().toLowerCase())) {
                powerLevel += profile.getSkillLevel(type);
            }
        }
@@ -96,8 +95,14 @@ public class McMMOPlayer {
     * @param xp Experience amount to add
     */
    public void applyXpGain(SkillType skillType, int xp) {
-        mcMMO.p.getServer().getPluginManager().callEvent(new McMMOPlayerXpGainEvent(player, skillType, xp));
-        profile.setSkillXpLevel(skillType, profile.getSkillXpLevel(skillType) + xp);
+        McMMOPlayerXpGainEvent event = new McMMOPlayerXpGainEvent(player, skillType, xp);
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return;
+        }
+
+        profile.setSkillXpLevel(skillType, profile.getSkillXpLevel(skillType) + event.getXpGained());

        SpoutHud spoutHud = profile.getSpoutHud();

@@ -136,19 +141,19 @@ public class McMMOPlayer {
        }

        // TODO: Too many permission checks here, is there no way to avoid that? 
-        if (Permissions.xpQuadruple(player)) {
+        if (player.hasPermission("mcmmo.perks.xp.quadruple")) {
            xp *= 4;
        }
-        else if (Permissions.xpTriple(player)) {
+        else if (player.hasPermission("mcmmo.perks.xp.triple")) {
            xp *= 3;
        }
-        else if (Permissions.xpDoubleAndOneHalf(player)) {
+        else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
            xp *= 2.5;
        }
-        else if (Permissions.xpDouble(player)) {
+        else if (player.hasPermission("mcmmo.perks.xp.150percentboost")) {
            xp *= 2;
        }
-        else if (Permissions.xpOneAndOneHalf(player)) {
+        else if (player.hasPermission("mcmmo.perks.xp.50percentboost")) {
            xp *= 1.5;
        }

--- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java
@@ -17,6 +17,7 @@ import com.gmail.nossr50.spout.SpoutConfig;
 import com.gmail.nossr50.spout.huds.HudType;
 import com.gmail.nossr50.spout.huds.SpoutHud;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;

 public class PlayerProfile {
    private String playerName;
@@ -205,49 +206,49 @@ public class PlayerProfile {
                    continue;
                }

-                if (character.length > 1 && Misc.isInt(character[1]))
+                if (character.length > 1 && StringUtils.isInt(character[1]))
                    skills.put(SkillType.MINING, Integer.valueOf(character[1]));
-                if (character.length > 4 && Misc.isInt(character[4]))
+                if (character.length > 4 && StringUtils.isInt(character[4]))
                    skillsXp.put(SkillType.MINING, Integer.valueOf(character[4]));
-                if (character.length > 5 && Misc.isInt(character[5]))
+                if (character.length > 5 && StringUtils.isInt(character[5]))
                    skills.put(SkillType.WOODCUTTING, Integer.valueOf(character[5]));
-                if (character.length > 6 && Misc.isInt(character[6]))
+                if (character.length > 6 && StringUtils.isInt(character[6]))
                    skillsXp.put(SkillType.WOODCUTTING, Integer.valueOf(character[6]));
-                if (character.length > 7 && Misc.isInt(character[7]))
+                if (character.length > 7 && StringUtils.isInt(character[7]))
                    skills.put(SkillType.REPAIR, Integer.valueOf(character[7]));
-                if (character.length > 8 && Misc.isInt(character[8]))
+                if (character.length > 8 && StringUtils.isInt(character[8]))
                    skills.put(SkillType.UNARMED,  Integer.valueOf(character[8]));
-                if (character.length > 9 && Misc.isInt(character[9]))
+                if (character.length > 9 && StringUtils.isInt(character[9]))
                    skills.put(SkillType.HERBALISM, Integer.valueOf(character[9]));
-                if (character.length > 10 && Misc.isInt(character[10]))
+                if (character.length > 10 && StringUtils.isInt(character[10]))
                    skills.put(SkillType.EXCAVATION, Integer.valueOf(character[10]));
-                if (character.length > 11 && Misc.isInt(character[11]))
+                if (character.length > 11 && StringUtils.isInt(character[11]))
                    skills.put(SkillType.ARCHERY, Integer.valueOf(character[11]));
-                if (character.length > 12 && Misc.isInt(character[12]))
+                if (character.length > 12 && StringUtils.isInt(character[12]))
                    skills.put(SkillType.SWORDS, Integer.valueOf(character[12]));
-                if (character.length > 13 && Misc.isInt(character[13]))
+                if (character.length > 13 && StringUtils.isInt(character[13]))
                    skills.put(SkillType.AXES, Integer.valueOf(character[13]));
-                if (character.length > 14 && Misc.isInt(character[14]))
+                if (character.length > 14 && StringUtils.isInt(character[14]))
                    skills.put(SkillType.ACROBATICS, Integer.valueOf(character[14]));
-                if (character.length > 15 && Misc.isInt(character[15]))
+                if (character.length > 15 && StringUtils.isInt(character[15]))
                    skillsXp.put(SkillType.REPAIR, Integer.valueOf(character[15]));
-                if (character.length > 16 && Misc.isInt(character[16]))
+                if (character.length > 16 && StringUtils.isInt(character[16]))
                    skillsXp.put(SkillType.UNARMED, Integer.valueOf(character[16]));
-                if (character.length > 17 && Misc.isInt(character[17]))
+                if (character.length > 17 && StringUtils.isInt(character[17]))
                    skillsXp.put(SkillType.HERBALISM, Integer.valueOf(character[17]));
-                if (character.length > 18 && Misc.isInt(character[18]))
+                if (character.length > 18 && StringUtils.isInt(character[18]))
                    skillsXp.put(SkillType.EXCAVATION, Integer.valueOf(character[18]));
-                if (character.length > 19 && Misc.isInt(character[19]))
+                if (character.length > 19 && StringUtils.isInt(character[19]))
                    skillsXp.put(SkillType.ARCHERY, Integer.valueOf(character[19]));
-                if (character.length > 20 && Misc.isInt(character[20]))
+                if (character.length > 20 && StringUtils.isInt(character[20]))
                    skillsXp.put(SkillType.SWORDS, Integer.valueOf(character[20]));
-                if (character.length > 21 && Misc.isInt(character[21]))
+                if (character.length > 21 && StringUtils.isInt(character[21]))
                    skillsXp.put(SkillType.AXES, Integer.valueOf(character[21]));
-                if (character.length > 22 && Misc.isInt(character[22]))
+                if (character.length > 22 && StringUtils.isInt(character[22]))
                    skillsXp.put(SkillType.ACROBATICS, Integer.valueOf(character[22]));
-                if (character.length > 24 && Misc.isInt(character[24]))
+                if (character.length > 24 && StringUtils.isInt(character[24]))
                    skills.put(SkillType.TAMING, Integer.valueOf(character[24]));
-                if (character.length > 25 && Misc.isInt(character[25]))
+                if (character.length > 25 && StringUtils.isInt(character[25]))
                    skillsXp.put(SkillType.TAMING, Integer.valueOf(character[25]));
                if (character.length > 26)
                    skillsDATS.put(AbilityType.BERSERK, Integer.valueOf(character[26]));
@@ -384,18 +385,18 @@ public class PlayerProfile {
                        writer.append(skillsXp.get(SkillType.TAMING)).append(":");
                        // Need to store the DATS of abilities nao
                        // Berserk, Gigadrillbreaker, Tree Feller, Green Terra, Serrated Strikes, Skull Splitter, Super Breaker
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.BERSERK))).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.GIGA_DRILL_BREAKER))).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.TREE_FELLER))).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.GREEN_TERRA))).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.SERRATED_STRIKES))).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.SKULL_SPLIITER))).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.SUPER_BREAKER))).append(":");
+                        writer.append(skillsDATS.get(AbilityType.BERSERK)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.GIGA_DRILL_BREAKER)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.TREE_FELLER)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.GREEN_TERRA)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.SERRATED_STRIKES)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.SKULL_SPLIITER)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.SUPER_BREAKER)).append(":");
                        writer.append(hudType.toString()).append(":");
                        writer.append(skills.get(SkillType.FISHING)).append(":");
                        writer.append(skillsXp.get(SkillType.FISHING)).append(":");
-                        writer.append(String.valueOf(skillsDATS.get(AbilityType.BLAST_MINING))).append(":");
-                        writer.append(String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)).append(":");
+                        writer.append(skillsDATS.get(AbilityType.BLAST_MINING)).append(":");
+                        writer.append(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR).append(":");
                        writer.append("\r\n");
                    }
                }
--- a/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java
@@ -5,7 +5,7 @@ import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.Plugin;

-public class McMMOChatEvent extends Event implements Cancellable {
+public abstract class McMMOChatEvent extends Event implements Cancellable {
    private boolean cancelled;
    private Plugin plugin;
    private String sender;
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java
@@ -1,22 +1,25 @@
 package com.gmail.nossr50.events.experience;

 import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;

 import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.Users;

 /**
 * Generic event for mcMMO experience events.
 */
-public abstract class McMMOPlayerExperienceEvent extends PlayerEvent {
+public abstract class McMMOPlayerExperienceEvent extends PlayerEvent implements Cancellable {
+    private boolean cancelled;
    protected SkillType skill;
    protected int skillLevel;

    protected McMMOPlayerExperienceEvent(Player player, SkillType skill) {
        super(player);
        this.skill = skill;
-        this.skillLevel = skill.getSkillLevel(player);
+        this.skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(skill);
    }

    /**
@@ -44,4 +47,15 @@ public abstract class McMMOPlayerExperienceEvent extends PlayerEvent {
    public static HandlerList getHandlerList() {
        return handlers;
    }
+
+    /** Following are required for Cancellable **/
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java
@@ -12,7 +12,12 @@ public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {

    public McMMOPlayerLevelUpEvent(Player player, SkillType skill) {
        super(player, skill);
-        this.levelsGained = 1;    // Always 1 for now as we call in the loop where the levelups are calculated, could change later!
+        this.levelsGained = 1;
+    }
+
+    public McMMOPlayerLevelUpEvent(Player player, SkillType skill, int levelsGained) {
+        super(player, skill);
+        this.levelsGained = levelsGained;
    }

    /**
@@ -21,4 +26,11 @@ public class McMMOPlayerLevelUpEvent extends McMMOPlayerExperienceEvent {
    public int getLevelsGained() {
        return levelsGained;
    }
+
+    /**
+     * @param levelsGained int number of levels gained in this event
+     */
+    public void setLevelsGained(int levelsGained) {
+        this.levelsGained = levelsGained;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java
@@ -21,4 +21,11 @@ public class McMMOPlayerXpGainEvent extends McMMOPlayerExperienceEvent {
    public int getXpGained() {
        return xpGained;
    }
+
+    /**
+     * @param xpGained int amount of experience gained in this event
+     */
+    public void setXpGained(int xpGained) {
+        this.xpGained = xpGained;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java
@@ -5,6 +5,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;

 import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.Users;

 /**
 * Generic event for mcMMO skill handling.
@@ -16,7 +17,7 @@ public abstract class McMMOPlayerSkillEvent extends PlayerEvent {
    protected McMMOPlayerSkillEvent(Player player, SkillType skill) {
        super(player);
        this.skill = skill;
-        this.skillLevel = skill.getSkillLevel(player);
+        this.skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(skill);
    }

    /**
--- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -35,6 +35,7 @@ import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.Salvage;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
+import com.gmail.nossr50.skills.unarmed.Unarmed;
 import com.gmail.nossr50.skills.utilities.AbilityType;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
@@ -43,7 +44,6 @@ import com.gmail.nossr50.skills.woodcutting.Woodcutting;
 import com.gmail.nossr50.util.BlockChecks;
 import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class BlockListener implements Listener {
@@ -151,7 +151,7 @@ public class BlockListener implements Listener {
        /* HERBALISM */
        if (BlockChecks.canBeGreenTerra(block)) {
            /* Green Terra */
-            if (profile.getToolPreparationMode(ToolType.HOE) && Permissions.greenTerra(player)) {
+            if (profile.getToolPreparationMode(ToolType.HOE) && player.hasPermission("mcmmo.ability.herbalism.greenterra")) {
                SkillTools.abilityCheck(player, SkillType.HERBALISM);
            }

@@ -159,32 +159,40 @@ public class BlockListener implements Listener {
             * 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.herbalism(player)) {
-                Herbalism.herbalismProcCheck(block, mcMMOPlayer, event, plugin); //Double drops
+            if (player.hasPermission("mcmmo.skills.herbalism")) {
+                Herbalism.herbalismProcCheck(block, mcMMOPlayer, plugin); //Double drops

                if (profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
-                    Herbalism.herbalismProcCheck(block, mcMMOPlayer, event, plugin); //Triple drops
+                    Herbalism.herbalismProcCheck(block, mcMMOPlayer, plugin); //Triple drops
                }
            }
        }

        /* MINING */
-        else if (BlockChecks.canBeSuperBroken(block) && Permissions.mining(player) && !mcMMO.placeStore.isTrue(block)) {
+        else if (BlockChecks.canBeSuperBroken(block) && player.hasPermission("mcmmo.skills.mining") && !mcMMO.placeStore.isTrue(block)) {
            if (Mining.requiresTool) {
                if (ItemChecks.isPickaxe(heldItem)) {
                    MiningManager miningManager = new MiningManager(mcMMOPlayer);
                    miningManager.miningBlockCheck(block);
+
+                    if (profile.getAbilityMode(AbilityType.SUPER_BREAKER)) {
+                        miningManager.miningBlockCheck(block);
+                    }
                }
            }
            else {
                MiningManager miningManager = new MiningManager(mcMMOPlayer);
                miningManager.miningBlockCheck(block);
+
+                if (profile.getAbilityMode(AbilityType.SUPER_BREAKER)) {
+                    miningManager.miningBlockCheck(block);
+                }
            }
        }

        /* WOOD CUTTING */
-        else if (BlockChecks.isLog(block) && Permissions.woodcutting(player) && !mcMMO.placeStore.isTrue(block)) {
-            if (profile.getAbilityMode(AbilityType.TREE_FELLER) && Permissions.treeFeller(player) && ItemChecks.isAxe(heldItem)) {
+        else if (BlockChecks.isLog(block) && player.hasPermission("mcmmo.skills.woodcutting") && !mcMMO.placeStore.isTrue(block)) {
+            if (profile.getAbilityMode(AbilityType.TREE_FELLER) && player.hasPermission("mcmmo.ability.woodcutting.treefeller") && ItemChecks.isAxe(heldItem)) {
                Woodcutting.beginTreeFeller(mcMMOPlayer, block);
            }
            else {
@@ -200,14 +208,22 @@ public class BlockListener implements Listener {
        }

        /* EXCAVATION */
-        else if (BlockChecks.canBeGigaDrillBroken(block) && Permissions.excavation(player) && !mcMMO.placeStore.isTrue(block)) {
+        else if (BlockChecks.canBeGigaDrillBroken(block) && player.hasPermission("mcmmo.skills.excavation") && !mcMMO.placeStore.isTrue(block)) {
            if (Excavation.requiresTool) {
                if (ItemChecks.isShovel(heldItem)) {
                    Excavation.excavationProcCheck(block, mcMMOPlayer);
+
+                    if (profile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER)) {
+                        Excavation.gigaDrillBreaker(mcMMOPlayer, block);
+                    }
                }
            }
            else {
                Excavation.excavationProcCheck(block, mcMMOPlayer);
+
+                if (profile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER)) {
+                    Excavation.gigaDrillBreaker(mcMMOPlayer, block);
+                }
            }
        }

@@ -237,22 +253,22 @@ public class BlockListener implements Listener {
        Block block = event.getBlock();
        ItemStack heldItem = player.getItemInHand();

-        if (Permissions.hylianLuck(player) && ItemChecks.isSword(heldItem)) {
+        if (player.hasPermission("mcmmo.ability.herbalism.hylianluck") && ItemChecks.isSword(heldItem)) {
            Herbalism.hylianLuck(block, player, event);
        }
-        else if (BlockChecks.canBeFluxMined(block) && ItemChecks.isPickaxe(heldItem) && !heldItem.containsEnchantment(Enchantment.SILK_TOUCH) && Permissions.fluxMining(player) && !mcMMO.placeStore.isTrue(block)) {
+        else if (BlockChecks.canBeFluxMined(block) && ItemChecks.isPickaxe(heldItem) && !heldItem.containsEnchantment(Enchantment.SILK_TOUCH) && player.hasPermission("mcmmo.ability.smelting.fluxmining") && !mcMMO.placeStore.isTrue(block)) {
            SmeltingManager smeltingManager = new SmeltingManager(Users.getPlayer(player));
            smeltingManager.fluxMining(event);
        }
    }

    /**
-     * Handle BlockDamage events where the event is modified.
+     * Monitor BlockDamage events.
     *
-     * @param event The event to modify
+     * @param event The event to watch
     */
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockDamageHigher(BlockDamageEvent event) {
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onBlockDamage(BlockDamageEvent event) {
        if (event instanceof FakeBlockDamageEvent) {
            return;
        }
@@ -274,19 +290,19 @@ public class BlockListener implements Listener {
        if (BlockChecks.canActivateAbilities(block)) {
            ItemStack heldItem = player.getItemInHand();

-            if (profile.getToolPreparationMode(ToolType.HOE) && ItemChecks.isHoe(heldItem) && (BlockChecks.canBeGreenTerra(block) || BlockChecks.canMakeMossy(block)) && Permissions.greenTerra(player)) {
+            if (profile.getToolPreparationMode(ToolType.HOE) && ItemChecks.isHoe(heldItem) && (BlockChecks.canBeGreenTerra(block) || BlockChecks.canMakeMossy(block)) && player.hasPermission("mcmmo.ability.herbalism.greenterra")) {
                SkillTools.abilityCheck(player, SkillType.HERBALISM);
            }
-            else if (profile.getToolPreparationMode(ToolType.AXE) && ItemChecks.isAxe(heldItem) && BlockChecks.isLog(block) && Permissions.treeFeller(player)) {
+            else if (profile.getToolPreparationMode(ToolType.AXE) && ItemChecks.isAxe(heldItem) && BlockChecks.isLog(block) && player.hasPermission("mcmmo.ability.woodcutting.treefeller")) {
                SkillTools.abilityCheck(player, SkillType.WOODCUTTING);
            }
-            else if (profile.getToolPreparationMode(ToolType.PICKAXE) && ItemChecks.isPickaxe(heldItem) && BlockChecks.canBeSuperBroken(block) && Permissions.superBreaker(player)) {
+            else if (profile.getToolPreparationMode(ToolType.PICKAXE) && ItemChecks.isPickaxe(heldItem) && BlockChecks.canBeSuperBroken(block) && player.hasPermission("mcmmo.ability.mining.superbreaker")) {
                SkillTools.abilityCheck(player, SkillType.MINING);
            }
-            else if (profile.getToolPreparationMode(ToolType.SHOVEL) && ItemChecks.isShovel(heldItem) && BlockChecks.canBeGigaDrillBroken(block) && Permissions.gigaDrillBreaker(player)) {
+            else if (profile.getToolPreparationMode(ToolType.SHOVEL) && ItemChecks.isShovel(heldItem) && BlockChecks.canBeGigaDrillBroken(block) && player.hasPermission("mcmmo.ability.excavation.gigadrillbreaker")) {
                SkillTools.abilityCheck(player, SkillType.EXCAVATION);
            }
-            else if (profile.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockChecks.canBeGigaDrillBroken(block) || block.getType() == Material.SNOW) && Permissions.berserk(player)) {
+            else if (profile.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockChecks.canBeGigaDrillBroken(block) || block.getType() == Material.SNOW || (block.getType() == Material.SMOOTH_BRICK && block.getData() == 0x0)) && player.hasPermission("mcmmo.ability.unarmed.berserk")) {
                SkillTools.abilityCheck(player, SkillType.UNARMED);
            }
        }
@@ -302,12 +318,12 @@ public class BlockListener implements Listener {
    }

    /**
-     * Monitor BlockDamage events.
+     * Handle BlockDamage events where the event is modified.
     *
-     * @param event The event to watch
+     * @param event The event to modify
     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onBlockDamage(BlockDamageEvent event) {
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockDamageHigher(BlockDamageEvent event) {
        if (event instanceof FakeBlockDamageEvent) {
            return;
        }
@@ -328,43 +344,23 @@ public class BlockListener implements Listener {
         *
         * We don't need to check permissions here because they've already been checked for the ability to even activate.
         */
-        if (profile.getAbilityMode(AbilityType.GREEN_TERRA) && BlockChecks.canMakeMossy(block)) {
+        // Except right here, which is for the Green Thumb activation, not the normal effect of Green Terra
+        if (profile.getAbilityMode(AbilityType.GREEN_TERRA) && BlockChecks.canMakeMossy(block) && player.hasPermission("mcmmo.ability.herbalism.greenthumbblocks")) {
            Herbalism.greenTerra(player, block);
        }
-        else if (profile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) && SkillTools.triggerCheck(player, block, AbilityType.GIGA_DRILL_BREAKER)) {
-            if (Excavation.requiresTool) {
-                if (ItemChecks.isShovel(heldItem)) {
+        else if (profile.getAbilityMode(AbilityType.BERSERK)) {
+            if (SkillTools.triggerCheck(player, block, AbilityType.BERSERK)) {
+                if (heldItem.getType() == Material.AIR) {
+                    FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
+                    plugin.getServer().getPluginManager().callEvent(armswing);
+
                    event.setInstaBreak(true);
-                    Excavation.gigaDrillBreaker(mcMMOPlayer, block);
+                    player.playSound(block.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.POP_PITCH);
                }
            }
-            else {
-                event.setInstaBreak(true);
-                Excavation.gigaDrillBreaker(mcMMOPlayer, block);
-            }
-        }
-        else if (profile.getAbilityMode(AbilityType.BERSERK) && SkillTools.triggerCheck(player, block, AbilityType.BERSERK)) {
-            if (heldItem.getType() == Material.AIR) {
-                FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
-                plugin.getServer().getPluginManager().callEvent(armswing);
-
-                event.setInstaBreak(true);
-            }
-
-            player.playSound(block.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.POP_PITCH);
-        }
-        else if (profile.getAbilityMode(AbilityType.SUPER_BREAKER) && SkillTools.triggerCheck(player, block, AbilityType.SUPER_BREAKER)) {
-            MiningManager miningManager = new MiningManager(mcMMOPlayer);
-
-            if (Mining.requiresTool) {
-                if (ItemChecks.isPickaxe(heldItem)) {
-                    event.setInstaBreak(true);
-                    miningManager.superBreakerBlockCheck(block);
-                }
-            }
-            else {
-                event.setInstaBreak(true);
-                miningManager.superBreakerBlockCheck(block);
+            // Another perm check for the cracked blocks activation
+            else if (BlockChecks.canBeCracked(block) && player.hasPermission("mcmmo.ability.unarmed.blockcracker")) {
+                Unarmed.blockCracker(player, block);
            }
        }
        else if ((profile.getSkillLevel(SkillType.WOODCUTTING) >= AdvancedConfig.getInstance().getLeafBlowUnlockLevel()) && BlockChecks.isLeaves(block)) {
--- a/src/main/java/com/gmail/nossr50/listeners/HardcoreListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/HardcoreListener.java
@@ -1,37 +0,0 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-
-import com.gmail.nossr50.util.Hardcore;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-
-public class HardcoreListener implements Listener {
-    /**
-     * Monitor PlayerDeath events.
-     *
-     * @param event The event to watch
-     */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerDeath(PlayerDeathEvent event) {
-        Player player = event.getEntity();
-
-        if (Misc.isNPCPlayer(player)) {
-            return;
-        }
-
-        if (!Permissions.hardcoremodeBypass(player)) {
-            Player killer = player.getKiller();
-
-            if (killer != null && Hardcore.vampirismEnabled) {
-                Hardcore.invokeVampirism(killer, player);
-            }
-
-            Hardcore.invokeStatPenalty(player);
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
@@ -10,6 +10,7 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.FurnaceBurnEvent;
 import org.bukkit.event.inventory.FurnaceExtractEvent;
 import org.bukkit.event.inventory.FurnaceSmeltEvent;
+import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.inventory.InventoryType;
@@ -19,6 +20,7 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.skills.smelting.SmeltingManager;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Users;

@@ -128,4 +130,10 @@ public class InventoryListener implements Listener{
            }
        }
    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInventoryClickEvent(InventoryClickEvent event) {
+        ItemStack item = event.getCurrentItem();
+        SkillTools.removeAbilityBuff(item); //Remove enchants if they try to move them in an inventory
+    }
 }
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -3,17 +3,21 @@ package com.gmail.nossr50.listeners;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerChangedWorldEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerFishEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerPickupItemEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.inventory.ItemStack;
@@ -26,6 +30,7 @@ import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.skills.fishing.Fishing;
 import com.gmail.nossr50.skills.herbalism.Herbalism;
 import com.gmail.nossr50.skills.mining.BlastMining;
@@ -34,11 +39,15 @@ import com.gmail.nossr50.skills.repair.Repair;
 import com.gmail.nossr50.skills.repair.Salvage;
 import com.gmail.nossr50.skills.runnables.BleedTimer;
 import com.gmail.nossr50.skills.taming.TamingManager;
+import com.gmail.nossr50.skills.utilities.AbilityType;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.BlockChecks;
-import com.gmail.nossr50.util.Motd;
+import com.gmail.nossr50.util.ChimaeraWing;
+import com.gmail.nossr50.util.Hardcore;
+import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

@@ -49,6 +58,56 @@ public class PlayerListener implements Listener {
        this.plugin = plugin;
    }

+    /**
+     * Handle PlayerDeath events where the event is modified.
+     *
+     * @param event The event to modify
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerDeathHigher(PlayerDeathEvent event) {
+        Player player = event.getEntity();
+
+        if (Misc.isNPCPlayer(player)) {
+            return;
+        }
+
+        PlayerProfile playerProfile = Users.getPlayer(player).getProfile();
+
+        if (playerProfile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) || playerProfile.getAbilityMode(AbilityType.SUPER_BREAKER)) {
+            for (ItemStack item : event.getDrops()) {
+                SkillTools.removeAbilityBuff(item);
+            }
+        }
+    }
+
+    /**
+     * Monitor PlayerDeath events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerDeath(PlayerDeathEvent event) {
+        if (!Config.getInstance().getHardcoreEnabled()) {
+            return;
+        }
+
+        Player player = event.getEntity();
+
+        if (Misc.isNPCPlayer(player)) {
+            return;
+        }
+
+        if (!Permissions.hardcoremodeBypass(player)) {
+            Player killer = player.getKiller();
+
+            if (killer != null && Config.getInstance().getHardcoreVampirismEnabled()) {
+                Hardcore.invokeVampirism(killer, player);
+            }
+
+            Hardcore.invokeStatPenalty(player);
+        }
+    }
+
    /**
     * Monitor PlayerChangedWorld events.
     *
@@ -76,6 +135,21 @@ public class PlayerListener implements Listener {
        }
    }

+    /**
+     * Handle PlayerDropItem events that involve modifying the event.
+     *
+     * @param event The event to modify
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerDropItemEvent(PlayerDropItemEvent event) {
+        Player player = event.getPlayer();
+        PlayerProfile playerProfile = Users.getPlayer(player).getProfile();
+
+        if (playerProfile.getAbilityMode(AbilityType.GIGA_DRILL_BREAKER) || playerProfile.getAbilityMode(AbilityType.SUPER_BREAKER)) {
+            event.setCancelled(true);
+        }
+    }
+
    /**
     * Monitor PlayerFish events.
     *
@@ -110,6 +184,27 @@ public class PlayerListener implements Listener {
        }
    }

+    /**
+     * Monitor PlayerPickupItem events.
+     *
+     * @param event The event to watch
+     */
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerPickupItem(PlayerPickupItemEvent event) {
+        Player player = event.getPlayer();
+        Item item = event.getItem();
+
+        if (Misc.isNPCPlayer(player)) {
+            return;
+        }
+
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+
+        if (mcMMOPlayer.inParty() && ItemChecks.isShareable(item.getItemStack())) {
+            ShareHandler.handleItemShare(event, mcMMOPlayer);
+        }
+    }
+
    /**
     * Monitor PlayerQuit events.
     *
@@ -150,6 +245,8 @@ public class PlayerListener implements Listener {
        if (plugin.isXPEventEnabled()) {
            player.sendMessage(LocaleLoader.getString("XPRate.Event", Config.getInstance().getExperienceGainsGlobalMultiplier()));
        }
+
+        SkillTools.handleAbilitySpeedDecrease(player); //Remove enchants left over in case of disconnect or server crash
    }

    /**
@@ -254,6 +351,8 @@ public class PlayerListener implements Listener {
                    SkillTools.activationCheck(player, SkillType.UNARMED);
                    SkillTools.activationCheck(player, SkillType.WOODCUTTING);
                }
+
+                ChimaeraWing.activationCheck(player);
            }

            /* GREEN THUMB CHECK */
@@ -276,6 +375,9 @@ public class PlayerListener implements Listener {
                SkillTools.activationCheck(player, SkillType.WOODCUTTING);
            }

+            /* ITEM CHECKS */
+            ChimaeraWing.activationCheck(player);
+
            break;

        case LEFT_CLICK_AIR:
@@ -346,16 +448,17 @@ public class PlayerListener implements Listener {
            String command = message.substring(1).split(" ")[0];
            String lowerCaseCommand = command.toLowerCase();

+            // Do these ACTUALLY have to be lower case to work properly?
            for (SkillType skill : SkillType.values()) {
-                String commandName = skill.toString().toLowerCase();
-                String localizedName = LocaleLoader.getString(Misc.getCapitalized(commandName) + ".SkillName").toLowerCase();
+                String skillName = skill.toString().toLowerCase();
+                String localizedName = SkillTools.getSkillName(skill).toLowerCase();

                if (lowerCaseCommand.equals(localizedName)) {
+                    event.setMessage(message.replace(command, skillName));
                    break;
                }

-                if (lowerCaseCommand.equals(commandName)) {
-                    event.setMessage(message.replace(command, localizedName));
+                if (lowerCaseCommand.equals(skillName)) {
                    break;
                }
            }
--- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
@@ -1,8 +1,10 @@
 package com.gmail.nossr50.listeners;

 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;

 /**
@@ -14,7 +16,7 @@ public class SelfListener implements Listener {
     *
     * @param event The event to watch
     */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
        int xp = event.getXpGained();

@@ -23,7 +25,7 @@ public class SelfListener implements Listener {
                throw new Exception("Gained negative XP!");
            }
            catch (Exception e) {
-                System.out.println(e.getMessage());
+                mcMMO.p.getLogger().severe(e.getMessage());
                e.printStackTrace();
            }
        }
--- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
+++ b/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java
@@ -12,6 +12,7 @@ import com.gmail.nossr50.config.Config;
 public final class LocaleLoader {
    private static final String BUNDLE_ROOT = "com.gmail.nossr50.locale.locale";
    private static ResourceBundle bundle = null;
+    private static ResourceBundle enBundle = null;

    private LocaleLoader() {};

@@ -32,21 +33,30 @@ public final class LocaleLoader {
        }

        try {
-            String output = bundle.getString(key);
-
-            if (messageArguments != null) {
-                MessageFormat formatter = new MessageFormat("");
-                formatter.applyPattern(output);
-                output = formatter.format(messageArguments);
+            return getString(key, bundle, messageArguments);
+        }
+        catch (MissingResourceException ex) {
+            try {
+                return getString(key, enBundle, messageArguments);
+            }
+            catch (MissingResourceException ex2) {
+                return '!' + key + '!';
            }
-
-            output = addColors(output);
-
-            return output;
        }
-        catch (MissingResourceException e) {
-            return '!' + key + '!';
+    }
+
+    private static String getString(String key, ResourceBundle bundle, Object ... messageArguments) throws MissingResourceException {
+        String output = bundle.getString(key);
+
+        if (messageArguments != null) {
+            MessageFormat formatter = new MessageFormat("");
+            formatter.applyPattern(output);
+            output = formatter.format(messageArguments);
        }
+
+        output = addColors(output);
+
+        return output;
    }

    public static Locale getCurrentLocale() {
@@ -70,6 +80,7 @@ public final class LocaleLoader {
            }

            bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale);
+            enBundle = ResourceBundle.getBundle(BUNDLE_ROOT, Locale.US);
        }
    }

--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -1,13 +1,10 @@
 package com.gmail.nossr50;

-import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;

 import net.shatteredlands.shatt.backup.ZipLibrary;

@@ -17,13 +14,11 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.mcstats.Metrics;
-import org.mcstats.Metrics.Graph;

 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
+import com.gmail.nossr50.util.metrics.MetricsManager;
 import com.gmail.nossr50.commands.CommandRegistrationHelper;
-import com.gmail.nossr50.commands.player.MccCommand;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
@@ -34,17 +29,16 @@ import com.gmail.nossr50.database.runnables.UserPurgeTask;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.listeners.BlockListener;
 import com.gmail.nossr50.listeners.EntityListener;
-import com.gmail.nossr50.listeners.HardcoreListener;
 import com.gmail.nossr50.listeners.InventoryListener;
 import com.gmail.nossr50.listeners.PlayerListener;
 import com.gmail.nossr50.listeners.WorldListener;
-import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mods.config.CustomArmorConfig;
 import com.gmail.nossr50.mods.config.CustomBlocksConfig;
 import com.gmail.nossr50.mods.config.CustomEntityConfig;
 import com.gmail.nossr50.mods.config.CustomToolsConfig;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.commands.PtpCommand;
+import com.gmail.nossr50.party.runnables.PartiesLoader;
+import com.gmail.nossr50.party.runnables.PartyAutoKick;
 import com.gmail.nossr50.runnables.MobStoreCleaner;
 import com.gmail.nossr50.runnables.SaveTimer;
 import com.gmail.nossr50.skills.repair.RepairManager;
@@ -52,7 +46,6 @@ import com.gmail.nossr50.skills.repair.RepairManagerFactory;
 import com.gmail.nossr50.skills.repair.Repairable;
 import com.gmail.nossr50.skills.repair.config.RepairConfigManager;
 import com.gmail.nossr50.skills.runnables.BleedTimer;
-import com.gmail.nossr50.skills.runnables.PartyAutoKick;
 import com.gmail.nossr50.skills.runnables.SkillMonitor;
 import com.gmail.nossr50.spout.SpoutConfig;
 import com.gmail.nossr50.spout.SpoutTools;
@@ -64,7 +57,6 @@ public class mcMMO extends JavaPlugin {
    private final EntityListener entityListener = new EntityListener(this);
    private final InventoryListener inventoryListener = new InventoryListener(this);
    private final WorldListener worldListener = new WorldListener();
-    private final HardcoreListener hardcoreListener = new HardcoreListener();

    private HashMap<Integer, String> tntTracker = new HashMap<Integer, String>();
    private HashMap<Block, String> furnaceTracker = new HashMap<Block, String>();
@@ -123,7 +115,8 @@ public class mcMMO extends JavaPlugin {

        scheduleTasks();
        registerCommands();
-        setupMetrics();
+
+        MetricsManager.setup();

        placeStore = ChunkManagerFactory.getChunkManager(); // Get our ChunkletManager

@@ -189,12 +182,14 @@ public class mcMMO extends JavaPlugin {
        placeStore.saveAll(); // Save our metadata
        placeStore.cleanUp(); // Cleanup empty metadata stores

-        // Remove other tasks BEFORE starting the Backup, or we just cancel it straight away.
-        try {
-            ZipLibrary.mcMMObackup();
-        }
-        catch (IOException e) {
-            getLogger().severe(e.toString());
+        if (Config.getInstance().getBackupsEnabled()) {
+            // Remove other tasks BEFORE starting the Backup, or we just cancel it straight away.
+            try {
+                ZipLibrary.mcMMObackup();
+            }
+            catch (IOException e) {
+                getLogger().severe(e.toString());
+            }
        }

        getLogger().info("Was disabled."); //How informative!
@@ -206,7 +201,8 @@ public class mcMMO extends JavaPlugin {
        TreasuresConfig.getInstance();
        HiddenConfig.getInstance();
        AdvancedConfig.getInstance();
-        PartyManager.loadParties();
+
+        

        List<Repairable> repairables = new ArrayList<Repairable>();

@@ -260,10 +256,6 @@ public class mcMMO extends JavaPlugin {
        pluginManager.registerEvents(entityListener, this);
        pluginManager.registerEvents(inventoryListener, this);
        pluginManager.registerEvents(worldListener, this);
-
-        if (Config.getInstance().getHardcoreEnabled()) {
-            pluginManager.registerEvents(hardcoreListener, this);
-        }
    }

    /**
@@ -276,7 +268,6 @@ public class mcMMO extends JavaPlugin {
        CommandRegistrationHelper.registerMcpurgeCommand();
        CommandRegistrationHelper.registerMcremoveCommand();
        CommandRegistrationHelper.registerMcabilityCommand();
-        getCommand("mcc").setExecutor(new MccCommand());
        CommandRegistrationHelper.registerMcgodCommand();
        CommandRegistrationHelper.registerMcmmoCommand();
        CommandRegistrationHelper.registerMcrefreshCommand();
@@ -288,7 +279,7 @@ public class mcMMO extends JavaPlugin {
        CommandRegistrationHelper.registerAdminChatCommand();
        CommandRegistrationHelper.registerPartyCommand();
        CommandRegistrationHelper.registerPartyChatCommand();
-        getCommand("ptp").setExecutor(new PtpCommand(this));
+        CommandRegistrationHelper.registerPtpCommand();

        // Other commands
        CommandRegistrationHelper.registerAddxpCommand();
@@ -298,6 +289,8 @@ public class mcMMO extends JavaPlugin {
        CommandRegistrationHelper.registerXprateCommand();
        CommandRegistrationHelper.registerMmoupdateCommand();
        CommandRegistrationHelper.registerSkillresetCommand();
+        CommandRegistrationHelper.registerHardcoreCommand();
+        CommandRegistrationHelper.registerVampirismCommand();

        // Spout commands
        CommandRegistrationHelper.registerXplockCommand();
@@ -307,12 +300,17 @@ public class mcMMO extends JavaPlugin {
    private void scheduleTasks() {
        BukkitScheduler scheduler = getServer().getScheduler();

+        // Parties are loaded at the end of first server tick otherwise Server.getOfflinePlayer throws an IndexOutOfBoundsException
+        scheduler.scheduleSyncDelayedTask(this, new PartiesLoader(), 0);
+
        // Periodic save timer (Saves every 10 minutes by default)
-        scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(), 0, Config.getInstance().getSaveInterval() * 1200L);
+        long saveIntervalTicks = Config.getInstance().getSaveInterval() * 1200;
+
+        scheduler.scheduleSyncRepeatingTask(this, new SaveTimer(), saveIntervalTicks, saveIntervalTicks);
        // Regen & Cooldown timer (Runs every second)
-        scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(), 0, 20);
+        scheduler.scheduleSyncRepeatingTask(this, new SkillMonitor(), 20, 20);
        // Bleed timer (Runs every two seconds)
-        scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 0, 40);
+        scheduler.scheduleSyncRepeatingTask(this, new BleedTimer(), 40, 40);

        // Old & Powerless User remover
        int purgeInterval = Config.getInstance().getPurgeInterval();
@@ -321,7 +319,9 @@ public class mcMMO extends JavaPlugin {
            scheduler.scheduleSyncDelayedTask(this, new UserPurgeTask(), 40); // Start 2 seconds after startup.
        }
        else if (purgeInterval > 0) {
-            scheduler.scheduleSyncRepeatingTask(this, new UserPurgeTask(), 0, purgeInterval * 60L * 60L * 20L);
+            long purgeIntervalTicks = purgeInterval * 60 * 60 * 20;
+
+            scheduler.scheduleSyncRepeatingTask(this, new UserPurgeTask(), purgeIntervalTicks, purgeIntervalTicks);
        }

        // Automatically remove old members from parties
@@ -331,158 +331,12 @@ public class mcMMO extends JavaPlugin {
            scheduler.scheduleSyncDelayedTask(this, new PartyAutoKick(), 40); // Start 2 seconds after startup.
        }
        else if (kickInterval > 0) {
-            scheduler.scheduleSyncRepeatingTask(this, new PartyAutoKick(), 0, kickInterval * 60L * 60L * 20L);
+            long kickIntervalTicks = kickInterval * 60 * 60 * 20;
+
+            scheduler.scheduleSyncRepeatingTask(this, new PartyAutoKick(), kickIntervalTicks, kickIntervalTicks);
        }
    }

-    private void setupMetrics() {
-        if (Config.getInstance().getStatsTrackingEnabled()) {
-            try {
-                Metrics metrics = new Metrics(this);
-
-                // Timings Graph
-                Graph timingsGraph = metrics.createGraph("Percentage of servers using timings");
-
-                if (getServer().getPluginManager().useTimings()) {
-                    timingsGraph.addPlotter(new Metrics.Plotter("Enabled") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-                else {
-                    timingsGraph.addPlotter(new Metrics.Plotter("Disabled") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-
-                // Donut Version Graph
-                Graph versionDonutGraph = metrics.createGraph("Donut Version");
-
-                boolean haveVersionInformation = false;
-                boolean isOfficialBuild = false;
-                String officialKey = "e14cfacdd442a953343ebd8529138680";
-
-                String version = getDescription().getVersion();
-
-                InputStreamReader isr = new InputStreamReader(getResource(".jenkins"));
-                BufferedReader br = new BufferedReader(isr);
-                char[] key = new char[32];
-                br.read(key);
-                if (officialKey.equals(String.valueOf(key))) {
-                    isOfficialBuild = true;
-                }
-
-                if (version.contains("-")) {
-                    String majorVersion = version.substring(0, version.indexOf("-"));
-                    String subVersion = "";
-                    if (isOfficialBuild) {
-                        int startIndex = version.indexOf("-");
-                        if (version.substring(startIndex + 1).contains("-")) {
-                            subVersion = version.substring(startIndex, version.indexOf("-", startIndex + 1));
-                        } else {
-                            subVersion = "-release";
-                        }
-                    } else {
-                        subVersion = "-custom";
-                    }
-
-                    version = majorVersion + "~=~" + subVersion;
-                    haveVersionInformation = true;
-                } else {
-                    haveVersionInformation = false;
-                }
-
-                if (haveVersionInformation) {
-                    versionDonutGraph.addPlotter(new Metrics.Plotter(version) {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-
-                // Official v Custom build Graph
-                Graph officialGraph = metrics.createGraph("Built by official ci");
-
-                if (isOfficialBuild) {
-                    officialGraph.addPlotter(new Metrics.Plotter("Yes") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-                else {
-                    officialGraph.addPlotter(new Metrics.Plotter("No") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-
-                // Chunkmeta enabled Graph
-                Graph chunkmetaGraph = metrics.createGraph("Uses Chunkmeta");
-
-                if (HiddenConfig.getInstance().getChunkletsEnabled()) {
-                    chunkmetaGraph.addPlotter(new Metrics.Plotter("Yes") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-                else {
-                    chunkmetaGraph.addPlotter(new Metrics.Plotter("No") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-
-                // Storage method Graph
-                Graph storageGraph = metrics.createGraph("Storage method");
-
-                if (Config.getInstance().getUseMySQL()) {
-                    storageGraph.addPlotter(new Metrics.Plotter("SQL") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-                else {
-                    storageGraph.addPlotter(new Metrics.Plotter("Flatfile") {
-                        @Override
-                        public int getValue() {
-                            return 1;
-                        }
-                    });
-                }
-
-                // Locale Graph
-                Graph localeGraph = metrics.createGraph("Locale");
-
-                localeGraph.addPlotter(new Metrics.Plotter(LocaleLoader.getCurrentLocale().getDisplayLanguage(Locale.US)) {
-                    @Override
-                    public int getValue() {
-                        return 1;
-                    }
-                });
-
-                metrics.start();
-            }
-            catch (IOException e) {
-                System.out.println("Failed to submit stats.");
-            }
-        }
-    }
    /**
     * Add a set of values to the TNT tracker.
     *
--- a/src/main/java/com/gmail/nossr50/mods/config/CustomEntityConfig.java
+++ b/src/main/java/com/gmail/nossr50/mods/config/CustomEntityConfig.java
@@ -54,11 +54,11 @@ public class CustomEntityConfig extends ConfigLoader {
            EntityType type = EntityType.fromId(id);
            double xpMultiplier = config.getDouble(entityType + "." + entityName + ".XP_Multiplier", 1.0D);
            boolean canBeTamed = config.getBoolean(entityType + "." + entityName + ".Tameable", false);
-            int tamingXp = config.getInt(entityType + "." + entityName + ".Tameable.Taming_XP", 0);
-            boolean canBeSummoned = config.getBoolean(entityType + "." + entityName + ".Tameable.CanBeSummoned", false);
-            int callOfTheWildId = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_ID", 0);
-            int callOfTheWildData = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_Data", 0);
-            int callOfTheWildAmount = config.getInt(entityType + "." + entityName + ".Tameable.COTW_Material_Amount", 0);
+            int tamingXp = config.getInt(entityType + "." + entityName + "Taming_XP", 0);
+            boolean canBeSummoned = config.getBoolean(entityType + "." + entityName + "CanBeSummoned", false);
+            int callOfTheWildId = config.getInt(entityType + "." + entityName + "COTW_Material_ID", 0);
+            int callOfTheWildData = config.getInt(entityType + "." + entityName + "COTW_Material_Data", 0);
+            int callOfTheWildAmount = config.getInt(entityType + "." + entityName + "COTW_Material_Amount", 0);

            CustomEntity entity;

--- a/src/main/java/com/gmail/nossr50/party/Party.java
+++ b/src/main/java/com/gmail/nossr50/party/Party.java
@@ -3,29 +3,28 @@ package com.gmail.nossr50.party;
 import java.util.ArrayList;
 import java.util.List;

+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;

-import com.gmail.nossr50.mcMMO;
-
 public class Party {
-    private List<String> members = new ArrayList<String>();
+    private List<OfflinePlayer> members = new ArrayList<OfflinePlayer>();
    private String leader;
    private String name;
    private String password;
    private boolean locked;
-    private ShareHandler.XpShareMode xpShareMode;
+    private ShareHandler.ShareMode xpShareMode = ShareHandler.ShareMode.NONE;
+    private ShareHandler.ShareMode itemShareMode = ShareHandler.ShareMode.NONE;

-    public List<String> getMembers() {
+    public List<OfflinePlayer> getMembers() {
        return members;
    }

    public List<Player> getOnlineMembers() {
-        Player[] onlinePlayers = mcMMO.p.getServer().getOnlinePlayers();
        List<Player> onlineMembers = new ArrayList<Player>();

-        for (Player onlinePlayer : onlinePlayers) {
-            if (members.contains(onlinePlayer.getName())) {
-                onlineMembers.add(onlinePlayer);
+        for (OfflinePlayer member : members) {
+            if (member.isOnline()) {
+                onlineMembers.add(member.getPlayer());
            }
        }

@@ -64,11 +63,19 @@ public class Party {
        this.locked = locked;
    }

-    public void setXpShareMode(ShareHandler.XpShareMode xpShareMode) {
+    public void setXpShareMode(ShareHandler.ShareMode xpShareMode) {
        this.xpShareMode = xpShareMode;
    }

-    public ShareHandler.XpShareMode getXpShareMode() {
+    public ShareHandler.ShareMode getXpShareMode() {
        return xpShareMode;
    }
+
+    public void setItemShareMode(ShareHandler.ShareMode itemShareMode) {
+        this.itemShareMode = itemShareMode;
+    }
+
+    public ShareHandler.ShareMode getItemShareMode() {
+        return itemShareMode;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/party/PartyManager.java
+++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java
@@ -4,6 +4,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;

@@ -21,8 +23,23 @@ public final class PartyManager {

    private PartyManager() {}

+    public static boolean changeOrJoinParty(McMMOPlayer mcMMOPlayer, Player player, Party oldParty, String newPartyName) {
+        if (mcMMOPlayer.inParty()) {
+            if (!handlePartyChangeEvent(player, oldParty.getName(), newPartyName, EventReason.CHANGED_PARTIES)) {
+                return false;
+            }
+
+            removeFromParty(player, oldParty);
+        }
+        else if (!handlePartyChangeEvent(player, null, newPartyName, EventReason.JOINED_PARTY)) {
+            return false;
+        }
+
+        return true;
+    }
+
    /**
-     * Check if two players are in the same party.
+     * Check if two online players are in the same party.
     *
     * @param firstPlayer The first player
     * @param secondPlayer The second player
@@ -68,13 +85,13 @@ public final class PartyManager {
    /**
     * Notify party members when a player joins
     * 
-     * @param playerName The name of the player that joins
+     * @param player The player that joins
     * @param party The concerned party
     */
-    private static void informPartyMembersJoin(String playerName, Party party) {
+    private static void informPartyMembersJoin(OfflinePlayer player, Party party) {
        for (Player member : party.getOnlineMembers()) {
-            if (!member.getName().equals(playerName)) {
-                member.sendMessage(LocaleLoader.getString("Party.InformedOnJoin", playerName));
+            if (!member.equals(player)) {
+                member.sendMessage(LocaleLoader.getString("Party.InformedOnJoin", player.getName()));
            }
        }
    }
@@ -82,13 +99,13 @@ public final class PartyManager {
    /**
     * Notify party members when a party member quits.
     *
-     * @param playerName The name of the player that quits
+     * @param player The player that quits
     * @param party The concerned party
     */
-    private static void informPartyMembersQuit(String playerName, Party party) {
+    private static void informPartyMembersQuit(OfflinePlayer player, Party party) {
        for (Player member : party.getOnlineMembers()) {
-            if (!member.getName().equals(playerName)) {
-                member.sendMessage(LocaleLoader.getString("Party.InformedOnQuit", playerName));
+            if (!member.equals(player)) {
+                member.sendMessage(LocaleLoader.getString("Party.InformedOnQuit", player.getName()));
            }
        }
    }
@@ -99,7 +116,7 @@ public final class PartyManager {
     * @param player The player to check
     * @return all the players in the player's party
     */
-    public static List<String> getAllMembers(Player player) {
+    public static List<OfflinePlayer> getAllMembers(Player player) {
        Party party = Users.getPlayer(player).getParty();

        if (party == null) {
@@ -159,10 +176,13 @@ public final class PartyManager {
     */
    public static Party getPlayerParty(String playerName) {
        for (Party party : parties) {
-            if (party.getMembers().contains(playerName)) {
-                return party;
+            for (OfflinePlayer member : party.getMembers()) {
+                if (member.getName().equals(playerName)) {
+                    return party;
+                }
            }
        }
+
        return null;
    }

@@ -178,28 +198,28 @@ public final class PartyManager {
    /**
     * Remove a player from a party.
     *
-     * @param playerName The name of the player to remove
+     * @param player The player to remove
     * @param party The party
     */
-    public static void removeFromParty(String playerName, Party party) {
-        List<String> members = party.getMembers();
+    public static void removeFromParty(OfflinePlayer player, Party party) {
+        List<OfflinePlayer> members = party.getMembers();

-        members.remove(playerName);
+        members.remove(player);

        if (members.isEmpty()) {
            parties.remove(party);
        }
        else {
            //If the leaving player was the party leader, appoint a new leader from the party members
-            if (party.getLeader().equals(playerName)) {
-                    String newLeader = members.get(0);
-                    party.setLeader(newLeader);
+            if (party.getLeader().equals(player.getName())) {
+                String newLeader = members.get(0).getName();
+                party.setLeader(newLeader);
            }

-            informPartyMembersQuit(playerName, party);
+            informPartyMembersQuit(player, party);
        }

-        McMMOPlayer mcMMOPlayer = Users.getPlayer(playerName);
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player.getName());
 
        if (mcMMOPlayer != null) {
            mcMMOPlayer.removeParty();
@@ -212,11 +232,10 @@ public final class PartyManager {
     * @param party The party to remove
     */
    public static void disbandParty(Party party) {
-        List<String> members = party.getMembers();
+        List<OfflinePlayer> members = party.getMembers();

-        for (String member : party.getMembers()) {
-
-            McMMOPlayer mcMMOPlayer = Users.getPlayer(member);
+        for (OfflinePlayer member : members) {
+            McMMOPlayer mcMMOPlayer = Users.getPlayer(member.getName());

            if (mcMMOPlayer != null) {
                mcMMOPlayer.removeParty();
@@ -224,9 +243,7 @@ public final class PartyManager {
        }

        members.clear();
-        if (members.isEmpty()) {
-            parties.remove(party);
-        }
+        parties.remove(party);
    }

    /**
@@ -240,21 +257,19 @@ public final class PartyManager {
    public static void createParty(Player player, McMMOPlayer mcMMOPlayer, String partyName, String password) {
        partyName = partyName.replace(".", "");
        Party party = getParty(partyName);
-        String playerName = player.getName();

        if (party == null) {
            party = new Party();

            party.setName(partyName);
-            party.setLeader(playerName);
-            party.setXpShareMode(ShareHandler.XpShareMode.NONE);
-            party.setLocked(true);//Parties are now invite-only by default, can be set to open with /party unlock
+            party.setLeader(player.getName());
+            party.setLocked(true); // Parties are now invite-only by default, can be set to open with /party unlock

            if (password != null) {
                party.setPassword(password);
-                party.setLocked(true);
                player.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
            }
+
            parties.add(party);
        }
        else {
@@ -263,7 +278,7 @@ public final class PartyManager {
        }

        player.sendMessage(LocaleLoader.getString("Commands.Party.Create", party.getName()));
-        addToParty(player.getName(), mcMMOPlayer, party);
+        addToParty(player, mcMMOPlayer, party);
    }

    /**
@@ -271,33 +286,16 @@ public final class PartyManager {
     *
     * @param player The player to add to the party
     * @param mcMMOPlayer The player to add to the party
-     * @param partyName The party to add the player to
+     * @param party The party to add the player to
     * @param password the password for this party, null if there was no password
     */
-    public static void joinParty(Player player, McMMOPlayer mcMMOPlayer, String partyName, String password) {
-        partyName = partyName.replace(".", "");
-        Party party = getParty(partyName);
-        String playerName = player.getName();
-
-        if (party == null) {
-            party = new Party();
-
-            party.setName(partyName);
-            party.setLeader(playerName);
-
-            if (password != null) {
-                party.setPassword(password);
-                party.setLocked(true);
-            }
-
-            parties.add(party);
-        }
-        else if (!checkPartyPassword(player, party, password)) {
+    public static void joinParty(Player player, McMMOPlayer mcMMOPlayer, Party party, String password) {
+        if (!checkPartyPassword(player, party, password)) {
            return;
        }

        player.sendMessage(LocaleLoader.getString("Commands.Party.Join", party.getName()));
-        addToParty(player.getName(), mcMMOPlayer, party);
+        addToParty(player, mcMMOPlayer, party);
    }

    /**
@@ -309,7 +307,7 @@ public final class PartyManager {
     * @return true if the player can join the party
     */
    public static boolean checkPartyPassword(Player player, Party party, String password) {
-        //Don't care about passwords if it isn't locked
+        // Don't care about passwords if it isn't locked
        if (party.isLocked()) {
            String partyPassword = party.getPassword();

@@ -347,20 +345,20 @@ public final class PartyManager {

        player.sendMessage(LocaleLoader.getString("Commands.Invite.Accepted", invite.getName()));
        mcMMOPlayer.removePartyInvite();
-        addToParty(player.getName(), mcMMOPlayer, invite);
+        addToParty(player, mcMMOPlayer, invite);
    }

    /**
     * Add a player to a party
     * 
-     * @param playerName The name of the player to add to a party
+     * @param player The player to add to a party
     * @param mcMMOPlayer The player to add to the party
     * @param party The party
     */
-    public static void addToParty(String playerName, McMMOPlayer mcMMOPlayer, Party party) {
-        informPartyMembersJoin(playerName, party);
+    public static void addToParty(OfflinePlayer player, McMMOPlayer mcMMOPlayer, Party party) {
+        informPartyMembersJoin(player, party);
        mcMMOPlayer.setParty(party);
-        party.getMembers().add(playerName);
+        party.getMembers().add(player);
    }

    /**
@@ -410,10 +408,8 @@ public final class PartyManager {
     * @param mcMMOPlayer The player to check
     * @return true if the player can invite
     */
-    public static boolean canInvite(Player player, McMMOPlayer mcMMOPlayer) {
-        Party party = mcMMOPlayer.getParty();
-
-        if (party == null || (party.isLocked() && !party.getLeader().equals(player.getName()))) {
+    public static boolean canInvite(Player player, Party party) {
+        if (party.isLocked() && !party.getLeader().equals(player.getName())) {
            return false;
        }

@@ -461,8 +457,16 @@ public final class PartyManager {
            party.setLeader(partiesFile.getString(partyName + ".Leader"));
            party.setPassword(partiesFile.getString(partyName + ".Password"));
            party.setLocked(partiesFile.getBoolean(partyName + ".Locked"));
-            party.setXpShareMode(ShareHandler.XpShareMode.getFromString(partiesFile.getString(partyName + ".ExpShareMode")));
-            party.getMembers().addAll(partiesFile.getStringList(partyName + ".Members"));
+            party.setXpShareMode(ShareHandler.ShareMode.getFromString(partiesFile.getString(partyName + ".ExpShareMode")));
+            party.setItemShareMode(ShareHandler.ShareMode.getFromString(partiesFile.getString(partyName + ".ItemShareMode")));
+
+            List<String> memberNames = partiesFile.getStringList(partyName + ".Members");
+            List<OfflinePlayer> members = party.getMembers();
+            Server server = mcMMO.p.getServer();
+
+            for (String memberName : memberNames) {
+                members.add(server.getOfflinePlayer(memberName));
+            }

            parties.add(party);
        }
@@ -487,7 +491,15 @@ public final class PartyManager {
            partiesFile.set(partyName + ".Password", party.getPassword());
            partiesFile.set(partyName + ".Locked", party.isLocked());
            partiesFile.set(partyName + ".ExpShareMode", party.getXpShareMode().toString());
-            partiesFile.set(partyName + ".Members", party.getMembers());
+            partiesFile.set(partyName + ".ItemShareMode", party.getItemShareMode().toString());
+
+            List<String> memberNames = new ArrayList<String>();
+
+            for (OfflinePlayer member : party.getMembers()) {
+                memberNames.add(member.getName());
+            }
+
+            partiesFile.set(partyName + ".Members", memberNames);

            try {
                partiesFile.save(new File(partiesFilePath));
--- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java
+++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java
@@ -2,19 +2,24 @@ package com.gmail.nossr50.party;

 import java.util.List;

+import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerPickupItemEvent;
+import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.skills.utilities.SkillType;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Users;

 public final class ShareHandler {
-    public enum XpShareMode {
+    public enum ShareMode {
        NONE,
-        EQUAL;
+        EQUAL,
+        RANDOM;

-        public static XpShareMode getFromString(String string) {
+        public static ShareMode getFromString(String string) {
            try {
                return valueOf(string);
            }
@@ -69,5 +74,56 @@ public final class ShareHandler {
            return false;
        }
    }
+
+    /**
+     * Distribute Items amongst party members.
+     *
+     * @param item Item that will get shared
+     * @param mcMMOPlayer Player who picked up the item
+     * @return True if the item has been shared
+     */
+    public static boolean handleItemShare(PlayerPickupItemEvent event, McMMOPlayer mcMMOPlayer) {
+        Item item = event.getItem();
+        ItemStack itemStack = item.getItemStack();
+        Party party = mcMMOPlayer.getParty();
+
+        switch (party.getItemShareMode()) {
+        case EQUAL:
+
+            return false;
+        case RANDOM:
+            Player player = mcMMOPlayer.getPlayer();
+            List<Player> nearMembers = PartyManager.getNearMembers(player, party, Config.getInstance().getPartyShareRange());
+
+            if (nearMembers.isEmpty()) {
+                return false;
+            }
+            int partySize = nearMembers.size() + 1;
+
+            event.setCancelled(true);
+            item.remove();
+
+            Player targetPlayer;
+
+            ItemStack newStack = itemStack.clone();
+            newStack.setAmount(1);
+
+            //TODO Improve this, if possible make this faster.
+            for (int i = 0; i < itemStack.getAmount(); i++) {
+                int randomMember = Misc.getRandom().nextInt(partySize);
+                if (randomMember >= nearMembers.size()) {
+                    targetPlayer = player;
+                } else {
+                    targetPlayer = nearMembers.get(randomMember);
+                }
+                targetPlayer.getInventory().addItem(newStack);
+                targetPlayer.updateInventory();
+            }
+            return true;
+        case NONE:
+        default:
+            return false;
+        }
+    }
 }

--- a/src/main/java/com/gmail/nossr50/party/commands/PartyAcceptCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyAcceptCommand.java
@@ -6,21 +6,17 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class PartyAcceptCommand implements CommandExecutor {
    private McMMOPlayer mcMMOPlayer;
    private Player player;
-    private Party playerParty;

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.hasPermission(sender, "mcmmo.commands.party.accept")) {
+        if (!sender.hasPermission("mcmmo.commands.party.accept")) {
            sender.sendMessage(command.getPermissionMessage());
            return true;
        }
@@ -35,17 +31,9 @@ public class PartyAcceptCommand implements CommandExecutor {
                return true;
            }

+
            // Changing parties
-            if (mcMMOPlayer.inParty()) {
-                playerParty = mcMMOPlayer.getParty();
-
-                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), mcMMOPlayer.getPartyInvite().getName(), EventReason.CHANGED_PARTIES)) {
-                    return true;
-                }
-
-                PartyManager.removeFromParty(player.getName(), playerParty);
-            }
-            else if (!PartyManager.handlePartyChangeEvent(player, null, mcMMOPlayer.getPartyInvite().getName(), EventReason.JOINED_PARTY)) {
+            if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), mcMMOPlayer.getPartyInvite().getName())) {
                return true;
            }

--- a/src/main/java/com/gmail/nossr50/party/commands/PartyChangeOwnerCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyChangeOwnerCommand.java
@@ -0,0 +1,39 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyChangeOwnerCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.owner")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+            Party playerParty = Users.getPlayer((Player) sender).getParty();
+
+            if (!playerParty.getMembers().contains(mcMMO.p.getServer().getOfflinePlayer(args[1]))) {
+                sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                return true;
+            }
+
+            PartyManager.setPartyLeader(args[1], playerParty);
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyChangePasswordCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyChangePasswordCommand.java
@@ -0,0 +1,54 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+
+public class PartyChangePasswordCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.password")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        Party playerParty = Users.getPlayer((Player) sender).getParty();
+        switch (args.length) {
+        case 1:
+            unprotectParty(sender, playerParty);
+            return true;
+
+        case 2:
+            if (args[1].equalsIgnoreCase("clear") || args[1].equalsIgnoreCase("reset")) {
+                unprotectParty(sender, playerParty);
+                return true;
+            }
+
+            protectParty(sender, playerParty, args[1]);
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "[clear|reset]"));
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "password", "<" + LocaleLoader.getString("Commands.Usage.Password") + ">"));
+            return true;
+        }
+    }
+
+    private void unprotectParty(CommandSender sender, Party playerParty) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(null);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
+    }
+
+    private void protectParty(CommandSender sender, Party playerParty, String password) {
+        playerParty.setLocked(true);
+        playerParty.setPassword(password);
+        sender.sendMessage(LocaleLoader.getString("Party.Password.Set", password));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyCommand.java
@@ -1,22 +1,14 @@
 package com.gmail.nossr50.party.commands;

-import org.bukkit.ChatColor;
-import org.bukkit.Server;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.chat.commands.PartyChatCommand;
 import com.gmail.nossr50.commands.CommandHelper;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.party.Party;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.party.ShareHandler;
 import com.gmail.nossr50.util.Users;

 public class PartyCommand implements CommandExecutor {
@@ -26,6 +18,20 @@ public class PartyCommand implements CommandExecutor {
    private CommandExecutor partyJoinCommand = new PartyJoinCommand();
    private CommandExecutor partyAcceptCommand = new PartyAcceptCommand();
    private CommandExecutor partyCreateCommand = new PartyCreateCommand();
+    private CommandExecutor partyQuitCommand = new PartyQuitCommand();
+    private CommandExecutor partyExpShareCommand = new PartyExpShareCommand();
+    private CommandExecutor partyItemShareCommand = new PartyItemShareCommand();
+    private CommandExecutor partyInviteCommand = new PartyInviteCommand();
+    private CommandExecutor partyKickCommand = new PartyKickCommand();
+    private CommandExecutor partyDisbandCommand = new PartyDisbandCommand();
+    private CommandExecutor partyChangeOwnerCommand = new PartyChangeOwnerCommand();
+    private CommandExecutor partyLockCommand = new PartyLockCommand();
+    private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
+    private CommandExecutor partyRenameCommand = new PartyRenameCommand();
+    private CommandExecutor partyInfoCommand = new PartyInfoCommand();
+    private CommandExecutor partyHelpCommand = new PartyHelpCommand();
+    private CommandExecutor partyTeleportCommand = new PtpCommand();
+    private CommandExecutor partyChatCommand = new PartyChatCommand();

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
@@ -33,515 +39,108 @@ public class PartyCommand implements CommandExecutor {
            return true;
        }

-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.party")) {
+        if (!sender.hasPermission("mcmmo.commands.party")) {
+            sender.sendMessage(command.getPermissionMessage());
            return true;
        }

        player = (Player) sender;
        mcMMOPlayer = Users.getPlayer(player);

-        if (args.length < 1 || args[0].equalsIgnoreCase("info")) {
-            return party();
-        }
-
-        if (args[0].equalsIgnoreCase("join")) {
-            return partyJoinCommand.onCommand(sender, command, label, args);
-        }
-        else if (args[0].equalsIgnoreCase("accept")) {
-            return partyAcceptCommand.onCommand(sender, command, label, args);
-        }
-        else if (args[0].equalsIgnoreCase("create")) {
-            return partyCreateCommand.onCommand(sender, command, label, args);
-        }
-        else if (args[0].equalsIgnoreCase("?") || args[0].equalsIgnoreCase("help")) {
-            return printHelp();
-        }
-
-        if (mcMMOPlayer.inParty()) {
-            if (args[0].equalsIgnoreCase("quit") || args[0].equalsIgnoreCase("q") || args[0].equalsIgnoreCase("leave")) {
-                return quit();
-            }
-            else if (args[0].equalsIgnoreCase("expshare")) {
-                return shareExp(args);
-            }
-            else if (args[0].equalsIgnoreCase("itemshare")) {
-                return shareItem();
-            }
-            else if (args[0].equalsIgnoreCase("invite")) {
-                return invite(args);
-            }
-            else if (args[0].equalsIgnoreCase("kick")) {
-                return kick(args);
-            }
-            else if (args[0].equalsIgnoreCase("disband")) {
-                return disband();
-            }
-            else if (args[0].equalsIgnoreCase("owner")) {
-                return changeOwner(args);
-            }
-            else if (args[0].equalsIgnoreCase("lock")) {
-                return lock();
-            }
-            else if (args[0].equalsIgnoreCase("unlock")) {
-                return unlock();
-            }
-            else if (args[0].equalsIgnoreCase("password")) {
-                return changePassword(args);
-            }
-            else if (args[0].equalsIgnoreCase("rename")) {
-                return rename(args);
-            }
-            else {
+        if (args.length < 1) {
+            if (!mcMMOPlayer.inParty()) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
                return printUsage();
            }
+
+            return partyInfoCommand.onCommand(sender, command, label, args);
        }

-        player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-        return printUsage();
+        PartySubcommandType subcommand = PartySubcommandType.getSubcommand(args[0]);
+
+        if (subcommand == null) {
+            return printUsage();
+        }
+
+        switch (subcommand) {
+        case JOIN:
+            return partyJoinCommand.onCommand(sender, command, label, args);
+        case ACCEPT:
+            return partyAcceptCommand.onCommand(sender, command, label, args);
+        case CREATE:
+            return partyCreateCommand.onCommand(sender, command, label, args);
+        case HELP:
+            return partyHelpCommand.onCommand(sender, command, label, args);
+        default:
+            break;
+        }
+
+        // Party member commands
+        if (!mcMMOPlayer.inParty()) {
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.None"));
+            return printUsage();
+        }
+
+        switch (subcommand) {
+        case INFO:
+            return partyInfoCommand.onCommand(sender, command, label, args);
+        case QUIT:
+            return partyQuitCommand.onCommand(sender, command, label, args);
+        case INVITE:
+            return partyInviteCommand.onCommand(sender, command, label, args);
+        case TELEPORT:
+            return partyTeleportCommand.onCommand(sender, command, label, extractArgs(args));
+        case CHAT:
+            return partyChatCommand.onCommand(sender, command, label, extractArgs(args));
+        default:
+            break;
+        }
+
+        // Party leader commands
+        if (!mcMMOPlayer.getParty().getLeader().equals(player.getName())) {
+            sender.sendMessage(LocaleLoader.getString("Party.NotOwner"));
+            return true;
+        }
+
+        switch (subcommand) {
+        case EXPSHARE:
+            return partyExpShareCommand.onCommand(sender, command, label, args);
+        case ITEMSHARE:
+            return partyItemShareCommand.onCommand(sender, command, label, args);
+        case KICK:
+            return partyKickCommand.onCommand(sender, command, label, args);
+        case DISBAND:
+            return partyDisbandCommand.onCommand(sender, command, label, args);
+        case OWNER:
+            return partyChangeOwnerCommand.onCommand(sender, command, label, args);
+        case LOCK:
+        case UNLOCK:
+            return partyLockCommand.onCommand(sender, command, label, args);
+        case PASSWORD:
+            return partyChangePasswordCommand.onCommand(sender, command, label, args);
+        case RENAME:
+            return partyRenameCommand.onCommand(sender, command, label, args);
+        default:
+            break;
+        }
+
+        return true;
    }

    private boolean printUsage() {
-        player.sendMessage(LocaleLoader.getString("Party.Help.0"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.2"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.0", "/party join"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create"));
+        player.sendMessage(LocaleLoader.getString("Party.Help.2", "/party ?"));
        return true;
    }

-    private boolean party() {
-        if (mcMMOPlayer.inParty()) {
-            Party party = mcMMOPlayer.getParty();
+    private String[] extractArgs(String[] args) {
+        String[] newArgs = new String[args.length - 1];

-            Server server = mcMMO.p.getServer();
-            String leader = party.getLeader();
-            StringBuilder tempList = new StringBuilder();
-
-            int membersNear = PartyManager.getNearMembers(player, party, Config.getInstance().getPartyShareRange()).size();
-            int membersOnline = party.getOnlineMembers().size() - 1;
-
-            String ItemShare = "";
-            String ExpShare = "";
-            String Split = "";
-            String itemShareMode = "NONE";
-
-            for (String otherPlayerName : party.getMembers()) {
-                if (leader.equals(otherPlayerName)) {
-                    tempList.append(ChatColor.GOLD);
-                }
-                else if (server.getPlayer(otherPlayerName) != null) {
-                    tempList.append(ChatColor.WHITE);
-                }
-                else {
-                    tempList.append(ChatColor.GRAY);
-                }
-                tempList.append(otherPlayerName).append(" ");
-            }
-
-            String status = LocaleLoader.getString("Party.Status.Locked");
-            if (!party.isLocked()) {
-                status = LocaleLoader.getString("Party.Status.Unlocked");
-            }
-
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", party.getName(), status));
-
-            boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
-            boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
-
-            if (xpShareEnabled) {
-                ExpShare = LocaleLoader.getString("Commands.Party.ExpShare", party.getXpShareMode().toString());
-            }
-
-            if (itemShareEnabled) {
-                ItemShare = LocaleLoader.getString("Commands.Party.ItemShare", itemShareMode);
-            }
-
-            if (xpShareEnabled && itemShareEnabled) {
-                Split = ChatColor.DARK_GRAY + " || ";
-            }
-
-            if (xpShareEnabled || itemShareEnabled) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + ExpShare + Split + ItemShare);
-            }
-
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
-            player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Members", tempList));
-        }
-        else {
-            return printUsage();
-        }
-        return true;
-    }
-
-    private boolean quit() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.quit")) {
-            return true;
+        for (int i = 1; i < args.length; i++) {
+            newArgs[i - 1] = args[1];
        }

-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (party != null) {
-            McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, party.getName(), null, EventReason.LEFT_PARTY);
-            mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                return true;
-            }
-            PartyManager.removeFromParty(playerName, party);
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-        }
-
-        return false;
-    }
-
-    private boolean shareExp(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.expshare")) {
-            return true;
-        }
-
-        if (args.length < 2) {
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE / EQUAL]"));
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (party.getLeader().equals(playerName)) {
-            if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("false")) {
-                party.setXpShareMode(ShareHandler.XpShareMode.NONE);
-
-                for (Player onlineMembers : party.getOnlineMembers()) {
-                    onlineMembers.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode.NoShare")));
-                }
-            }
-            else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
-                party.setXpShareMode(ShareHandler.XpShareMode.EQUAL);
-
-                for (Player onlineMembers : party.getOnlineMembers()) {
-                    onlineMembers.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode.Equal")));
-                }
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE / EQUAL]"));
-                return true;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean shareItem() {
-        return (!CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.itemshare"));
-    }
-
-    private boolean printHelp() {
-        player.sendMessage(LocaleLoader.getString("Party.Help.3"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.1"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.4"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.5"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.6"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.7"));
-        player.sendMessage(LocaleLoader.getString("Party.Help.8"));
-        return true;
-    }
-
-    private boolean invite(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.invite")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            if (!mcMMOPlayer.inParty()) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.None"));
-                return true;
-            }
-
-            Player target = mcMMO.p.getServer().getPlayer(args[1]);
-
-            if (target != null) {
-                if (PartyManager.inSameParty(player, target)) {
-                    player.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
-                    return true;
-                }
-
-                if (PartyManager.canInvite(player, mcMMOPlayer)) {
-                    Party party = mcMMOPlayer.getParty();
-
-                    Users.getPlayer(target).setPartyInvite(party);
-                    player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", party.getName(), player.getName()));
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
-                    return true;
-                }
-
-                player.sendMessage(LocaleLoader.getString("Party.Locked"));
-                return true;
-            }
-
-            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
-            return true;
-
-        default:
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
-            return true;
-        }
-    }
-
-    /**
-     * Kick a party member
-     */
-    private boolean kick(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.kick")) {
-            return true;
-        }
-
-        switch (args.length) {
-        case 2:
-            String playerName = player.getName();
-            Party party = mcMMOPlayer.getParty();
-
-            if (party.getLeader().equals(playerName)) {
-                if (!party.getMembers().contains(args[1])) {
-                    player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
-                    return true;
-                }
-
-                Player target = mcMMO.p.getServer().getOfflinePlayer(args[1]).getPlayer();
-
-                if (target != null) {
-                    String partyName = party.getName();
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(target, partyName, null, EventReason.KICKED_FROM_PARTY);
-
-                    mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-
-                    target.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
-                }
-
-                PartyManager.removeFromParty(args[1], party);
-            }
-            else {
-                player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-            }
-
-            return true;
-
-        default:
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
-            return true;
-        }
-    }
-
-    /**
-     * Disband the current party, kicks out all party members.
-     */
-    private boolean disband() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.disband")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (party.getLeader().equals(playerName)) {
-            for (Player onlineMembers : party.getOnlineMembers()) {
-                McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(onlineMembers, party.getName(), null, EventReason.KICKED_FROM_PARTY);
-                mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-                onlineMembers.sendMessage(LocaleLoader.getString("Party.Disband"));
-            }
-
-            PartyManager.disbandParty(party);
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-        }
-
-        return true;
-    }
-
-    /**
-     * Change the owner of the current party
-     */
-    private boolean changeOwner(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.owner")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (args.length < 2) {
-            player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "owner", "[" + LocaleLoader.getString("Commands.Usage.Player") + "]"));
-            return true;
-        }
-
-        if (party.getLeader().equals(playerName)) {
-            if (!party.getMembers().contains(args[1])) {
-                player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
-                return true;
-            }
-
-            PartyManager.setPartyLeader(args[1], party);
-        }
-
-        return true;
-    }
-
-    /**
-     * Lock the current party
-     */
-    private boolean lock() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.lock")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (party == null) {
-            player.sendMessage("Commands.Party.None");
-            return true;
-        }
-
-        if (!party.getLeader().equals(playerName)) {
-            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-            return true;
-        }
-
-        if (party.isLocked()) {
-            player.sendMessage(LocaleLoader.getString("Party.IsLocked"));
-        }
-        else {
-            party.setLocked(true);
-            player.sendMessage(LocaleLoader.getString("Party.Locked"));
-        }
-        return true;
-    }
-
-    /**
-     * Unlock the current party
-     */
-    private boolean unlock() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.unlock")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (party == null) {
-            player.sendMessage("Commands.Party.None");
-            return true;
-        }
-
-        if (!party.getLeader().equals(playerName)) {
-            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-            return true;
-        }
-
-        if (!party.isLocked()) {
-            player.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
-        }
-        else {
-            party.setLocked(false);
-            player.sendMessage(LocaleLoader.getString("Party.Unlocked"));
-        }
-        return true;
-    }
-
-    private boolean changePassword(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.password")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-
-        if (!party.getLeader().equals(playerName)) {
-            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-            return true;
-        }
-
-        if (args.length < 2) {
-            party.setLocked(true);
-            party.setPassword(null);
-            player.sendMessage(LocaleLoader.getString("Party.Password.Removed"));
-            return true;
-        }
-
-        party.setLocked(true);
-        party.setPassword(args[1]);
-        player.sendMessage(LocaleLoader.getString("Party.Password.Set", args[1]));
-
-        return true;
-    }
-
-    /**
-     * Rename the current party
-     */
-    private boolean rename(String[] args) {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.party.rename")) {
-            return true;
-        }
-
-        String playerName = player.getName();
-        Party party = mcMMOPlayer.getParty();
-        String leader = party.getLeader();
-
-        if (party.getLeader().equals(playerName)) {
-            if (args.length < 2) {
-                player.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
-                return true;
-            }
-
-            String newPartyName = args[1];
-
-            // This is to prevent party leaders from spamming other players with the rename message
-            if (!party.getName().equals(newPartyName)) {
-                Party newParty = PartyManager.getParty(newPartyName);
-
-                // Check to see if the party exists, and if it does cancel renaming the party
-                if (newParty != null) {
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", newPartyName));
-                    return true;
-                }
-
-                for (Player onlineMembers : party.getOnlineMembers()) {
-                    McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(onlineMembers, party.getName(), newPartyName, EventReason.CHANGED_PARTIES);
-                    mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-                    if (event.isCancelled()) {
-                        return true;
-                    }
-
-                    if (!onlineMembers.getName().equals(leader)) {
-                        onlineMembers.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leader, newPartyName));
-                    }
-                }
-
-                party.setName(newPartyName);
-            }
-
-            player.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Party.NotOwner"));
-        }
-
-        return true;
+        return newArgs;
    }
 }
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyCreateCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyCreateCommand.java
@@ -6,21 +6,18 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class PartyCreateCommand implements CommandExecutor {
    private McMMOPlayer mcMMOPlayer;
    private Player player;
-    private Party playerParty;

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.hasPermission(sender, "mcmmo.commands.party.create")) {
+        if (!sender.hasPermission("mcmmo.commands.party.create")) {
            sender.sendMessage(command.getPermissionMessage());
            return true;
        }
@@ -32,7 +29,7 @@ public class PartyCreateCommand implements CommandExecutor {

            // Check to see if the party exists, and if it does cancel creating a new party
            if (newParty != null) {
-                player.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", args[1]));
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", args[1]));
                return true;
            }

@@ -40,15 +37,7 @@ public class PartyCreateCommand implements CommandExecutor {
            mcMMOPlayer = Users.getPlayer(player);

            // Changing parties
-            if (mcMMOPlayer.inParty()) {
-                playerParty = mcMMOPlayer.getParty();
-                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), args[1], EventReason.CHANGED_PARTIES)) {
-                    return true;
-                }
-
-                PartyManager.removeFromParty(player.getName(), playerParty);
-            }
-            else if (!PartyManager.handlePartyChangeEvent(player, null, args[1], EventReason.JOINED_PARTY)) {
+            if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, mcMMOPlayer.getParty(), args[1])) {
                return true;
            }

--- a/src/main/java/com/gmail/nossr50/party/commands/PartyDisbandCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyDisbandCommand.java
@@ -0,0 +1,42 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyDisbandCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.disband")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            Party playerParty = Users.getPlayer((Player) sender).getParty();
+
+            for (Player member : playerParty.getOnlineMembers()) {
+                if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), null, EventReason.KICKED_FROM_PARTY)) {
+                    return true;
+                }
+
+                member.sendMessage(LocaleLoader.getString("Party.Disband"));
+            }
+
+            PartyManager.disbandParty(playerParty);
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "disband"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyExpShareCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyExpShareCommand.java
@@ -0,0 +1,60 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.ShareHandler;
+import com.gmail.nossr50.party.ShareHandler.ShareMode;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.Users;
+
+public class PartyExpShareCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getExpShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ExpShare.Disabled"));
+            return true;
+        }
+
+        if (!sender.hasPermission("mcmmo.commands.party.expshare")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+            playerParty = Users.getPlayer((Player) sender).getParty();
+
+            if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                handleChangingShareMode(ShareMode.NONE);
+            }
+            else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                handleChangingShareMode(ShareMode.EQUAL);
+            }
+            else {
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "[NONE | EQUAL]"));
+            }
+
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "expshare", "<NONE | EQUAL>"));
+            return true;
+        }
+    }
+
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+        playerParty.setXpShareMode(mode);
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Exp"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyHelpCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyHelpCommand.java
@@ -0,0 +1,30 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+
+public class PartyHelpCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        switch (args.length) {
+        case 1:
+            sender.sendMessage(LocaleLoader.getString("Party.Help.3", "/party join", "/party quit"));
+            sender.sendMessage(LocaleLoader.getString("Party.Help.1", "/party create")); 
+            sender.sendMessage(LocaleLoader.getString("Party.Help.4", "/party <lock|unlock>"));
+            sender.sendMessage(LocaleLoader.getString("Party.Help.5", "/party password"));
+            sender.sendMessage(LocaleLoader.getString("Party.Help.6", "/party kick"));
+            sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party owner"));
+            sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "help"));
+            return true;
+        }
+    }
+
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyInfoCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyInfoCommand.java
@@ -0,0 +1,97 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyInfoCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        player = (Player) sender;
+        McMMOPlayer mcMMOPlayer = Users.getPlayer(player);
+        playerParty = mcMMOPlayer.getParty();
+
+        displayPartyHeader();
+        displayShareModeInfo();
+        displayMemberInfo();
+        return true;
+    }
+
+    private String createMembersList() {
+        StringBuilder memberList = new StringBuilder();
+
+        for (OfflinePlayer member : playerParty.getMembers()) {
+            if (playerParty.getLeader().equals(member.getName())) {
+                memberList.append(ChatColor.GOLD).append(member.getName()).append(" ");
+            }
+            else if (member.isOnline()) {
+                memberList.append(ChatColor.WHITE).append(member.getName()).append(" ");
+            }
+            else {
+                memberList.append(ChatColor.GRAY).append(member.getName()).append(" ");
+            }
+        }
+
+        return memberList.toString();
+    }
+
+    private void displayShareModeInfo() {
+        boolean xpShareEnabled = Config.getInstance().getExpShareEnabled();
+        boolean itemShareEnabled = Config.getInstance().getItemShareEnabled();
+
+        if (!xpShareEnabled && !itemShareEnabled) {
+            return;
+        }
+
+        String expShareInfo = "";
+        String itemShareInfo = "";
+        String separator = "";
+
+        if (xpShareEnabled) {
+            expShareInfo = LocaleLoader.getString("Commands.Party.ExpShare", playerParty.getXpShareMode().toString());
+        }
+
+        if (itemShareEnabled) {
+            itemShareInfo = LocaleLoader.getString("Commands.Party.ItemShare", playerParty.getItemShareMode().toString());
+        }
+
+        if (xpShareEnabled && itemShareEnabled) {
+            separator = ChatColor.DARK_GRAY + " || ";
+        }
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.ShareMode") + expShareInfo + separator + itemShareInfo);
+    }
+
+    private void displayPartyHeader() {
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Header"));
+
+        if (playerParty.isLocked()) {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Locked")));
+        }
+        else {
+            player.sendMessage(LocaleLoader.getString("Commands.Party.Status", playerParty.getName(), LocaleLoader.getString("Party.Status.Unlocked")));
+        }
+    }
+
+    private void displayMemberInfo() {
+        int membersNear = PartyManager.getNearMembers(player, playerParty, Config.getInstance().getPartyShareRange()).size();
+        int membersOnline = playerParty.getOnlineMembers().size() - 1;
+
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", membersNear, membersOnline));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.Members", createMembersList()));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyInviteCommand.java
@@ -0,0 +1,76 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyInviteCommand implements CommandExecutor {
+    private McMMOPlayer mcMMOTarget;
+    private Player target;
+
+    private McMMOPlayer mcMMOPlayer;
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.invite")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+            if (!mcMMO.p.getServer().getOfflinePlayer(args[1]).isOnline()) {
+                sender.sendMessage(LocaleLoader.getString("Party.NotOnline", args[1]));
+                return true;
+            }
+
+            mcMMOTarget = Users.getPlayer(args[1]);
+
+            if (mcMMOTarget == null) {
+                sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+                return true;
+            }
+
+            target = mcMMOTarget.getPlayer();
+            mcMMOPlayer = Users.getPlayer((Player) sender);
+            player = mcMMOPlayer.getPlayer();
+
+            if (player.equals(target)) {
+                sender.sendMessage(LocaleLoader.getString("Party.Invite.Self"));
+                return true;
+            }
+
+            if (PartyManager.inSameParty(player, target)) {
+                sender.sendMessage(LocaleLoader.getString("Party.Player.InSameParty", target.getName()));
+                return true;
+            }
+
+            playerParty = mcMMOPlayer.getParty();
+
+            if (!PartyManager.canInvite(player, playerParty)) {
+                player.sendMessage(LocaleLoader.getString("Party.Locked"));
+                return true;
+            }
+
+            mcMMOTarget.setPartyInvite(playerParty);
+
+            sender.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
+            target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.0", playerParty.getName(), player.getName()));
+            target.sendMessage(LocaleLoader.getString("Commands.Party.Invite.1"));
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "invite", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyItemShareCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyItemShareCommand.java
@@ -0,0 +1,65 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.ShareHandler;
+import com.gmail.nossr50.party.ShareHandler.ShareMode;
+import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.util.Users;
+
+public class PartyItemShareCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!Config.getInstance().getItemShareEnabled()) {
+            sender.sendMessage(LocaleLoader.getString("Party.ItemShare.Disabled"));
+            return true;
+        }
+
+        if (!sender.hasPermission("mcmmo.commands.party.itemshare")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+            playerParty = Users.getPlayer((Player) sender).getParty();
+
+            if (args[1].equalsIgnoreCase("none") || args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                handleChangingShareMode(ShareMode.NONE);
+            }
+//            else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even")) {
+//                handleChangingShareMode(ShareMode.EQUAL);
+//            }
+            else if (args[1].equalsIgnoreCase("random")) {
+                handleChangingShareMode(ShareMode.RANDOM);
+            }
+            else {
+//                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+                sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | RANDOM>"));
+            }
+
+            return true;
+
+        default:
+//          sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | EQUAL | RANDOM>"));
+          sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<NONE | RANDOM>"));
+            return true;
+        }
+    }
+
+    private void handleChangingShareMode(ShareHandler.ShareMode mode) {
+        playerParty.setItemShareMode(mode);
+
+        for (Player member : playerParty.getOnlineMembers()) {
+            member.sendMessage(LocaleLoader.getString("Commands.Party.SetSharing", LocaleLoader.getString("Party.ShareType.Item"), LocaleLoader.getString("Party.ShareMode." + StringUtils.getCapitalized(mode.toString()))));
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyJoinCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyJoinCommand.java
@@ -5,13 +5,11 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
-import com.gmail.nossr50.datatypes.PlayerProfile;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class PartyJoinCommand implements CommandExecutor {
@@ -25,7 +23,7 @@ public class PartyJoinCommand implements CommandExecutor {

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (!Permissions.hasPermission(sender, "mcmmo.commands.party.join")) {
+        if (!sender.hasPermission("mcmmo.commands.party.join")) {
            sender.sendMessage(command.getPermissionMessage());
            return true;
        }
@@ -46,18 +44,11 @@ public class PartyJoinCommand implements CommandExecutor {
            }

            // Changing parties
-            if (mcMMOPlayer.inParty()) {
-                if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), targetParty.getName(), EventReason.CHANGED_PARTIES)) {
-                    return true;
-                }
-
-                PartyManager.removeFromParty(player.getName(), playerParty);
-            }
-            else if (!PartyManager.handlePartyChangeEvent(player, null, targetParty.getName(), EventReason.JOINED_PARTY)) {
+            if (!PartyManager.changeOrJoinParty(mcMMOPlayer, player, playerParty, targetParty.getName())) {
                return true;
            }

-            PartyManager.joinParty(player, mcMMOPlayer, targetParty.getName(), password);
+            PartyManager.joinParty(player, mcMMOPlayer, targetParty, password);
            return true;

        default:
@@ -75,24 +66,20 @@ public class PartyJoinCommand implements CommandExecutor {
    }

    private boolean canJoinParty(CommandSender sender, String targetName) {
-        mcMMOTarget = Users.getPlayer(targetName);
-
-        if (mcMMOTarget == null) {
-            PlayerProfile playerProfile = new PlayerProfile(targetName, false);
-
-            if (!playerProfile.isLoaded()) {
-                sender.sendMessage(LocaleLoader.getString("Commands.DoesNotExist"));
-                return false;
-            }
-        }
-
-        target = mcMMOTarget.getPlayer();
-
-        if (!target.isOnline()) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
            sender.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
            return false;
        }

+        mcMMOTarget = Users.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            sender.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
        if (!mcMMOTarget.inParty()) {
            sender.sendMessage(LocaleLoader.getString("Party.PlayerNotInParty", targetName));
            return false;
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyKickCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyKickCommand.java
@@ -0,0 +1,54 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyKickCommand implements CommandExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.kick")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 2:
+            Party playerParty = Users.getPlayer((Player) sender).getParty();
+
+            OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);
+
+            if (!playerParty.getMembers().contains(target)) {
+                sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", args[1]));
+                return true;
+            }
+
+            if (target.isOnline()) {
+                Player onlineTarget = target.getPlayer();
+                String partyName = playerParty.getName();
+
+                if (!PartyManager.handlePartyChangeEvent(onlineTarget, partyName, null, EventReason.KICKED_FROM_PARTY)) {
+                    return true;
+                }
+
+                onlineTarget.sendMessage(LocaleLoader.getString("Commands.Party.Kick", partyName));
+            }
+
+            PartyManager.removeFromParty(target, playerParty);
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "kick", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyLockCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyLockCommand.java
@@ -0,0 +1,96 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.util.Users;
+
+public class PartyLockCommand implements CommandExecutor {
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        playerParty = Users.getPlayer((Player) sender).getParty();
+
+        switch (args.length) {
+        case 1:
+            if (args[0].equalsIgnoreCase("lock")) {
+                lockParty(sender, command);
+            }
+            else if (args[0].equalsIgnoreCase("unlock")) {
+                unlockParty(sender, command);
+            }
+
+            return true;
+
+        case 2:
+            if (!args[0].equalsIgnoreCase("lock")) {
+                sendUsageStrings(sender);
+                return true;
+            }
+
+            if (args[1].equalsIgnoreCase("on") || args[1].equalsIgnoreCase("true")) {
+                lockParty(sender, command);
+            }
+            else if (args[1].equalsIgnoreCase("off") || args[1].equalsIgnoreCase("false")) {
+                unlockParty(sender, command);
+            }
+            else {
+                sendUsageStrings(sender);
+            }
+
+            return true;
+
+        default:
+            sendUsageStrings(sender);
+            return true;
+        }
+    }
+
+    /**
+     * Handle locking a party.
+     */
+    private void lockParty(CommandSender sender, Command command) {
+        if (!sender.hasPermission("mcmmo.commands.party.lock")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsLocked"));
+            return;
+        }
+
+        playerParty.setLocked(true);
+        sender.sendMessage(LocaleLoader.getString("Party.Locked"));
+    }
+
+    /**
+     * Handle unlocking a party.
+     *
+     * @return true if party is successfully unlocked, false otherwise.
+     */
+    private void unlockParty(CommandSender sender, Command command) {
+        if (!sender.hasPermission("mcmmo.commands.party.unlock")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return;
+        }
+
+        if (!playerParty.isLocked()) {
+            sender.sendMessage(LocaleLoader.getString("Party.IsntLocked"));
+            return;
+        }
+
+        playerParty.setLocked(false);
+        sender.sendMessage(LocaleLoader.getString("Party.Unlocked"));
+    }
+
+    private void sendUsageStrings(CommandSender sender) {
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "lock", "[on|off]"));
+        sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "unlock"));
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyQuitCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyQuitCommand.java
@@ -0,0 +1,43 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyQuitCommand implements CommandExecutor {
+    private Player player;
+    private Party playerParty;
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.quit")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        switch (args.length) {
+        case 1:
+            player = (Player) sender;
+            playerParty = Users.getPlayer(player).getParty();
+
+            if (!PartyManager.handlePartyChangeEvent(player, playerParty.getName(), null, EventReason.LEFT_PARTY)) {
+                return true;
+            }
+
+            PartyManager.removeFromParty(player, playerParty);
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.Leave"));
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.1", "party", "[quit|q|leave]"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartyRenameCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartyRenameCommand.java
@@ -0,0 +1,64 @@
+package com.gmail.nossr50.party.commands;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.party.Party;
+import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.util.Users;
+
+public class PartyRenameCommand implements CommandExecutor {
+
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        if (!sender.hasPermission("mcmmo.commands.party.rename")) {
+            sender.sendMessage(command.getPermissionMessage());
+            return true;
+        }
+
+        Party playerParty = Users.getPlayer((Player) sender).getParty();
+        String leaderName = playerParty.getLeader();
+
+        switch (args.length) {
+        case 2:
+            String newPartyName = args[1];
+
+            // This is to prevent party leaders from spamming other players with the rename message
+            if (playerParty.getName().equalsIgnoreCase(newPartyName)) {
+                sender.sendMessage(LocaleLoader.getString("Party.Rename.Same"));
+                return true;
+            }
+
+            Party newParty = PartyManager.getParty(newPartyName);
+
+            // Check to see if the party exists, and if it does cancel renaming the party
+            if (newParty != null) {
+                sender.sendMessage(LocaleLoader.getString("Commands.Party.AlreadyExists", newPartyName));
+                return true;
+            }
+
+            for (Player member : playerParty.getOnlineMembers()) {
+                if (!PartyManager.handlePartyChangeEvent(member, playerParty.getName(), newPartyName, EventReason.CHANGED_PARTIES)) {
+                    return true;
+                }
+
+                if (!member.getName().equals(leaderName)) {
+                    member.sendMessage(LocaleLoader.getString("Party.InformedOnNameChange", leaderName, newPartyName));
+                }
+            }
+
+            playerParty.setName(newPartyName);
+
+            sender.sendMessage(LocaleLoader.getString("Commands.Party.Rename", newPartyName));
+            return true;
+
+        default:
+            sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "rename", "<" + LocaleLoader.getString("Commands.Usage.PartyName") + ">"));
+            return true;
+        }
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PartySubcommandType.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PartySubcommandType.java
@@ -0,0 +1,45 @@
+package com.gmail.nossr50.party.commands;
+
+public enum PartySubcommandType {
+    JOIN,
+    ACCEPT,
+    CREATE,
+    HELP,
+    INFO,
+    QUIT,
+    EXPSHARE,
+    ITEMSHARE,
+    INVITE,
+    KICK,
+    DISBAND,
+    OWNER,
+    LOCK,
+    UNLOCK,
+    PASSWORD,
+    RENAME,
+    TELEPORT,
+    CHAT;
+
+    public static PartySubcommandType getSubcommand(String commandName) {
+        for (PartySubcommandType command : values()) {
+            if (command.name().equalsIgnoreCase(commandName)) {
+                return command;
+            }
+        }
+
+        if (commandName.equalsIgnoreCase("?")) {
+            return HELP;
+        }
+        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
+            return QUIT;
+        }
+        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
+            return EXPSHARE;
+        }
+        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
+            return ITEMSHARE;
+        }
+
+        return null;
+    }
+}
--- a/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/party/commands/PtpCommand.java
@@ -18,36 +18,40 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;

 public class PtpCommand implements CommandExecutor {
-    private final mcMMO plugin;
    private Player player;
    private McMMOPlayer mcMMOPlayer;
+    private PlayerProfile playerProfile;

-    public PtpCommand(mcMMO instance) {
-        this.plugin = instance;
-    }
+    private Player target;
+    private McMMOPlayer mcMMOTarget;

    @Override
    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        String usage = LocaleLoader.getString("Commands.Usage.1", "ptp", "<" + LocaleLoader.getString("Commands.Usage.Player") + ">");
-
        if (CommandHelper.noConsoleUsage(sender)) {
            return true;
        }

-        if (CommandHelper.noCommandPermissions(sender, "mcmmo.commands.ptp")) {
-            return true;
-        }
-
        switch (args.length) {
        case 1:
            player = (Player) sender;
            mcMMOPlayer = Users.getPlayer(player);
-            PlayerProfile playerProfile = mcMMOPlayer.getProfile();
+            playerProfile = mcMMOPlayer.getProfile();

            if (args[0].equalsIgnoreCase("toggle")) {
+                if (!sender.hasPermission("mcmmo.commands.ptp.toggle")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
                return togglePartyTeleportation();
            }
-            else if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+
+            if (args[0].equalsIgnoreCase("acceptany") || args[0].equalsIgnoreCase("acceptall")) {
+                if (!sender.hasPermission("mcmmo.commands.ptp.acceptall")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
                return acceptAnyTeleportRequest();
            }

@@ -59,68 +63,37 @@ public class PtpCommand implements CommandExecutor {
            }

            if (args[0].equalsIgnoreCase("accept")) {
+                if (!sender.hasPermission("mcmmo.commands.ptp.accept")) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
                return acceptTeleportRequest();
            }

            return sendTeleportRequest(args[0]);

        default:
-            sender.sendMessage(usage);
-            return true;
+            return false;
        }
    }

-    private boolean sendTeleportRequest(String args) {
-        Player target = plugin.getServer().getPlayer(args);
-
-        if (player.equals(target)) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
+    private boolean sendTeleportRequest(String targetName) {
+        if (!canTeleport(targetName)) {
            return true;
        }

-        if (target == null) {
-            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
-            return true;
+        if (!mcMMOTarget.getPtpConfirmRequired()) {
+            return handlePartyTeleportEvent(player, target);
        }

-        if (target.isDead()) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
-            return true;
-        }
+        mcMMOTarget.setPtpRequest(player);
+        mcMMOTarget.actualizePtpTimeout();
+        player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));

-        if (PartyManager.inSameParty(player, target)) {
-            McMMOPlayer targetMcMMOPlayer = Users.getPlayer(target);
-
-            if (!targetMcMMOPlayer.getPtpEnabled()) {
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", target.getName()));
-                return true;
-            }
-
-            if (!targetMcMMOPlayer.getPtpConfirmRequired()) {
-                McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
-                plugin.getServer().getPluginManager().callEvent(event);
-
-                if (event.isCancelled()) {
-                    return true;
-                }
-
-                player.teleport(target);
-                player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", player.getName()));
-                target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", target.getName()));
-                mcMMOPlayer.getProfile().setRecentlyHurt(System.currentTimeMillis());
-            } else {
-                targetMcMMOPlayer.setPtpRequest(player);
-                targetMcMMOPlayer.actualizePtpTimeout();
-                player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
-
-                int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
-                target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
-                target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", ptpRequestExpire));
-            }
-        }
-        else {
-            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
-        }
+        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", ptpRequestExpire));
        return true;
    }

@@ -130,10 +103,6 @@ public class PtpCommand implements CommandExecutor {
            return true;
        }

-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.ptp.accept")) {
-            return true;
-        }
-
        int ptpRequestExpire = Config.getInstance().getPTPCommandTimeout();

        if ((mcMMOPlayer.getPtpTimeout() + ptpRequestExpire) * Misc.TIME_CONVERSION_FACTOR < System.currentTimeMillis()) {
@@ -142,50 +111,31 @@ public class PtpCommand implements CommandExecutor {
            return true;
        }

-        Player target = mcMMOPlayer.getPtpRequest();
+        target = mcMMOPlayer.getPtpRequest();

-        if (target == null) {
-            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+        if (!canTeleport(target.getName())) {
+            mcMMOPlayer.removePtpRequest();
            return true;
        }

-        if (target.isDead()) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
-            return true;
-        }
-
-        if(Config.getInstance().getPTPCommandWorldPermissions()) {
+        //TODO: Someone want to clarify what's going on with these dynamic permissions?
+        if (Config.getInstance().getPTPCommandWorldPermissions()) {
            String perm = "mcmmo.commands.ptp.world.";

-            if(!Permissions.hasDynamicPermission(target, perm + "all", "op")) {
-                if(!Permissions.hasDynamicPermission(target, perm + target.getWorld().getName(), "op")) {
+            if (!Permissions.hasDynamicPermission(target, perm + "all", "op")) {
+                if (!Permissions.hasDynamicPermission(target, perm + target.getWorld().getName(), "op")) {
                    return true;
                }
-                else if(target.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(target, perm + player.getWorld().getName(), "op")) {
+                else if (target.getWorld() != player.getWorld() && !Permissions.hasDynamicPermission(target, perm + player.getWorld().getName(), "op")) {
                    return true;
                }
            }
        }

-        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(target, player, mcMMOPlayer.getParty().getName());
-        plugin.getServer().getPluginManager().callEvent(event);
-
-        if (event.isCancelled()) {
-            return true;
-        }
-
-        target.teleport(player);
-        target.sendMessage(LocaleLoader.getString("Party.Teleport.Player", player.getName()));
-        player.sendMessage(LocaleLoader.getString("Party.Teleport.Target", target.getName()));
-        mcMMOPlayer.getProfile().setRecentlyHurt(System.currentTimeMillis());
-        return true;
+        return handlePartyTeleportEvent(target, player);
    }

    private boolean acceptAnyTeleportRequest() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.ptp.acceptall")) {
-            return true;
-        }
-
        if (mcMMOPlayer.getPtpConfirmRequired()) {
            player.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
        }
@@ -198,10 +148,6 @@ public class PtpCommand implements CommandExecutor {
    }

    private boolean togglePartyTeleportation() {
-        if (CommandHelper.noCommandPermissions(player, "mcmmo.commands.ptp.toggle")) {
-            return true;
-        }
-
        if (mcMMOPlayer.getPtpEnabled()) {
            player.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
        }
@@ -212,4 +158,59 @@ public class PtpCommand implements CommandExecutor {
        mcMMOPlayer.togglePtpUse();
        return true;
    }
+
+    private boolean canTeleport(String targetName) {
+        if (!mcMMO.p.getServer().getOfflinePlayer(targetName).isOnline()) {
+            player.sendMessage(LocaleLoader.getString("Party.NotOnline", targetName));
+            return false;
+        }
+
+        mcMMOTarget = Users.getPlayer(targetName);
+
+        if (mcMMOTarget == null) {
+            player.sendMessage(LocaleLoader.getString("Party.Player.Invalid"));
+            return false;
+        }
+
+        target = mcMMOTarget.getPlayer();
+
+        if (player.equals(target)) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
+            return false;
+        }
+
+        if (!PartyManager.inSameParty(player, target)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+            return false;
+        }
+
+        if (!mcMMOTarget.getPtpEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", target.getName()));
+            return false;
+        }
+
+        if (target.isDead()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean handlePartyTeleportEvent(Player player, Player target) {
+        McMMOPlayer mcMMOPlayer= Users.getPlayer(player);
+
+        McMMOPartyTeleportEvent event = new McMMOPartyTeleportEvent(player, target, mcMMOPlayer.getParty().getName());
+        mcMMO.p.getServer().getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) {
+            return true;
+        }
+
+        player.teleport(target);
+        player.sendMessage(LocaleLoader.getString("Party.Teleport.Player", target.getName()));
+        target.sendMessage(LocaleLoader.getString("Party.Teleport.Target", player.getName()));
+        mcMMOPlayer.getProfile().setRecentlyHurt(System.currentTimeMillis());
+        return true;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/party/runnables/PartiesLoader.java
+++ b/src/main/java/com/gmail/nossr50/party/runnables/PartiesLoader.java
@@ -0,0 +1,10 @@
+package com.gmail.nossr50.party.runnables;
+
+import com.gmail.nossr50.party.PartyManager;
+
+public class PartiesLoader implements Runnable {
+    @Override
+    public void run() {
+        PartyManager.loadParties();
+    }
+}
--- a/src/main/java/com/gmail/nossr50/skills/runnables/PartyAutoKick.java
+++ b/src/main/java/com/gmail/nossr50/skills/runnables/PartyAutoKick.java
@@ -1,14 +1,14 @@
-package com.gmail.nossr50.skills.runnables;
+package com.gmail.nossr50.party.runnables;

-import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.bukkit.OfflinePlayer;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.party.Party;
 import com.gmail.nossr50.party.PartyManager;

 public class PartyAutoKick implements Runnable {
-
    @Override
    public void run() {
        updatePartyMembers();
@@ -18,14 +18,13 @@ public class PartyAutoKick implements Runnable {
        long currentTime = System.currentTimeMillis();
        long kickTime = 24L * 60L * 60L * 1000L * Config.getInstance().getAutoPartyKickTime();

-        ArrayList<Party> parties = new ArrayList<Party>(PartyManager.getParties());
+        for (Iterator<Party> partyIterator = PartyManager.getParties().iterator(); partyIterator.hasNext();) {
+            Party party = partyIterator.next();

-        for (Party party : parties) {
-            ArrayList<String> members = new ArrayList<String>(party.getMembers());
-            for (String member : members) {
-                long lastPlayed = mcMMO.p.getServer().getOfflinePlayer(member).getLastPlayed();
+            for (Iterator<OfflinePlayer> memberIterator = party.getMembers().iterator(); memberIterator.hasNext();) {
+                OfflinePlayer member = memberIterator.next();

-                if (currentTime - lastPlayed > kickTime) {
+                if (currentTime - member.getLastPlayed() > kickTime) {
                    PartyManager.removeFromParty(member, party);
                }
            }
--- a/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java
+++ b/src/main/java/com/gmail/nossr50/runnables/McRankAsync.java
@@ -36,10 +36,10 @@ public class McRankAsync implements Runnable {
                    }

                    if (skills.get(skillType.name()) == null) {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")));
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.getSkillName(skillType), LocaleLoader.getString("Commands.mcrank.Unranked")));
                    }
                    else {
-                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.localizeSkillName(skillType), skills.get(skillType.name())));
+                        sender.sendMessage(LocaleLoader.getString("Commands.mcrank.Skill", SkillTools.getSkillName(skillType), skills.get(skillType.name())));
                    }
                }

--- a/src/main/java/com/gmail/nossr50/runnables/McTopAsync.java
+++ b/src/main/java/com/gmail/nossr50/runnables/McTopAsync.java
@@ -0,0 +1,66 @@
+package com.gmail.nossr50.runnables;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.database.Database;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.StringUtils;
+
+public class McTopAsync implements Runnable {
+
+    private CommandSender sender;
+    private String query;
+    private int page;
+    private Command command;
+
+    public McTopAsync(int page, String query, CommandSender sender, Command command) {
+        this.page = page;
+        this.query = query;
+        this.sender = sender;
+        this.command = command;
+    }
+
+    @Override
+    public void run() {
+        if (!query.equalsIgnoreCase("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
+            if (!sender.hasPermission("mcmmo.commands.mctop." + query.toLowerCase())) {
+                sender.sendMessage(command.getPermissionMessage());
+                return;
+            }
+        }
+        String tablePrefix = Config.getInstance().getMySQLTablePrefix();
+        final HashMap<Integer, ArrayList<String>> userslist = Database.read("SELECT " + query + ", user, NOW() FROM " + tablePrefix + "users JOIN " + tablePrefix + "skills ON (user_id = id) WHERE " + query + " > 0 ORDER BY " + query + " DESC, user LIMIT " + ((page * 10) - 10) + ",10");
+        Bukkit.getScheduler().scheduleSyncDelayedTask(mcMMO.p, new Runnable() {
+            @Override
+            public void run() {
+                if (query.equals("taming+mining+woodcutting+repair+unarmed+herbalism+excavation+archery+swords+axes+acrobatics+fishing")) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Leaderboard"));
+                } else {
+                    sender.sendMessage(LocaleLoader.getString("Commands.Skill.Leaderboard", StringUtils.getCapitalized(query)));
+                }
+
+                int place = (page * 10) - 9;
+                for (int i = 1; i <= 10; i++) {
+                    if (userslist.get(i) == null) {
+                        break;
+                    }
+
+                    // Format: 1. Playername - skill value
+                    sender.sendMessage(place + ". " + ChatColor.GREEN + userslist.get(i).get(1) + " - " + ChatColor.WHITE + userslist.get(i).get(0));
+                    place++;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.mctop.Tip"));
+            }
+        }, 1L);
+    }
+
+}
--- a/src/main/java/com/gmail/nossr50/skills/SkillCommand.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillCommand.java
@@ -13,7 +13,7 @@ import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.Users;

 public abstract class SkillCommand implements CommandExecutor {
@@ -31,7 +31,7 @@ public abstract class SkillCommand implements CommandExecutor {

    public SkillCommand(SkillType skill) {
        this.skill = skill;
-        this.skillString = Misc.getCapitalized(skill.toString());
+        this.skillString = StringUtils.getCapitalized(skill.toString());
    }

    @Override
@@ -49,8 +49,8 @@ public abstract class SkillCommand implements CommandExecutor {
        }

        skillValue = profile.getSkillLevel(skill);
-        isLucky = Permissions.lucky(player, skill);
-        hasEndurance = (Permissions.activationTwelve(player) || Permissions.activationEight(player) || Permissions.activationFour(player));
+        isLucky = player.hasPermission("mcmmo.perks.lucky." + skill.toString().toLowerCase());
+        hasEndurance = (player.hasPermission("mcmmo.perks.activationtime.twelveseconds") || player.hasPermission("mcmmo.perks.activationtime.eightseconds") || player.hasPermission("mcmmo.perks.activationtime.fourseconds"));

        dataCalculations();
        permissionsCheck();
@@ -127,13 +127,13 @@ public abstract class SkillCommand implements CommandExecutor {
        int length = 2 + (int) (skillValue / Misc.abilityLengthIncreaseLevel);
        int enduranceLength = 0;

-        if (Permissions.activationTwelve(player)) {
+        if (player.hasPermission("mcmmo.perks.activationtime.twelveseconds")) {
            enduranceLength = length + 12;
        }
-        else if (Permissions.activationEight(player)) {
+        else if (player.hasPermission("mcmmo.perks.activationtime.eightseconds")) {
            enduranceLength = length + 8;
        }
-        else if (Permissions.activationFour(player)) {
+        else if (player.hasPermission("mcmmo.perks.activationtime.fourseconds")) {
            enduranceLength = length + 4;
        }

@@ -153,7 +153,7 @@ public abstract class SkillCommand implements CommandExecutor {
    protected void luckyEffectsDisplay() {
        if (isLucky) {
            String perkPrefix = LocaleLoader.getString("MOTD.PerksPrefix");
-            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillTools.localizeSkillName(skill))));
+            player.sendMessage(perkPrefix + LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Perks.lucky.name"), LocaleLoader.getString("Perks.lucky.desc", SkillTools.getSkillName(skill))));
        }
    }

--- a/src/main/java/com/gmail/nossr50/skills/SkillGuide.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillGuide.java
@@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;

 public final class SkillGuide {
    private SkillGuide() {}
@@ -50,15 +50,13 @@ public final class SkillGuide {
    }

    public static void clearChat(Player player) {
-        for (int x = 0; x < 20; x++) {
-            player.sendMessage("");
-        }
+        player.sendMessage("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
    }

    public static boolean grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
        String skillName = skilltype.toString();
-        String capitalized = Misc.getCapitalized(skillName);
-        String localized = SkillTools.localizeSkillName(skilltype);
+        String capitalized = StringUtils.getCapitalized(skillName);
+        String localized = SkillTools.getSkillName(skilltype);
        player.sendMessage(LocaleLoader.getString("Guides.Available", localized, localized.toLowerCase()));

        String address = "Guides." + capitalized;
@@ -84,19 +82,19 @@ public final class SkillGuide {
        case 2:
            int totalPages = SkillGuide.getTotalPageNumber(address);

-            if (!Misc.isInt(args[1])) {
+            if (!StringUtils.isInt(args[1])) {
                player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));
                return true;
            }

-            if (Misc.getInt(args[1]) > totalPages) {
+            if (Integer.parseInt(args[1]) > totalPages) {
                player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", totalPages));
                return true;
            }

            SkillGuide.clearChat(player);

-            for (String target : SkillGuide.grabPageContents(localized, address, Misc.getInt(args[1]))) {
+            for (String target : SkillGuide.grabPageContents(localized, address, Integer.parseInt(args[1]))) {
                player.sendMessage(target);
            }

--- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.skills;

 import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

 public abstract class SkillManager {
@@ -13,7 +13,7 @@ public abstract class SkillManager {
    public SkillManager(McMMOPlayer mcMMOPlayer, SkillType skill) {
        this.mcMMOPlayer = mcMMOPlayer;
        this.skillLevel = mcMMOPlayer.getProfile().getSkillLevel(skill);
-        this.activationChance = Misc.calculateActivationChance(Permissions.lucky(mcMMOPlayer.getPlayer(), skill));
+        this.activationChance = SkillTools.calculateActivationChance(Permissions.lucky(mcMMOPlayer.getPlayer(), skill));
    }

    public McMMOPlayer getMcMMOPlayer() {
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java
@@ -22,4 +22,4 @@ public class Acrobatics {

    public static boolean afkLevelingDisabled = Config.getInstance().getAcrobaticsAFKDisabled();
    public static boolean dodgeLightningDisabled = Config.getInstance().getDodgeLightningDisabled();
-}
+}
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/DodgeEventHandler.java
@@ -4,6 +4,7 @@ import org.bukkit.event.entity.EntityDamageEvent;

 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;

@@ -17,7 +18,7 @@ public class DodgeEventHandler extends AcrobaticsEventHandler {

    @Override
    protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Acrobatics.dodgeMaxBonusLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Acrobatics.dodgeMaxBonusLevel);
    }

    @Override
--- a/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/acrobatics/RollEventHandler.java
@@ -4,8 +4,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;

 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

 public class RollEventHandler extends AcrobaticsEventHandler {
@@ -29,7 +29,7 @@ public class RollEventHandler extends AcrobaticsEventHandler {
            skillModifer = skillModifer * 2;
        }

-        skillModifer = Misc.skillCheck(skillModifer, Acrobatics.rollMaxBonusLevel);
+        skillModifer = SkillTools.skillCheck(skillModifer, Acrobatics.rollMaxBonusLevel);
        this.skillModifier = skillModifer;
    }

--- a/src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/ArrowTrackingEventHandler.java
@@ -2,7 +2,7 @@ package com.gmail.nossr50.skills.archery;

 import org.bukkit.entity.LivingEntity;

-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.utilities.SkillTools;

 public class ArrowTrackingEventHandler {
    private ArcheryManager manager;
@@ -18,7 +18,7 @@ public class ArrowTrackingEventHandler {
    }

    protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.retrieveMaxBonusLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Archery.retrieveMaxBonusLevel);
    }

    protected void addToTracker() {
--- a/src/main/java/com/gmail/nossr50/skills/archery/DazeEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/DazeEventHandler.java
@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageEvent;

 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.util.Misc;

 public class DazeEventHandler {
@@ -25,7 +26,7 @@ public class DazeEventHandler {
    }

    protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Archery.dazeMaxBonusLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Archery.dazeMaxBonusLevel);
    }

    protected void handleDazeEffect() {
--- a/src/main/java/com/gmail/nossr50/skills/axes/AxeBonusDamageEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/axes/AxeBonusDamageEventHandler.java
@@ -28,4 +28,4 @@ public class AxeBonusDamageEventHandler {

        event.setDamage(damage + damageBonus);
    }
-}
+}
--- a/src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/axes/AxeManager.java
@@ -49,10 +49,7 @@ public class AxeManager extends SkillManager {
    public void impact(EntityDamageByEntityEvent event, LivingEntity target) {
        ImpactEventHandler eventHandler = new ImpactEventHandler(this, event, target);

-        if (Misc.hasArmor(target)) {
-            eventHandler.damageArmor();
-        }
-        else {
+        if (!eventHandler.applyImpact()) {
            eventHandler.applyGreaterImpact();
        }
    }
--- a/src/main/java/com/gmail/nossr50/skills/axes/CriticalHitEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/axes/CriticalHitEventHandler.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;

 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.utilities.SkillTools;

 public class CriticalHitEventHandler {
    private AxeManager manager;
@@ -42,6 +42,6 @@ public class CriticalHitEventHandler {
    }

    private void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Axes.criticalHitMaxBonusLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Axes.criticalHitMaxBonusLevel);
    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/axes/ImpactEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/axes/ImpactEventHandler.java
@@ -8,6 +8,8 @@ import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.mods.ModChecks;
+import com.gmail.nossr50.util.ItemChecks;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

@@ -16,38 +18,54 @@ public class ImpactEventHandler {
    private Player player;
    private EntityDamageByEntityEvent event;
    private short durabilityDamage = 1;
-    private EntityEquipment equipment;
-    private ItemStack[] armorContents;
+    private EntityEquipment entityEquipment;
    protected LivingEntity defender;
+    boolean impactApplied;

    public ImpactEventHandler(AxeManager manager, EntityDamageByEntityEvent event, LivingEntity defender) {
        this.manager = manager;
        this.player = manager.getMcMMOPlayer().getPlayer();
        this.event = event;
        this.defender = defender;
-        this.equipment = defender.getEquipment();
-        this.armorContents = equipment.getArmorContents();
+        this.entityEquipment = defender.getEquipment();
    }

-    protected void damageArmor() {
+    protected boolean applyImpact() {
        // Every 50 Skill Levels you gain 1 durability damage (default values)
        durabilityDamage += (short) (manager.getSkillLevel() / Axes.impactIncreaseLevel);
+        // getArmorContents.length can't be used because it's always equal to 4 (no armor = air block)
+        boolean hasArmor = false;

-        for (ItemStack armor : armorContents) {
-            if (Misc.getRandom().nextInt(100) > 75) {
+        for (ItemStack itemStack : entityEquipment.getArmorContents()) {
+            if (ItemChecks.isArmor(itemStack)) {
+                hasArmor = true;

-                for (int i = 0; i <= durabilityDamage; i++) {
-                    if (armor.containsEnchantment(Enchantment.DURABILITY)) {
-                        handleDurabilityEnchantment(armor);
-                    }
+                if (Misc.getRandom().nextInt(100) < 25) {
+                    damageArmor(itemStack);
                }
-
-                damageValidation(armor);
-                armor.setDurability((short) (armor.getDurability() + durabilityDamage));
            }
        }

-        equipment.setArmorContents(armorContents);
+        return hasArmor;
+    }
+
+    private void damageArmor(ItemStack armor) {
+        // Modifier simulate the durability enchantment behavior
+        float modifier = 1;
+
+        if (armor.containsEnchantment(Enchantment.DURABILITY)) {
+            modifier /= armor.getEnchantmentLevel(Enchantment.DURABILITY) + 1;
+        }
+
+        float modifiedDurabilityDamage = durabilityDamage * modifier;
+        short maxDurabilityDamage = ModChecks.isCustomArmor(armor) ? ModChecks.getArmorFromItemStack(armor).getDurability() : armor.getType().getMaxDurability();
+        maxDurabilityDamage *= Axes.impactMaxDurabilityDamageModifier;
+
+        if (modifiedDurabilityDamage > maxDurabilityDamage) {
+            modifiedDurabilityDamage = maxDurabilityDamage;
+        }
+
+        armor.setDurability((short) (modifiedDurabilityDamage + armor.getDurability()));
    }

    protected void applyGreaterImpact() {
@@ -73,20 +91,4 @@ public class ImpactEventHandler {
            ((Player) defender).sendMessage(LocaleLoader.getString("Axes.Combat.GI.Struck"));
        }
    }
-
-    private void handleDurabilityEnchantment(ItemStack armor) {
-        int enchantmentLevel = armor.getEnchantmentLevel(Enchantment.DURABILITY);
-
-        if (Misc.getRandom().nextInt(enchantmentLevel + 1) > 0) {
-            durabilityDamage--;
-        }
-    }
-
-    private void damageValidation(ItemStack armor) {
-        short maxDurability = (short) (armor.getType().getMaxDurability() * Axes.impactMaxDurabilityDamageModifier);
-
-        if (durabilityDamage > maxDurability) {
-            durabilityDamage = maxDurability;
-        }
-    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java
+++ b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java
@@ -5,16 +5,13 @@ import java.util.List;

 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.TreasuresConfig;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
-import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
 import com.gmail.nossr50.mods.ModChecks;
 import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
@@ -109,7 +106,7 @@ public class Excavation {

            for (ExcavationTreasure treasure : treasures) {
                if (mcMMOPlayer.getProfile().getSkillLevel(SkillType.EXCAVATION) >= treasure.getDropLevel()) {
-                    int activationChance = Misc.calculateActivationChance(Permissions.luckyExcavation(player));
+                    int activationChance = SkillTools.calculateActivationChance(Permissions.luckyExcavation(player));

                    if (Misc.getRandom().nextDouble() * activationChance <= treasure.getDropChance()) {
                        xp += treasure.getXp();
@@ -128,19 +125,8 @@ public class Excavation {
     * @param mcMMOPlayer The player using the ability
     * @param block The block to check
     */
-    public static void gigaDrillBreaker(McMMOPlayer mcMMOplayer, Block block) {
-        Player player = mcMMOplayer.getPlayer();
-
-        SkillTools.abilityDurabilityLoss(player.getItemInHand(), Misc.toolDurabilityLoss);
-
-        if (!mcMMO.placeStore.isTrue(block) && Misc.blockBreakSimulate(block, player, true)) {
-            FakePlayerAnimationEvent armswing = new FakePlayerAnimationEvent(player);
-            mcMMO.p.getServer().getPluginManager().callEvent(armswing);
-
-            Excavation.excavationProcCheck(block, mcMMOplayer);
-            Excavation.excavationProcCheck(block, mcMMOplayer);
-        }
-
-        player.playSound(block.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.POP_PITCH);
-    }
+    public static void gigaDrillBreaker(McMMOPlayer mcMMOPlayer, Block block) {
+        Excavation.excavationProcCheck(block, mcMMOPlayer);
+        Excavation.excavationProcCheck(block, mcMMOPlayer);
+   }
 }
--- a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
@@ -160,7 +160,7 @@ public final class Fishing {

        FishingTreasure treasure = rewards.get(Misc.getRandom().nextInt(rewards.size()));
        ItemStack treasureDrop = treasure.getDrop();
-        int activationChance = Misc.calculateActivationChance(Permissions.luckyFishing(player));
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyFishing(player));

        if (Misc.getRandom().nextDouble() * activationChance > treasure.getDropChance()) {
            return null;
@@ -189,7 +189,7 @@ public final class Fishing {
            return false;
        }

-        int activationChance = Misc.calculateActivationChance(Permissions.luckyFishing(player));
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyFishing(player));

        if (storm) {
            activationChance = (int) (activationChance * 0.909);
--- a/src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/ShakeMob.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;

+import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -17,6 +18,7 @@ import org.bukkit.potion.PotionType;

 import com.gmail.nossr50.skills.fishing.Fishing.Tier;
 import com.gmail.nossr50.skills.utilities.CombatTools;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

@@ -31,7 +33,7 @@ public final class ShakeMob {
     * @param skillLevel Fishing level of the player
     */
    public static void process(Player player, LivingEntity mob, int skillLevel) {
-        int activationChance = Misc.calculateActivationChance(Permissions.luckyFishing(player));
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyFishing(player));

        if (getShakeProbability(skillLevel) <= Misc.getRandom().nextInt(activationChance)) {
            return;
@@ -86,6 +88,7 @@ public final class ShakeMob {
                    break;
                }
            }
+            break;

        default:
            break;
@@ -138,7 +141,7 @@ public final class ShakeMob {
            possibleDrops.put(new ItemStack(Material.RED_ROSE), 85);
            break;
        case MAGMA_CUBE:
-            possibleDrops.put(new ItemStack(Material.MAGMA_CREAM), 3);
+            possibleDrops.put(new ItemStack(Material.MAGMA_CREAM), 100);
            break;
        case MUSHROOM_COW:
            possibleDrops.put(new ItemStack(Material.MILK_BUCKET), 5);
@@ -148,7 +151,7 @@ public final class ShakeMob {
            possibleDrops.put(new ItemStack(Material.RED_MUSHROOM, Misc.getRandom().nextInt(3) + 1), 30);
            break;
        case PIG:
-            possibleDrops.put(new ItemStack(Material.PORK), 3);
+            possibleDrops.put(new ItemStack(Material.PORK), 100);
            break;
        case PIG_ZOMBIE:
            possibleDrops.put(new ItemStack(Material.ROTTEN_FLESH), 50);
@@ -170,7 +173,7 @@ public final class ShakeMob {
            possibleDrops.put(new ItemStack(Material.SNOW_BALL, Misc.getRandom().nextInt(4) + 1), 97);
            break;
        case SQUID:
-            possibleDrops.put(new ItemStack(Material.INK_SACK), 100); // TODO: Add DyeColor.BLACK.getDyeData() to make it more explicit (available since 1.4.7-R0.1)
+            possibleDrops.put(new ItemStack(Material.INK_SACK, 1, DyeColor.BLACK.getDyeData()), 100);
            break;
        case WITCH:
            possibleDrops.put(new Potion(PotionType.INSTANT_HEAL).toItemStack(1), 1);
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/GreenThumbTimer.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/GreenThumbTimer.java
@@ -3,8 +3,9 @@ package com.gmail.nossr50.skills.herbalism;
 import org.bukkit.CropState;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.material.CocoaPlant;
+import org.bukkit.material.CocoaPlant.CocoaPlantSize;

-import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.skills.utilities.AbilityType;
 import com.gmail.nossr50.skills.utilities.SkillType;
@@ -22,12 +23,10 @@ public class GreenThumbTimer implements Runnable {

    @Override
    public void run() {
-        if (this.block.getType() != this.type) {
-            this.block.setType(this.type);
-        }
+        this.block.setType(this.type);

        int skillLevel = this.profile.getSkillLevel(SkillType.HERBALISM);
-        int greenThumbStage = (int) ((double) skillLevel / (double) AdvancedConfig.getInstance().getGreenThumbStageChange());
+        int greenThumbStage = skillLevel / Herbalism.greenThumbStageChangeLevel;

        if (greenThumbStage > 4) {
            greenThumbStage = 4;
@@ -39,18 +38,7 @@ public class GreenThumbTimer implements Runnable {
        case POTATO:
            //This replants the wheat at a certain stage in development based on Herbalism Skill
            if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
-                if (greenThumbStage == 3) {
-                    this.block.setData(CropState.MEDIUM.getData());
-                }
-                else if (greenThumbStage == 2) {
-                    this.block.setData(CropState.SMALL.getData());
-                }
-                else if (greenThumbStage == 1) {
-                    this.block.setData(CropState.VERY_SMALL.getData());
-                }
-                else {
-                    this.block.setData(CropState.GERMINATED.getData());
-                }
+                this.block.setData((byte) greenThumbStage);
            }
            else {
                this.block.setData(CropState.MEDIUM.getData());
@@ -59,34 +47,37 @@ public class GreenThumbTimer implements Runnable {
        case NETHER_WARTS:
            if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
                if (greenThumbStage == 3) {
-                    this.block.setData((byte) 2);
+                    this.block.setData((byte) 0x2);
                }
                else if (greenThumbStage == 2) {
-                    this.block.setData((byte) 1);
+                    this.block.setData((byte) 0x1);
                }
                else {
-                    this.block.setData((byte) 0);
+                    this.block.setData((byte) 0x0);
                }
            }
            else {
-                this.block.setData((byte) 2);
+                this.block.setData((byte) 0x2);
            }
            break;
        case COCOA:
+            CocoaPlant plant = (CocoaPlant) block.getState().getData();
+
            if (!this.profile.getAbilityMode(AbilityType.GREEN_TERRA)) {
                if (greenThumbStage == 3) {
-                    this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4)));
+                    plant.setSize(CocoaPlantSize.MEDIUM);
                }
                else if (greenThumbStage == 2) {
-                    this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4)));
+                    plant.setSize(CocoaPlantSize.MEDIUM);
                }
                else {
-                    this.block.setData((byte) (this.block.getData() ^ ((byte) 0xc)));
+                    plant.setSize(CocoaPlantSize.SMALL);
                }
            }
            else {
-                this.block.setData((byte) ((this.block.getData() ^ ((byte) 0xc)) | ((byte) 4)));
+                plant.setSize(CocoaPlantSize.MEDIUM);
            }
+            block.setData(plant.getData());
            break;
        default:
            break;
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java
@@ -146,7 +146,7 @@ public class Herbalism {
     * @param event The event to use for Green Thumb
     * @param plugin mcMMO plugin instance
     */
-    public static void herbalismProcCheck(final Block block, McMMOPlayer mcMMOPlayer, BlockBreakEvent event, mcMMO plugin) {
+    public static void herbalismProcCheck(final Block block, McMMOPlayer mcMMOPlayer, mcMMO plugin) {
        Player player = mcMMOPlayer.getPlayer();

        if (Config.getInstance().getHerbalismAFKDisabled() && player.isInsideVehicle()) {
@@ -174,7 +174,7 @@ public class Herbalism {
                dropItem = herbalismBlock.getDropItem();
                xp = herbalismBlock.getXpGain();

-                greenThumbWheat(block, player, event, plugin);
+                greenThumbWheat(block, player, plugin);
            }
            else {
                if (!mcMMO.placeStore.isTrue(block)) {
@@ -190,8 +190,8 @@ public class Herbalism {
        }

        if (Permissions.herbalismDoubleDrops(player)) {
-            int activationChance = Misc.calculateActivationChance(Permissions.luckyHerbalism(player));
-            double chance = (doubleDropsMaxChance / doubleDropsMaxLevel) * Misc.skillCheck(herbLevel, doubleDropsMaxLevel);
+            int activationChance = SkillTools.calculateActivationChance(Permissions.luckyHerbalism(player));
+            double chance = (doubleDropsMaxChance / doubleDropsMaxLevel) * SkillTools.skillCheck(herbLevel, doubleDropsMaxLevel);

            if (chance > Misc.getRandom().nextInt(activationChance)) {
                Location location = block.getLocation();
@@ -223,12 +223,11 @@ public class Herbalism {
     * @param event The event triggering the ability
     * @param plugin mcMMO plugin instance
     */
-    private static void greenThumbWheat(Block block, Player player, BlockBreakEvent event, mcMMO plugin) {
+    private static void greenThumbWheat(Block block, Player player, mcMMO plugin) {
        PlayerProfile profile = Users.getPlayer(player).getProfile();
        int herbLevel = profile.getSkillLevel(SkillType.HERBALISM);
        PlayerInventory inventory = player.getInventory();
        boolean hasSeeds = false;
-        Location location = block.getLocation();
        Material type = block.getType();

        switch(type) {
@@ -236,15 +235,7 @@ public class Herbalism {
            hasSeeds = inventory.contains(Material.SEEDS);
            break;
        case COCOA:
-            try {
-                hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 1);
-            }
-            catch(Exception e) {
-                hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, (short) 3), 1);
-            }
-            catch(NoSuchMethodError e) {
-                hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, (short) 3), 1);
-            }
+            hasSeeds = inventory.containsAtLeast(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 1);
            break;
        case CARROT:
            hasSeeds = inventory.contains(Material.CARROT_ITEM);
@@ -259,55 +250,39 @@ public class Herbalism {
            break;
        }

-        int activationChance = Misc.calculateActivationChance(Permissions.luckyHerbalism(player));
+        if (!hasSeeds) {
+            return;
+        }

-        float chance = (float) ((greenThumbMaxChance / greenThumbMaxLevel) * herbLevel);
-        if (chance > greenThumbMaxChance) chance = (float) greenThumbMaxChance;
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyHerbalism(player));
+        float chance = (float) (greenThumbMaxChance / greenThumbMaxLevel * herbLevel);

-        if (hasSeeds && profile.getAbilityMode(AbilityType.GREEN_TERRA) || hasSeeds && (chance > Misc.getRandom().nextInt(activationChance))) {
-            event.setCancelled(true);
+        if (chance > greenThumbMaxChance) {
+            chance = (float) greenThumbMaxChance;
+        }

+        if (profile.getAbilityMode(AbilityType.GREEN_TERRA) || chance > Misc.getRandom().nextInt(activationChance)) {
            switch(type) {
            case CROPS:
-                Misc.dropItem(location, new ItemStack(Material.WHEAT));
-                Misc.randomDropItems(location, new ItemStack(Material.SEEDS), 50, 3);
                inventory.removeItem(new ItemStack(Material.SEEDS));
                break;
            case COCOA:
-                try {
-                    Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), 3);
-                    inventory.removeItem(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()));
-                }
-                catch(Exception e) {
-                    Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3);
-                    inventory.removeItem(new ItemStack(Material.INK_SACK, 1, (short) 3));
-                }
-                catch(NoSuchMethodError e) {
-                    Misc.dropItems(location, new ItemStack(Material.INK_SACK, 1, (short) 3), 3);
-                    inventory.removeItem(new ItemStack(Material.INK_SACK, 1, (short) 3));
-                }
+                inventory.removeItem(new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()));
                break;
            case CARROT:
-                Misc.dropItem(location, new ItemStack(Material.CARROT_ITEM));
-                Misc.randomDropItems(location, new ItemStack(Material.CARROT_ITEM), 50, 3);
                inventory.removeItem(new ItemStack(Material.CARROT_ITEM));
                break;
            case POTATO:
-                Misc.dropItem(location, new ItemStack(Material.POTATO_ITEM));
-                Misc.randomDropItems(location, new ItemStack(Material.POTATO_ITEM), 50, 3);
-                Misc.randomDropItem(location, new ItemStack(Material.POISONOUS_POTATO), 2);
                inventory.removeItem(new ItemStack(Material.POTATO_ITEM));
                break;
            case NETHER_WARTS:
-                Misc.dropItems(location, new ItemStack(Material.NETHER_STALK), 2);
-                Misc.randomDropItems(location, new ItemStack(Material.NETHER_STALK), 50, 2);
                inventory.removeItem(new ItemStack(Material.NETHER_STALK));
                break;
            default:
                break;
            }

-            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new GreenThumbTimer(block, profile, type), 1);
+            plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new GreenThumbTimer(block, profile, type), 0);
            player.updateInventory();   // Needed until replacement available
        }
    }
@@ -326,7 +301,7 @@ public class Herbalism {

        player.setItemInHand(new ItemStack(Material.SEEDS, seeds - 1));

-        int activationChance = Misc.calculateActivationChance(Permissions.luckyHerbalism(player));
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyHerbalism(player));

        float chance = (float) ((greenThumbMaxChance / greenThumbMaxLevel) * skillLevel);
        if (chance > greenThumbMaxChance) chance = (float) greenThumbMaxChance;
@@ -342,8 +317,8 @@ public class Herbalism {
    public static void hylianLuck(Block block, Player player, BlockBreakEvent event) {
        int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(SkillType.HERBALISM);

-        double chance = (hylianLuckMaxChance / hylianLuckMaxLevel) * Misc.skillCheck(skillLevel, hylianLuckMaxLevel);
-        int activationChance = Misc.calculateActivationChance(Permissions.luckyHerbalism(player));
+        double chance = (hylianLuckMaxChance / hylianLuckMaxLevel) * SkillTools.skillCheck(skillLevel, hylianLuckMaxLevel);
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyHerbalism(player));

        if (chance > Misc.getRandom().nextInt(activationChance)) {
            List<HylianTreasure> treasures = new ArrayList<HylianTreasure>();
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismBlock.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismBlock.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.skills.herbalism;

 import java.util.Map;

+import org.bukkit.DyeColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -15,7 +16,7 @@ public enum HerbalismBlock {
    BROWN_MUSHROOM(Material.BROWN_MUSHROOM, Config.getInstance().getHerbalismXPMushrooms(), Config.getInstance().getBrownMushroomsDoubleDropsEnabled()),
    CACTUS(Material.CACTUS, Config.getInstance().getHerbalismXPCactus(), Config.getInstance().getCactiDoubleDropsEnabled()),
    CARROT(Material.CARROT, Material.CARROT_ITEM, Config.getInstance().getHerbalismXPCarrot(), Config.getInstance().getCarrotDoubleDropsEnabled()),
-    COCOA(Material.COCOA, new ItemStack(Material.INK_SACK, 1, (short) 3), Config.getInstance().getHerbalismXPCocoa(), Config.getInstance().getCocoaDoubleDropsEnabled()), //Change to DyeColor.BROWN once we remove backwards compatibility
+    COCOA(Material.COCOA, new ItemStack(Material.INK_SACK, 1, DyeColor.BROWN.getDyeData()), Config.getInstance().getHerbalismXPCocoa(), Config.getInstance().getCocoaDoubleDropsEnabled()),
    CROPS(Material.CROPS, Material.WHEAT, Config.getInstance().getHerbalismXPWheat(), Config.getInstance().getWheatDoubleDropsEnabled()),
    MELON_BLOCK(Material.MELON_BLOCK, Material.MELON, Config.getInstance().getHerbalismXPMelon(), Config.getInstance().getMelonsDoubleDropsEnabled()),
    NETHER_WARTS(Material.NETHER_WARTS, Material.NETHER_STALK, Config.getInstance().getHerbalismXPNetherWart(), Config.getInstance().getNetherWartsDoubleDropsEnabled()),
--- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java
+++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismCommand.java
@@ -40,7 +40,7 @@ public class HerbalismCommand extends SkillCommand {
        farmersDietRank = calculateRank(Herbalism.farmersDietMaxLevel, Herbalism.farmersDietRankLevel1);

        //GREEN THUMB
-        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageMaxLevel);
+        greenThumbStage = calculateRank(Herbalism.greenThumbStageMaxLevel, Herbalism.greenThumbStageChangeLevel);

        String[] greenThumbStrings = calculateAbilityDisplayValues(Herbalism.greenThumbMaxLevel, Herbalism.greenThumbMaxChance);
        greenThumbChance = greenThumbStrings[0];
--- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java
@@ -244,16 +244,7 @@ public class Mining {

        case LAPIS_ORE:
            if (config.getLapisDoubleDropsEnabled()) {
-                try {
-                    item = (new MaterialData(Material.INK_SACK, DyeColor.BLUE.getDyeData())).toItemStack(1);
-                }
-                catch(Exception e) {
-                    item = (new MaterialData(Material.INK_SACK, (byte) 4)).toItemStack(1);
-                }
-                catch(NoSuchMethodError e) {
-                    item = (new MaterialData(Material.INK_SACK, (byte) 4)).toItemStack(1);
-                }
-
+                item = new ItemStack(Material.INK_SACK, 1, DyeColor.BLUE.getDyeData());
                Misc.dropItems(location, item, 4);
                Misc.randomDropItems(location, item, 50, 4);
            }
--- a/src/main/java/com/gmail/nossr50/skills/mining/MiningBlockEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningBlockEventHandler.java
@@ -5,7 +5,7 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;

-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.utilities.SkillTools;

 public class MiningBlockEventHandler {
    private MiningManager manager;
@@ -24,7 +24,7 @@ public class MiningBlockEventHandler {
    }

    private void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Mining.doubleDropsMaxLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Mining.doubleDropsMaxLevel);
    }

    /**
--- a/src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningCommand.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.skills.mining;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.SkillCommand;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

 public class MiningCommand extends SkillCommand {
@@ -156,7 +155,7 @@ public class MiningCommand extends SkillCommand {
                player.sendMessage(LocaleLoader.getString("Ability.Generic.Template.Lock", LocaleLoader.getString("Mining.Ability.Locked.0", BlastMining.rank1)));
            }
            else {
-                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Misc.getInt(blastMiningRank) - 1))));
+                player.sendMessage(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, LocaleLoader.getString("Mining.Blast.Effect." + (Integer.parseInt(blastMiningRank) - 1))));
            }
        }

--- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
@@ -7,7 +7,6 @@ import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.skills.utilities.SkillType;
@@ -122,26 +121,4 @@ public class MiningManager extends SkillManager{
            eventHandler.processDrops();
        }
    }
-
-    /**
-     * Handle the Super Breaker ability.
-     *
-     * @param block The block being affected
-     */
-    public void superBreakerBlockCheck(Block block) {
-        if (mcMMO.placeStore.isTrue(block) || !Misc.blockBreakSimulate(block, mcMMOPlayer.getPlayer(), true)) {
-            return;
-        }
-
-        SuperBreakerEventHandler eventHandler = new SuperBreakerEventHandler(this, block);
-
-        if (!eventHandler.tierCheck()) {
-            return;
-        }
-
-        eventHandler.callFakeArmswing();
-        eventHandler.processDurabilityLoss();
-        eventHandler.processDropsAndXP();
-        eventHandler.playSound();
-    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/RemoteDetonationEventHandler.java
@@ -55,7 +55,7 @@ public class RemoteDetonationEventHandler {
    protected void sendMessages() {
        Player player = manager.getMcMMOPlayer().getPlayer();

-        Misc.sendSkillMessage(player, AbilityType.BLAST_MINING.getAbilityPlayer(player));
+        SkillTools.sendSkillMessage(player, AbilityType.BLAST_MINING.getAbilityPlayer(player));
        player.sendMessage(LocaleLoader.getString("Mining.Blast.Boom"));
    }

--- a/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/SuperBreakerEventHandler.java
@@ -1,113 +0,0 @@
-package com.gmail.nossr50.skills.mining;
-
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.events.fake.FakePlayerAnimationEvent;
-import com.gmail.nossr50.mods.ModChecks;
-import com.gmail.nossr50.skills.utilities.SkillTools;
-import com.gmail.nossr50.util.Misc;
-
-public class SuperBreakerEventHandler {
-    private MiningManager manager;
-    private Block block;
-    private Material blockType;
-    private boolean customBlock;
-    private ItemStack heldItem;
-    private int tier;
-    private int durabilityLoss;
-    private FakePlayerAnimationEvent armswing;
-
-    protected SuperBreakerEventHandler (MiningManager manager, Block block) {
-        this.manager = manager;
-        this.block = block;
-        this.blockType = block.getType();
-        this.customBlock = ModChecks.isCustomMiningBlock(block);
-        Player player = manager.getMcMMOPlayer().getPlayer();
-        this.heldItem = player.getItemInHand();
-        this.tier = Misc.getTier(heldItem);
-        this.armswing = new FakePlayerAnimationEvent(player);
-
-        calculateDurabilityLoss();
-    }
-
-    protected void callFakeArmswing() {
-        mcMMO.p.getServer().getPluginManager().callEvent(armswing);
-    }
-
-    protected void processDurabilityLoss() {
-        SkillTools.abilityDurabilityLoss(heldItem, durabilityLoss);
-    }
-
-    protected void processDropsAndXP() {
-        manager.miningBlockCheck(block);
-    }
-
-    protected void playSound() {
-        manager.getMcMMOPlayer().getPlayer().playSound(block.getLocation(), Sound.ITEM_PICKUP, Misc.POP_VOLUME, Misc.POP_PITCH);
-    }
-
-    /**
-     * Check for the proper tier of item for use with Super Breaker.
-     *
-     * @return True if the item is the required tier or higher, false otherwise
-     */
-    protected boolean tierCheck() {
-        if (customBlock) {
-            if (ModChecks.getCustomBlock(block).getTier() < tier) {
-                return false;
-            }
-
-            return true;
-        }
-
-        switch (blockType) {
-        case OBSIDIAN:
-            if (tier < Mining.DIAMOND_TOOL_TIER) {
-                return false;
-            }
-            /* FALL THROUGH */
-
-        case DIAMOND_ORE:
-        case GLOWING_REDSTONE_ORE:
-        case GOLD_ORE:
-        case LAPIS_ORE:
-        case REDSTONE_ORE:
-        case EMERALD_ORE:
-            if (tier < Mining.IRON_TOOL_TIER) {
-                return false;
-            }
-            /* FALL THROUGH */
-
-        case IRON_ORE:
-            if (tier < Mining.STONE_TOOL_TIER) {
-                return false;
-            }
-            /* FALL THROUGH */
-
-        case COAL_ORE:
-        case ENDER_STONE:
-        case GLOWSTONE:
-        case MOSSY_COBBLESTONE:
-        case NETHERRACK:
-        case SANDSTONE:
-        case STONE:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    private void calculateDurabilityLoss() {
-        this.durabilityLoss = Misc.toolDurabilityLoss;
-
-        if (blockType == Material.OBSIDIAN) {
-            durabilityLoss = durabilityLoss * 5;
-        }
-    }
-}
--- a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/Repair.java
@@ -17,6 +17,7 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -109,7 +110,7 @@ public class Repair {
        for (Entry<Enchantment, Integer> enchant : enchants.entrySet()) {
            Enchantment enchantment = enchant.getKey();

-            int activationChance = Misc.calculateActivationChance(Permissions.luckyRepair(player));
+            int activationChance = SkillTools.calculateActivationChance(Permissions.luckyRepair(player));

            if (Misc.getRandom().nextInt(activationChance) <= getEnchantChance(rank)) {
                int enchantLevel = enchant.getValue();
@@ -236,7 +237,7 @@ public class Repair {
        int chance = (int) ((SUPER_REPAIR_CHANCE_MAX / SUPER_REPAIR_MAX_BONUS_LEVEL) * skillLevel);
        if (skillLevel >= SUPER_REPAIR_MAX_BONUS_LEVEL) chance = (int) SUPER_REPAIR_CHANCE_MAX;

-        int activationChance = Misc.calculateActivationChance(Permissions.luckyRepair(player));
+        int activationChance = SkillTools.calculateActivationChance(Permissions.luckyRepair(player));

        if (chance > Misc.getRandom().nextInt(activationChance) && Permissions.repairBonus(player)) {
            player.sendMessage(LocaleLoader.getString("Repair.Skills.FeltEasy"));
--- a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java
@@ -124,7 +124,7 @@ public class Salvage {
        else if (ItemChecks.isChestplate(inHand)) {
            return 8;
        }
-        else if (ItemChecks.isPants(inHand)) {
+        else if (ItemChecks.isLeggings(inHand)) {
            return 7;
        }
        else if (ItemChecks.isBoots(inHand)) {
@@ -141,10 +141,10 @@ public class Salvage {
     * @return true if the item is salvageable, false otherwise
     */
    public static boolean isSalvageable(final ItemStack is) {
-        if (configInstance.getSalvageTools() && (ItemChecks.isTool(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET)) {
+        if (configInstance.getSalvageTools() && (ItemChecks.isMinecraftTool(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET)) {
            return true;
        }
-        if (configInstance.getSalvageArmor() && ItemChecks.isArmor(is)) {
+        if (configInstance.getSalvageArmor() && ItemChecks.isMinecraftArmor(is)) {
            return true;
        }
        return false;
--- a/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/SimpleRepairManager.java
@@ -14,8 +14,8 @@ import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.events.skills.McMMOPlayerRepairCheckEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.util.StringUtils;

 public class SimpleRepairManager implements RepairManager {
    private HashMap<Integer, Repairable> repairables;
@@ -76,7 +76,7 @@ public class SimpleRepairManager implements RepairManager {

        // Level check
        if (skillLevel < repairable.getMinimumLevel()) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", String.valueOf(repairable.getMinimumLevel()), Misc.prettyItemString(item.getTypeId())));
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.Adept", repairable.getMinimumLevel(), StringUtils.getPrettyItemString(item.getTypeId())));
            return;
        }

@@ -84,7 +84,7 @@ public class SimpleRepairManager implements RepairManager {

        // Check if they have the proper material to repair with
        if (!inventory.contains(repairable.getRepairMaterialId())) {
-            String message = LocaleLoader.getString("Skills.NeedMore", Misc.prettyItemString(repairable.getRepairMaterialId()));
+            String message = LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(repairable.getRepairMaterialId()));
            if (repairable.getRepairMaterialMetadata() != (byte) -1) {
                // TODO: Do something nicer than append the metadata as a :# ?
                if (findInInventory(inventory, repairable.getRepairMaterialId(), repairable.getRepairMaterialMetadata()) == -1) {
--- a/src/main/java/com/gmail/nossr50/skills/smelting/FluxMiningEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/smelting/FluxMiningEventHandler.java
@@ -9,6 +9,7 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.mining.Mining;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
@@ -51,7 +52,7 @@ public class FluxMiningEventHandler {
        McMMOPlayer mcMMOPlayer = manager.getMcMMOPlayer();

        if (Permissions.secondSmelt(mcMMOPlayer.getPlayer())) {
-            int chance = (int) ((Mining.doubleDropsMaxChance / Mining.doubleDropsMaxLevel) * (Misc.skillCheck(mcMMOPlayer.getProfile().getSkillLevel(SkillType.MINING), Mining.doubleDropsMaxLevel)));
+            int chance = (int) ((Mining.doubleDropsMaxChance / Mining.doubleDropsMaxLevel) * (SkillTools.skillCheck(mcMMOPlayer.getProfile().getSkillLevel(SkillType.MINING), Mining.doubleDropsMaxLevel)));
            Misc.randomDropItem(location, item, chance);
        }
    }
--- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/smelting/SmeltResourceEventHandler.java
@@ -7,8 +7,8 @@ import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.McMMOPlayer;
+import com.gmail.nossr50.skills.utilities.SkillTools;
 import com.gmail.nossr50.skills.utilities.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;

 public class SmeltResourceEventHandler {
@@ -23,7 +23,7 @@ public class SmeltResourceEventHandler {
    }

    protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Smelting.secondSmeltMaxLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Smelting.secondSmeltMaxLevel);
    }

    protected void handleXPGain() {
--- a/src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/swords/BleedEventHandler.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;

 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.runnables.BleedTimer;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.utilities.SkillTools;

 public class BleedEventHandler {
    private SwordsManager manager;
@@ -22,7 +22,7 @@ public class BleedEventHandler {
    }

    protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(skillLevel, Swords.bleedMaxBonusLevel);
+        this.skillModifier = SkillTools.skillCheck(skillLevel, Swords.bleedMaxBonusLevel);
    }

    protected void addBleedTicks() {
--- a/src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/swords/CounterAttackEventHandler.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;

 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.utilities.CombatTools;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.skills.utilities.SkillTools;

 public class CounterAttackEventHandler {
    private SwordsManager manager;
@@ -20,7 +20,7 @@ public class CounterAttackEventHandler {
    }

    protected void calculateSkillModifier() {
-        this.skillModifier = Misc.skillCheck(manager.getSkillLevel(), Swords.counterAttackMaxBonusLevel);
+        this.skillModifier = SkillTools.skillCheck(manager.getSkillLevel(), Swords.counterAttackMaxBonusLevel);
    }

    protected void dealDamage() {
--- a/src/main/java/com/gmail/nossr50/skills/taming/CallOfTheWildEventHandler.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/CallOfTheWildEventHandler.java
@@ -12,6 +12,7 @@ import org.bukkit.inventory.ItemStack;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;

 public class CallOfTheWildEventHandler {
    protected Player player;
@@ -30,7 +31,7 @@ public class CallOfTheWildEventHandler {
        if (player == null)
            return;

-        player.sendMessage(LocaleLoader.getString("Skills.NeedMore", Misc.prettyItemString(inHand.getTypeId())));
+        player.sendMessage(LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(inHand.getTypeId())));
    }

    protected boolean nearbyEntityExists() {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
GJ	72a2e24c98	Weekly beta release. PLEASE READ THE CHANGELOG.	2013-02-16 00:01:36 -05:00
GJ	593975a255	We don't have to pass the event anymore.	2013-02-16 00:00:24 -05:00
NuclearW	b16cc87ffb	Turn off debug	2013-02-15 22:48:24 -05:00
NuclearW	c5e8b90d71	Reset events for debug	2013-02-15 22:48:24 -05:00
NuclearW	88a6326f87	Debugging for Metrics	2013-02-15 22:48:24 -05:00
NuclearW	0603ea0fc4	Version bump, for turt2live	2013-02-15 22:48:23 -05:00
NuclearW	c4aedd5323	Use convenience methods	2013-02-15 22:48:23 -05:00
NuclearW	6eb125c913	Chimera Wing Usage Tracker/Graph	2013-02-15 22:48:23 -05:00
NuclearW	704f7374d2	Chimera Wing Enabled Graph	2013-02-15 22:48:23 -05:00
NuclearW	009396cad9	Add in EMetrics	2013-02-15 22:48:23 -05:00
NuclearW	a38b7ca9fa	Move metrics to a class of its own	2013-02-15 22:48:22 -05:00
NuclearW	c5daaffeb1	Change to use turt2live's MetricsExtension	2013-02-15 22:48:22 -05:00
bm01	83debde0a1	Changelog update	2013-02-16 03:45:26 +01:00
bm01	9c2ab19404	Slight greenThumbWheat cleanup	2013-02-16 03:42:56 +01:00
bm01	ef1a777180	Removed no longer needed check	2013-02-16 03:38:41 +01:00
bm01	77014b03ef	No point in canceling the event And it actually fixes the double call (see previous commit)	2013-02-16 03:36:27 +01:00
bm01	9143051d9f	Run GreenThumbTimer on the current tick It avoids onBlockBreak to be called twice (which basically launched the task twice). I don't know what were the consequences but that wasn't right anyway. Also it would be better if we wouldn't have to cancel the event, because there is a possibility that plugins like LogBlock don't have a chance to process it.	2013-02-16 02:56:46 +01:00
bm01	f496ecf7b1	Fixed Green Thumb not checking rank 4 on wheat	2013-02-16 02:49:31 +01:00
GJ	fc3afc4340	Using PlantSize is cleaner.	2013-02-15 19:29:47 -05:00
GJ	fd138eb0b5	This was redundant was redundant	2013-02-15 19:20:42 -05:00
GJ	6d5835849f	Fix issue with GreenThumb command display.	2013-02-15 19:18:43 -05:00
nossr50	800ebf5b64	Merge branch 'master' of https://github.com/mcMMO-Dev/mcMMO	2013-02-15 15:33:54 -08:00
nossr50	9df149c489	Huge Mushrooms now work for Tree Feller (UNTESTED)	2013-02-15 15:32:49 -08:00
shatteredbeam	efcf80899e	Permissions class removal from Skillcommand	2013-02-15 14:38:51 -08:00
shatteredbeam	c1b12c027a	Permissions class removed from Listeners	2013-02-15 13:32:23 -08:00
shatteredbeam	476ea80c4e	Permissions class removed from mcMMOPlayer.	2013-02-15 13:21:21 -08:00
GJ	bf4d70e8be	That was an incredibly stupid way to get those permissions.	2013-02-15 14:29:32 -05:00
GJ	284002bf8b	No reason to String.valueOf() these.	2013-02-15 13:56:30 -05:00
GJ	b92b9c6507	Permissions must use the English names.	2013-02-15 13:42:37 -05:00
GJ	a8cfcf31ab	Remove unused import	2013-02-15 13:42:37 -05:00
GJ	d14821e385	Fix a few more missing localized names.	2013-02-15 13:42:36 -05:00
GJ	5e8b036481	Need English name for the permission.	2013-02-15 13:42:34 -05:00
GJ	27ba4ff800	Make /xplock work for localized skill names.	2013-02-15 13:42:34 -05:00
shatteredbeam	c80bb45cad	Inspection references (Remove Permissions class)	2013-02-15 10:41:04 -08:00
GJ	dedcf0469b	Fix teh build.	2013-02-15 13:12:11 -05:00
GJ	9ec6a6d1aa	Add constructor for adding multiple levels at once. Need to work out how to handle level-ups in order for this to be properly cancelled, however.	2013-02-15 13:10:36 -05:00
GJ	1ce01d2043	This should be abstract.	2013-02-15 13:10:36 -05:00
GJ	0701169a7e	Make McMMOPlayerXPGainEvent cancellable.	2013-02-15 13:10:34 -05:00
shatteredbeam	2d0cf6413e	Permissions Murder 6: The quest for more money	2013-02-15 10:08:45 -08:00
T00thpick1	4cf658b629	Make mctop asynchroneous	2013-02-15 12:47:00 -05:00
t00thpick1	8d21883c20	Only try to index tables when we are connected	2013-02-15 12:30:27 -05:00
GJ	fca0847929	Squids are not made of chocolate.	2013-02-15 12:19:02 -05:00
GJ	1d19dab71d	Full change to DyeColor.COLOR.getDyeData() - REQUIRES CB 1.4.7	2013-02-15 12:16:31 -05:00
GJ	49fe98ac57	Already locked it once.	2013-02-15 10:46:08 -05:00
TfT_02	bc9e946618	Revert removing Chimaera wing. We've decided to keep it, for now.	2013-02-15 16:36:21 +01:00
GJ	3d3a1abf7b	OfflinePlayer.getName().toString() is pointless.	2013-02-15 10:34:42 -05:00
GJ	1ef1d53fd9	Make our commands respect localized skill names.	2013-02-15 09:26:01 -05:00
GJ	0419dca385	Config files are now backed up even when running in SQL mode	2013-02-15 07:53:44 -05:00
GJ	11bd473f55	Added config option to disable automatic zip backups	2013-02-15 07:53:43 -05:00
TfT_02	5947ad5004	Fixed wrong names names displaying when using /ptp	2013-02-15 13:51:54 +01:00
GJ	894218cac9	Gotta protect this one too.	2013-02-15 07:44:27 -05:00
GJ	4ce06de18a	Nicer way to handle the ConcurrentModification issue.	2013-02-15 07:40:47 -05:00
GJ	6c4ea34811	It's (not) over 5000% - fixes #683	2013-02-15 07:32:22 -05:00
TfT_02	34736836cc	Fixed a bug where a new party leader wasn't appointed, after the previous party leader left	2013-02-15 13:22:31 +01:00
TfT_02	9c09c168f8	Fix a ConcurrentModificationException	2013-02-15 12:32:35 +01:00
GJ	c61e710341	Update Locale files.	2013-02-14 23:54:18 -05:00
NuclearW	63753b8197	Changelog	2013-02-14 23:28:57 -05:00
NuclearW	20f436c646	Squash alll the bugs	2013-02-14 23:27:19 -05:00
NuclearW	092b9096e6	Locale fallback	2013-02-14 23:27:03 -05:00
GJ	caa1b0d14c	Duplicate code is bad, m'kay?	2013-02-14 19:02:50 -05:00
bm01	d39ff036c7	Fixed NPE when clicking outside of the inventory window	2013-02-14 23:56:09 +01:00
GJ	6702256b4c	Auto-remove buff if a player tries to move the item.	2013-02-14 17:08:06 -05:00
GJ	110fbe9478	Clear buffs on /mcrefresh	2013-02-14 16:56:55 -05:00
GJ	128c24c8f6	Fix enchants hanging around due to server crash or disconnect.	2013-02-14 16:35:14 -05:00
GJ	6cc2497182	THis wasn't removing when it should have.	2013-02-14 16:29:49 -05:00
GJ	615288e635	Things in inventory can be null.	2013-02-14 16:02:42 -05:00
GJ	1b814b937b	Move PlayerDeathEvent handler into main PlayerListener. Also add check to deal with SuperBreaker enchants on death.	2013-02-14 15:53:17 -05:00
GJ	01e26f321d	Fix issues with enchant-based Superbreaker implementation.	2013-02-14 14:35:53 -05:00
GJ	e8319aee81	Changed Super Breaker & Giga Drill Breaker to be an enchantment-based boost, rather than an instabreak.	2013-02-14 13:12:15 -05:00
GJ	ca5bf0bd09	Fix possible fallthrough.	2013-02-14 11:07:41 -05:00
GJ	88b05cd5aa	Fix Super Breaker not working right with custom blocks.	2013-02-14 09:39:22 -05:00
GJ	132fcb8c74	We need to get our priorities straight.	2013-02-14 09:26:05 -05:00
GJ	1492fa473f	Ch-ch-ch-changes!	2013-02-14 07:44:53 -05:00
NuclearW	9bd33ab3df	Introducing Block Cracker	2013-02-14 00:34:50 -05:00
NuclearW	7d826a0cdb	Add permission check for green thumb effects during Green Terra ability	2013-02-14 00:21:33 -05:00
GJ	ec6fc30f47	3rd time's the charm?	2013-02-13 19:43:26 -05:00
GJ	25a54ea802	Clean up /ptp a bit more.	2013-02-13 19:29:46 -05:00
GJ	dda9c82940	Attempt to clarify the /ptp code - I don't know that this helps much.	2013-02-13 18:58:17 -05:00
GJ	55b88f0274	These belong better in SkillTools than Misc	2013-02-13 16:45:49 -05:00
GJ	f4da69a205	Fix some missing default cases and possible fall-through issues.	2013-02-13 16:34:36 -05:00
GJ	3a919f3e4c	Fix improper permission making admin chat fail.	2013-02-13 15:25:49 -05:00
GJ	6cfd124804	Remove unused import.	2013-02-13 13:50:38 -05:00
GJ	0879e1f326	Fixed bug where fired arrows could raise skill levels other than Archery	2013-02-13 12:25:57 -05:00
GJ	8312570825	Fixed bug where splash potions could raise a player's unarmed level. Fixes #678	2013-02-13 12:10:10 -05:00
bm01	7110e6ec3d	Fixed invalid plugin.yml (tabs!)	2013-02-13 18:03:31 +01:00
GJ	1455a9b3a4	Fixed minor typo in locale file.	2013-02-13 11:50:07 -05:00
GJ	2ad73e9b2c	Optimized our String/number conversions a bit. Also moved all String-related util functions from Misc.java to StringUtils.java	2013-02-13 11:45:48 -05:00
GJ	b1db0d037d	Fix localized versions of /skillname not working properly. Fixes #669	2013-02-13 10:32:37 -05:00
bm01	776821a988	Readded Impact damage durability cap (and fixed it)	2013-02-13 14:49:35 +01:00
GJ	1380e64c0b	Added missing * perm node for mcmmmo.commands.mcmmo	2013-02-13 08:16:55 -05:00
GJ	0319e2cbff	Added '/hardcore' and '/vampirism' commands for toggling these modes on or off, along with the necessary permissions nodes.	2013-02-13 08:15:38 -05:00
GJ	7350fdb99c	Remove unused import.	2013-02-12 23:21:34 -05:00
GJ	25061e7f71	Don't loop, broadcast.	2013-02-12 23:07:01 -05:00
shatteredbeam	0cd8d2b333	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO	2013-02-12 19:56:47 -08:00
shatteredbeam	28dca6e66f	sender, not player.	2013-02-12 19:54:17 -08:00
shatteredbeam	491a70ad82	util.perms now uses player.hasPermissions() Uniformly.	2013-02-12 19:50:46 -08:00
GJ	aa0acf767b	Log ALL the things!	2013-02-12 22:18:47 -05:00
GJ	e37f5e765e	Forgot to send the permissions message.	2013-02-12 21:58:53 -05:00
GJ	fe1cf40bbb	Get rid of unused functions.	2013-02-12 21:55:41 -05:00
shatteredbeam	9be6a7cf3b	Permissions Murder 4: The quest for revenge	2013-02-12 18:33:55 -08:00
shatteredbeam	0684b1d425	Permissions murder: The Sequel.	2013-02-12 18:26:40 -08:00
shatteredbeam	12a2107601	More permissions murder.	2013-02-12 18:06:36 -08:00
shatteredbeam	163b3d19f9	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO	2013-02-12 17:49:51 -08:00
shatteredbeam	15113ba7e4	SkillresetCommand.java Permission murder	2013-02-12 17:48:04 -08:00
GJ	5e9f01ac57	Fix party & admin chat not working right from console.	2013-02-12 20:38:35 -05:00
GJ	ec718f04d7	No sense in looping through all online players.	2013-02-12 20:38:35 -05:00
shatteredbeam	bb96c00cb9	Continuing Permissions Murder.	2013-02-12 17:37:34 -08:00
shatteredbeam	697cfeea64	Kill the permissions!	2013-02-12 17:31:46 -08:00
shatteredbeam	0528139c2c	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO	2013-02-12 17:22:51 -08:00
shatteredbeam	cbe68e7879	Import removal	2013-02-12 17:21:56 -08:00
shatteredbeam	074a798213	Kill the permissions middle man...	2013-02-12 17:16:41 -08:00
GJ	e9b016903b	Removed /mcc command. Replaced with /mcmmo help. NOTE: /mcmmo help seems to be having formatting issues currently - we're looking into it.	2013-02-12 18:30:03 -05:00
GJ	8f4d5442b1	Better than looping.	2013-02-12 16:47:11 -05:00
GJ	2160eef1af	Update plugin.yml	2013-02-12 16:26:08 -05:00
GJ	b66c5d7023	Clean up /ptp. Also fix bug where teleportation happened backwards when accepting.	2013-02-12 16:24:17 -05:00
GJ	b21d5bdcc4	Inviting yourself is bad.	2013-02-12 15:08:07 -05:00
GJ	574770c289	Remove unused imports.	2013-02-12 15:05:23 -05:00
GJ	adda85a660	Convert /ptp to use Bukkit CommandAPI	2013-02-12 15:05:02 -05:00
GJ	92473cc56d	True, not false.	2013-02-12 15:00:04 -05:00
GJ	d7e74b9fe0	That was poorly named.	2013-02-12 14:38:49 -05:00
GJ	9db2d50676	These should be under party, not skills.	2013-02-12 14:36:38 -05:00
bm01	048a979375	Minor ImpactEventHandler cleanup	2013-02-12 19:36:10 +01:00
bm01	761fb3b811	Bad copy paste	2013-02-12 19:19:13 +01:00
bm01	505d6e258f	Removed no longer needed method (Misc.hasArmor)	2013-02-12 19:17:53 +01:00
bm01	9f22382506	Restored original behavior of Salvage.isSalvageable It doesn't check for custom armors, I don't know if it's a bug or not Added isMinecraftTool and isMinecraftArmor for clarity	2013-02-12 19:15:52 +01:00
bm01	f486492c37	For consistency with Bukkit, ItemChecks.isPants -> ItemChecks.isLeggings	2013-02-12 19:15:51 +01:00
bm01	6f1ddee0ac	ItemChecks.isArmor should check for custom armors	2013-02-12 19:15:51 +01:00
bm01	2fac0170e7	Fixed Impact reducing durability of non-armor equipped blocks	2013-02-12 19:15:51 +01:00
GJ	56056797bc	Check config values for exp & item sharing.	2013-02-12 12:08:04 -05:00
GJ	bbc2091b77	Aliased /party chat to work for /partychat and /party teleport to work for /ptp	2013-02-12 12:04:37 -05:00
GJ	51493fab48	Don't pass the plugin.	2013-02-12 11:44:29 -05:00
GJ	5d693c5d8f	Convert /party help to a subcommand	2013-02-12 11:42:13 -05:00
GJ	8cd9942be6	Prevent accidental overtranslation of our commands.	2013-02-12 11:37:37 -05:00
GJ	b2575c9b8f	Cleanup from removal of leader checks.	2013-02-12 11:25:56 -05:00
GJ	a60a6355d2	We check the leader elsewhere.	2013-02-12 11:23:48 -05:00
GJ	6acfba1315	Use an enum to handle our subcommands.	2013-02-12 11:23:32 -05:00
GJ	ab731302e0	Remove unused imports	2013-02-12 10:42:59 -05:00
GJ	5a48d5c5f8	Convert /party info to a subcommand	2013-02-12 10:42:42 -05:00
GJ	e92c6b8f26	Convert /party rename to a subcommand	2013-02-12 09:22:57 -05:00
GJ	200ac53078	Add function to get a list of all players in a party to the API.	2013-02-12 09:22:36 -05:00
GJ	288907cfd4	Convert /party password to a subcommand.	2013-02-12 08:57:35 -05:00
GJ	c822be4a53	Add other usage string.	2013-02-12 08:39:45 -05:00
GJ	70f588cce1	Don't print usage here.	2013-02-12 01:45:56 -05:00
GJ	e5c7e81b08	No point in repeating this check over multiple classes.	2013-02-12 01:41:51 -05:00
bm01	45ebc2b89b	3% != 100%	2013-02-11 23:39:41 +01:00
GJ	76523d2988	3% != 100% - Fixes #671	2013-02-11 17:35:01 -05:00
GJ	98a64a0948	Convert /party lock & /party unlock to a subcommand.	2013-02-11 17:31:09 -05:00
GJ	2d6fb72b9d	Use <>, not []	2013-02-11 15:41:23 -05:00
GJ	e66ff53ca4	Convert /party owner to a subcommand.	2013-02-11 15:33:25 -05:00
GJ	e8ac3c812f	Fix formatting.	2013-02-11 15:24:38 -05:00
GJ	a597a7d281	Add usage string.	2013-02-11 15:24:20 -05:00
GJ	1c0e392552	Convert /party disband to a subcommand	2013-02-11 15:19:41 -05:00
GJ	59a52a73bb	We've got a function, might as well use it.	2013-02-11 15:17:15 -05:00
bm01	0aeff40aaa	Made /party kick work on offline players	2013-02-11 14:14:43 +01:00
NuclearW	bcd8906315	Remove all spaces before newlines in config.yml	2013-02-11 03:08:03 -05:00
shatteredbeam	de9249e523	Added Global Multiplier Graph to Metrics Added Global Curve Modifier Graph to Metrics	2013-02-10 23:29:19 -08:00
shatteredbeam	5160f5c380	Fixed build GJ broke. Silly Hat prepared.	2013-02-10 23:11:03 -08:00
GJ	5da51e78cc	Change /party kick to a subcommand	2013-02-11 00:25:03 -05:00
GJ	2be57414ad	Use <> not []	2013-02-11 00:07:58 -05:00
GJ	c2293396be	Fixing the rest of the issues with entities.yml	2013-02-10 15:57:55 -05:00
TfT_02	cdbc19570d	Getting rid of all the snakes in the yaml	2013-02-10 09:34:32 +01:00
bm01	ccedd23342	Fixed NPE on /party join when the sender isn't in a party Also cleaned up PartyManager.joinParty since it's no longer supposed to create any party.	2013-02-09 16:21:13 +01:00
bm01	46b5746dcc	Fixed bad player names displaying when using /party	2013-02-09 15:54:03 +01:00
bm01	97dafc45fa	Fixed players not joining their parties at login	2013-02-09 15:52:09 +01:00
bm01	adf62fd332	Speeding up mcMMO startup a little	2013-02-09 15:45:41 +01:00
bm01	98bb865062	Load parties before trying to do anything with them	2013-02-09 15:42:02 +01:00
bm01	d50123085f	Fixed bad parties saving	2013-02-09 15:26:41 +01:00
bm01	b628b9eb4d	Attempt to fix IOOBException due getOfflinePlayer at server startup	2013-02-09 15:16:57 +01:00
bm01	317a39177b	Fixed NPE on /party invite when used without a second argument	2013-02-09 14:51:36 +01:00
bm01	73924543df	Fixed /party invite trying to invite "invite"	2013-02-09 14:50:03 +01:00
bm01	457754b6f1	Fixed NPE due to null itemShareMode	2013-02-09 14:35:48 +01:00
bm01	c659f8a9a9	Party now store OfflinePlayer instead of String	2013-02-09 14:34:53 +01:00
TfT_02	74df4a4fb6	Add random item share mode for parties. Use /party itemshare random to enable random item sharing. Disable with /party itemshare [none \| false \| off] Whenever a party member picks up an item, everyone has a chance of receiving that item instead of the player who picked it up.	2013-02-09 12:24:02 +01:00
TfT_02	b60d9032be	Who knows what we will do next year, but this minor bug has been fixed anyway :)	2013-02-09 10:59:41 +01:00
GJ	a2cbfa2668	We only need the name here, avoids NPE issues in /party create. Fixes #655	2013-02-09 00:57:00 -05:00
GJ	340c47eebd	Switch /party invite to a subcommand	2013-02-08 16:56:54 -05:00
GJ	ae5f39253e	Make this work properly, finally.	2013-02-08 16:30:34 -05:00
GJ	3df5f529eb	Anniversary is over for another year...	2013-02-08 16:30:34 -05:00
Glitchfinder	0fae8be816	Cleaning up minor issue with the ChunkStore.	2013-02-08 13:26:47 -08:00
Glitchfinder	f97e9bd19f	Fixing an NPE with the /mcmmo command.	2013-02-08 12:23:14 -08:00
Glitchfinder	400d551295	Minor change to default permissions.	2013-02-08 12:14:59 -08:00
GJ	4957366beb	Yet another stupid error.	2013-02-08 14:55:09 -05:00
GJ	27e4a2c290	This is a more applicable error message.	2013-02-08 13:28:58 -05:00
GJ	a424d36e96	This is less costly.	2013-02-08 13:27:28 -05:00
GJ	9c0518f251	Fix NPE on PartyJoin - Fixes #653	2013-02-08 13:16:12 -05:00
GJ	794071efb8	Not just for XP sharing.	2013-02-08 11:54:09 -05:00
GJ	787c4e5b73	Just in case they type it wrong.	2013-02-08 11:54:09 -05:00
GJ	33d3cd0522	Had the naming backwards, it's actually /party expshare	2013-02-08 11:54:09 -05:00
GJ	e14f8ad93c	Convert /party shareexp to a subcommand	2013-02-08 11:54:08 -05:00
GJ	7a357634c7	We've already verified that they're in a party by this point.	2013-02-08 11:54:08 -05:00
GJ	ef5f72f56c	Invert this check for clarity's sake.	2013-02-08 11:54:08 -05:00
GJ	ae3a95dd34	Convert /party quit to a subcommand	2013-02-08 11:54:07 -05:00
bm01	6d9db06305	Removed getSkillLevel, it doesn't belong to SkillType	2013-02-08 13:04:26 +01:00
GJ	35f243a6e6	No reason to use the SAME CODE in three different clases.	2013-02-07 23:59:02 -05:00
GJ	ea25558ac9	Back to weekly development.	2013-02-07 23:24:56 -05:00