Compile with RELEASE

No such thing as cancelled events
Remove reflection
2026-02-18 01:42:32 +01:00 · 2014-02-28 19:50:20 +01:00 · 2014-02-28 19:49:53 +01:00 · 2014-02-28 19:15:11 +01:00 · 2014-02-28 10:46:34 -05:00 · 2014-02-27 22:25:54 +01:00
75 changed files with 490 additions and 710 deletions
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -7,7 +7,7 @@ Key:
  ! Change
  - Removal

-Version 1.4.08
+Version 1.4.08-dev
 + Added a new skill; Alchemy. Special thanks to EasyMFnE for creating this!
 + Added SecondaryAbilityType enum, and new SecondaryAbilityWeightedActivationCheckEvent, fired when a secondary ability checkes its activation chances
 + Added the possibility to gain experience when using Fishing "Shake"
@@ -21,10 +21,6 @@ Version 1.4.08
 + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
 + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
 + Added support for multiple mod config files, naming can be done as either armor.<modname>.yml or <modname>.armor.yml
- + Added config options to configure the items used in "Call of the Wild"
- + Added config option to configure the database command cooldown
- = Fixed bug where healthbars wouldn't display if skills were disabled
- = Fixed bug with "Call of the Wild" entities despawning
 = Fixed bug with updating (very) old user data.
 = Fixed bug with checking maximum durability of mod items.
 = Fixed exploit involving Call of The Wild.
@@ -41,12 +37,9 @@ Version 1.4.08
 = Fixed bug where party chat broke if the display name contained special characters
 = Fixed bug where `/addlevels all` and `/skillreset all` didn't work
 = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse
- = Fixed bug where some horses summoned with "Call of the Wild" were unable to jump
 = Fixed bug where the /ptp request expiration time was checked wrongly - preventing players from using the command
 = Fixed bug where Hylian Luck was broken
 = Fixed bug where Snow would never drop treasures
- = Fixed issues with commands giving away vanished players.
- = Fixed bug where the Repair lucky perk would increase the Arcane Forging downgrade chance, instead of decreasing it
 ! Changed party system. Parties now have XP and Levels. Party features such as party teleport and party chat have to be unlocked before they can be used by the party members
 ! Changed appearance of party member list. Gold = party leader, White = online, Gray = offline, Italic = not nearby
 ! Updated localization files
@@ -56,8 +49,6 @@ Version 1.4.08
 ! Changed /ptp config setting, Commands.ptp.Confirm_Required is now Commands.ptp.Accept.Required
 ! Changed config validation for UnlockLevels, they can now also be 0
 ! Changed config validation for Rank_Levels, successive Ranks can now be less than or equal to each other
- ! Changed default amount of XP gained from mining Quartz Ore. From 250 to 100 XP.
- ! Changed Acrobatics config setting, Skills.Acrobatics.Prevent_XP_After_Teleport is now Skills.Acrobatics.XP_After_Teleport_Cooldown
 - Removed /stats alias for /mcstats

 Version 1.4.07
--- a/README.md
+++ b/README.md
@@ -47,5 +47,6 @@ Required Libraries:
 * JUnit
 * EMetrics
 * Bukkit
+* TagAPI

 http://dev.bukkit.org/server-mods/mcmmo for more up to date information.
--- 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.08</version>
+    <version>1.4.08-SNAPSHOT</version>
    <name>mcMMO</name>
    <url>https://github.com/mcMMO-Dev/mcMMO</url>
    <issueManagement>
@@ -116,6 +116,10 @@
            <id>Plugin MetricsExtension</id>
            <url>http://repo.turt2live.com</url>
        </repository>
+        <repository>
+            <id>TagAPI</id>
+            <url>http://repo.kitteh.org/content/repositories/public/</url>
+        </repository>
    </repositories>
    <dependencies>
        <dependency>
@@ -136,6 +140,12 @@
            <artifactId>MetricsExtension</artifactId>
            <version>0.0.5-SNAPSHOT</version>
        </dependency>
+        <dependency>
+            <groupId>org.kitteh</groupId>
+            <artifactId>tagapi</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
    </dependencies>
    <distributionManagement>
        <repository>
--- a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
+++ b/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
@@ -43,7 +43,9 @@ public final class ExperienceAPI {
    public static boolean isNonChildSkill(String skillType) {
        SkillType skill = SkillType.getSkill(skillType);

-        return skill != null && !skill.isChildSkill();
+        if (skill == null) return false;
+
+        return !skill.isChildSkill();
    }

    @Deprecated
--- a/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/KrakenCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -57,7 +58,7 @@ public class KrakenCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -61,7 +62,7 @@ public abstract class ToggleCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
@@ -9,12 +9,12 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
--- a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.database;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -22,7 +23,7 @@ public class McremoveCommand implements TabExecutor {
            case 1:
                String playerName = CommandUtils.getMatchedPlayerName(args[0]);

-                if (UserManager.getOfflinePlayer(playerName) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
+                if (UserManager.getPlayer(playerName, true) == null && CommandUtils.unloadedProfile(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false))) {
                    return true;
                }

@@ -44,7 +45,7 @@ public class McremoveCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.experience;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -67,7 +68,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                int value = Integer.parseInt(args[2]);

                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                // 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) {
@@ -95,7 +96,7 @@ public abstract class ExperienceCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            case 2:
                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
--- a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.experience;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -65,7 +66,7 @@ public class SkillresetCommand implements TabExecutor {
                }

                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                // 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) {
@@ -93,7 +94,7 @@ public class SkillresetCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            case 2:
                return StringUtil.copyPartialMatches(args[1], SkillType.SKILL_NAMES, new ArrayList<String>(SkillType.SKILL_NAMES.size()));
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
@@ -1,9 +1,6 @@
 package com.gmail.nossr50.commands.party;

-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -16,7 +13,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.commands.chat.PartyChatCommand;
 import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
-import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
@@ -179,7 +175,7 @@ public class PartyCommand implements TabExecutor {
                    case INVITE:
                    case KICK:
                    case OWNER:
-                        List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                        Set<String> playerNames = UserManager.getPlayerNames();
                        return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                    case XPSHARE:
                        return StringUtil.copyPartialMatches(args[1], XPSHARE_COMPLETIONS, new ArrayList<String>(XPSHARE_COMPLETIONS.size()));
@@ -194,10 +190,7 @@ public class PartyCommand implements TabExecutor {
                        List<String> matches = StringUtil.copyPartialMatches(args[1], PtpCommand.TELEPORT_SUBCOMMANDS, new ArrayList<String>(PtpCommand.TELEPORT_SUBCOMMANDS.size()));

                        if (matches.size() == 0) {
-                            Player player = (Player) sender;
-                            Party party = UserManager.getPlayer(player).getParty();
-
-                            playerNames = party.getOnlinePlayerNames(player);
+                            playerNames = UserManager.getPlayerNames();
                            return StringUtil.copyPartialMatches(args[1], playerNames, new ArrayList<String>(playerNames.size()));
                        }

--- a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
@@ -18,7 +18,7 @@ public class PartyInviteCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
-                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);

                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                    return false;
--- a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
@@ -11,7 +11,6 @@ import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;

 public class PartyKickCommand implements CommandExecutor {
@@ -20,15 +19,13 @@ public class PartyKickCommand implements CommandExecutor {
        switch (args.length) {
            case 2:
                Party playerParty = UserManager.getPlayer((Player) sender).getParty();
-                String targetName = CommandUtils.getMatchedPlayerName(args[1]);
+                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(args[1]);

-                if (!playerParty.getMembers().contains(targetName)) {
-                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+                if (!playerParty.getMembers().contains(target.getName())) {
+                    sender.sendMessage(LocaleLoader.getString("Party.NotInYourParty", target.getName()));
                    return true;
                }

-                OfflinePlayer target = mcMMO.p.getServer().getOfflinePlayer(targetName);
-
                if (target.isOnline()) {
                    Player onlineTarget = target.getPlayer();
                    String partyName = playerParty.getName();
--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.party.alliance;

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

 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -110,7 +111,7 @@ public class PartyAllianceCommand implements TabExecutor {
                List<String> matches = StringUtil.copyPartialMatches(args[0], ALLIANCE_SUBCOMMANDS, new ArrayList<String>(ALLIANCE_SUBCOMMANDS.size()));

                if (matches.size() == 0) {
-                    List<String> playerNames = CommandUtils.getOnlinePlayerNames(commandSender);
+                    Set<String> playerNames = UserManager.getPlayerNames();
                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                }

--- a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
@@ -18,7 +18,7 @@ public class PartyAllianceInviteCommand implements CommandExecutor {
        switch (args.length) {
            case 3:
                String targetName = CommandUtils.getMatchedPlayerName(args[2]);
-                McMMOPlayer mcMMOTarget = UserManager.getOfflinePlayer(targetName);
+                McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName, true);

                if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
                    return false;
--- a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.party.teleport;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -10,10 +11,10 @@ import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.StringUtil;

-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.Party;
 import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -108,10 +109,7 @@ public class PtpCommand implements TabExecutor {
                List<String> matches = StringUtil.copyPartialMatches(args[0], TELEPORT_SUBCOMMANDS, new ArrayList<String>(TELEPORT_SUBCOMMANDS.size()));

                if (matches.size() == 0) {
-                    Player player = (Player) sender;
-                    Party party = UserManager.getPlayer(player).getParty();
-
-                    List<String> playerNames = party.getOnlinePlayerNames(player);
+                    Set<String> playerNames = UserManager.getPlayerNames();
                    return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
                }

--- a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.player;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -28,7 +29,7 @@ public class InspectCommand implements TabExecutor {
        switch (args.length) {
            case 1:
                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                // 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) {
@@ -103,7 +104,7 @@ public class InspectCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
--- a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.commands.player;

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

 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -14,6 +15,7 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
@@ -45,7 +47,7 @@ public class McrankCommand implements TabExecutor {
                }

                String playerName = CommandUtils.getMatchedPlayerName(args[0]);
-                McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+                McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

                if (mcMMOPlayer != null) {
                    Player player = mcMMOPlayer.getPlayer();
@@ -71,7 +73,7 @@ public class McrankCommand implements TabExecutor {
    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
        switch (args.length) {
            case 1:
-                List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
+                Set<String> playerNames = UserManager.getPlayerNames();
                return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<String>(playerNames.size()));
            default:
                return ImmutableList.of();
@@ -81,9 +83,8 @@ public class McrankCommand implements TabExecutor {
    private void display(CommandSender sender, String playerName) {
        if (sender instanceof Player) {
            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);

-            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                return;
            }
--- a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -15,6 +15,7 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
+import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
@@ -84,9 +85,8 @@ public class MctopCommand implements TabExecutor {

        if (sender instanceof Player) {
            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);

-            if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
+            if (mcMMOPlayer.getDatabaseATS() + Misc.PLAYER_DATABASE_COOLDOWN_MILLIS > System.currentTimeMillis()) {
                sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
                return;
            }
--- a/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
@@ -1,205 +0,0 @@
-package com.gmail.nossr50.commands.skills;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.HolidayManager.FakeSkillType;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-
-import com.google.common.collect.ImmutableList;
-
-public class AprilCommand implements TabExecutor {
-    private String skillName;
-
-    protected DecimalFormat percent = new DecimalFormat("##0.00%");
-    protected DecimalFormat decimal = new DecimalFormat("##0.00");
-
-    @Override
-    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
-            return true;
-        }
-
-        skillName = StringUtils.getCapitalized(label);
-
-        switch (args.length) {
-            case 0:
-                Player player = (Player) sender;
-                FakeSkillType fakeSkillType = FakeSkillType.getByName(skillName);
-
-                float skillValue = Misc.getRandom().nextInt(99);
-
-                player.sendMessage(LocaleLoader.getString("Skills.Header", skillName));
-                player.sendMessage(LocaleLoader.getString("Commands.XPGain", getXPGainString(fakeSkillType)));
-                player.sendMessage(LocaleLoader.getString("Effects.Level", (int) skillValue, Misc.getRandom().nextInt(1000), 1000 + Misc.getRandom().nextInt(1000)));
-
-
-                List<String> effectMessages = effectsDisplay(fakeSkillType);
-
-                if (!effectMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Effects.Effects")));
-
-                    for (String message : effectMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                List<String> statsMessages = statsDisplay(fakeSkillType);
-
-                if (!statsMessages.isEmpty()) {
-                    player.sendMessage(LocaleLoader.getString("Skills.Header", LocaleLoader.getString("Commands.Stats.Self")));
-
-                    for (String message : statsMessages) {
-                        player.sendMessage(message);
-                    }
-                }
-
-                player.sendMessage(LocaleLoader.formatString("[[DARK_AQUA]]Guide for {0} available - type /APRIL FOOLS ! :D", skillName));
-                return true;
-
-            default:
-                return true;
-        }
-    }
-
-    private String getXPGainString(FakeSkillType fakeSkillType) {
-        switch (fakeSkillType) {
-            case MACHO:
-                return "Get beaten up";
-            case JUMPING:
-                return "Kris Kross will make ya Jump Jump";
-            case THROWING:
-                return "Chuck your items on the floor";
-            case WRECKING:
-                return "I'M GONNA WRECK IT!";
-            case CRAFTING:
-                return "Craft apple pies";
-            case WALKING:
-                return "Walk around the park";
-            case SWIMMING:
-                return "Like a fish on a bicycle";
-            case FALLING:
-                return "Faceplant the floor, headbutt the ground";
-            case CLIMBING:
-                return "Climb the highest mountain";
-            case FLYING:
-                return "I believe I can fly";
-            case DIVING:
-                return "Scuba club 4000";
-            case PIGGY:
-                return "OINK! OINK!";
-            default:
-                return "Sit and wait?";
-        }
-    }
-
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-        switch (args.length) {
-            case 1:
-                return ImmutableList.of("?");
-            default:
-                return ImmutableList.of();
-        }
-    }
-
-    private List<String> effectsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.getString("Effects.Template", "Punching bag", "Absorb damage, like a bag of sand"));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump", "PRESS SPACE TO JUMP"));
-                messages.add(LocaleLoader.getString("Effects.Template", "Jump Twice", "PRESS SPACE TWICE TO JUMP TWICE"));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Drop Item", "Randomly drop items, at random"));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Ralphinator", "Smash windows with your fists"));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Crafting", "Chance of successful craft"));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Walk", "Traveling gracefully by foot"));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Swim", "Just keep swimming, swimming, swimming"));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Skydiving", "Go jump of a cliff. No, seriously."));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Rock Climber", "Use string to climb mountains faster"));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Fly", "Throw yourself at the ground and miss"));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.getString("Effects.Template", "Hold Breath", "Press shift to hold your breath longer"));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.getString("Effects.Template", "Carrot Turbo", "Supercharge your pigs with carrots"));
-                break;
-        }
-
-        return messages;
-    }
-
-    private List<String> statsDisplay(FakeSkillType fakeSkillType) {
-        List<String> messages = new ArrayList<String>();
-
-        switch (fakeSkillType) {
-            case MACHO:
-                messages.add(LocaleLoader.formatString("[[RED]]Damage Taken: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(77))));
-                break;
-            case JUMPING:
-                messages.add(LocaleLoader.formatString("[[RED]]Double Jump Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case THROWING:
-                messages.add(LocaleLoader.formatString("[[RED]]Drop Item Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(87))));
-                break;
-            case WRECKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Wrecking Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(14))));
-                break;
-            case CRAFTING:
-                messages.add(LocaleLoader.formatString("[[RED]]Crafting Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case WALKING:
-                messages.add(LocaleLoader.formatString("[[RED]]Walk Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case SWIMMING:
-                messages.add(LocaleLoader.formatString("[[RED]]Swim Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FALLING:
-                messages.add(LocaleLoader.formatString("[[RED]]Skydiving Success: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(37))));
-                break;
-            case CLIMBING:
-                messages.add(LocaleLoader.formatString("[[RED]]Rock Climber Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case FLYING:
-                messages.add(LocaleLoader.formatString("[[RED]]Fly Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case DIVING:
-                messages.add(LocaleLoader.formatString("[[RED]]Hold Breath Chance: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(27))));
-                break;
-            case PIGGY:
-                messages.add(LocaleLoader.formatString("[[RED]]Carrot Turbo Boost: [[YELLOW]]{0}%", decimal.format(Misc.getRandom().nextInt(80)) + 10));
-                break;
-        }
-
-        return messages;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -51,6 +51,7 @@ public class FishingCommand extends SkillCommand {
    @Override
    protected void dataCalculations(Player player, float skillValue, boolean isLucky) {
        FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager();
+        boolean isStorming = player.getWorld().hasStorm();

        // TREASURE HUNTER
        if (canTreasureHunt) {
@@ -69,7 +70,7 @@ public class FishingCommand extends SkillCommand {
            double totalEnchantChance = 0;

            for (Rarity rarity : Rarity.values()) {
-                if (rarity != Rarity.TRAP && rarity != Rarity.RECORD) {
+                if (rarity != Rarity.TRAP || rarity != Rarity.RECORD) {
                    totalEnchantChance += TreasureConfig.getInstance().getEnchantmentDropRate(lootTier, rarity);
                }
            }
@@ -91,7 +92,7 @@ public class FishingCommand extends SkillCommand {

        // MASTER ANGLER
        if (canMasterAngler) {
-            double rawBiteChance = 1.0 / (player.getWorld().hasStorm() ? 300 : 500);
+            double rawBiteChance = 1.0 / (isStorming ? 300 : 500);
            Location location = fishingManager.getHookLocation();

            if (location == null) {
--- a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
@@ -4,6 +4,7 @@ import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Set;

+import com.gmail.nossr50.util.Motd;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -17,7 +18,6 @@ import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.skills.child.FamilyTree;
-import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.commands.CommandUtils;
--- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java
@@ -91,9 +91,9 @@ public class TamingCommand extends SkillCommand {

        if (canCallWild) {
            messages.add(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13")));
-            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWCost(EntityType.OCELOT)));
-            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWCost(EntityType.WOLF)));
-            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWCost(EntityType.HORSE)));
+            messages.add(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost()));
+            messages.add(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost()));
        }

        return messages;
--- a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
@@ -777,7 +777,6 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
    public int getSharpenedClawsUnlock() { return config.getInt("Skills.Taming.SharpenedClaws.UnlockLevel", 750); }
    public double getSharpenedClawsBonus() { return config.getDouble("Skills.Taming.SharpenedClaws.Bonus", 2.0D); }

-    public double getMinHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MinHorseJumpStrength", 0.7D); }
    public double getMaxHorseJumpStrength() { return config.getDouble("Skills.Taming.CallOfTheWild.MaxHorseJumpStrength", 2.0D); }

    /* UNARMED */
--- a/src/main/java/com/gmail/nossr50/config/Config.java
+++ b/src/main/java/com/gmail/nossr50/config/Config.java
@@ -182,40 +182,20 @@ public class Config extends AutoUpdateConfigLoader {
            reason.add("Cannot use the same item for Repair and Salvage anvils!");
        }

-        if (getTamingCOTWMaterial(EntityType.WOLF) == null) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf.Item_Material is invalid!!");
+        if (getTamingCOTWWolfCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Bones_Required should be at least 1!");
        }

-        if (getTamingCOTWMaterial(EntityType.OCELOT) == null) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot.Item_Material is invalid!!");
-        }
-
-        if (getTamingCOTWMaterial(EntityType.HORSE) == null) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Horse.Item_Material is invalid!!");
-        }
-
-        if (getTamingCOTWCost(EntityType.WOLF) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf.Item_Amount should be greater than 0!");
-        }
-
-        if (getTamingCOTWCost(EntityType.OCELOT) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot.Item_Amount should be greater than 0!");
-        }
-
-        if (getTamingCOTWCost(EntityType.HORSE) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Horse.Item_Amount should be greater than 0!");
-        }
-
-        if (getTamingCOTWAmount(EntityType.WOLF) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf.Summon_Amount should be greater than 0!");
+        if (getTamingCOTWOcelotCost() < 1) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Fish_Required should be at least 1!");
        }

        if (getTamingCOTWAmount(EntityType.OCELOT) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot.Summon_Amount should be greater than 0!");
+            reason.add("Skills.Taming.Call_Of_The_Wild.Ocelot_Amount should be greater than 0!");
        }

-        if (getTamingCOTWAmount(EntityType.HORSE) <= 0) {
-            reason.add("Skills.Taming.Call_Of_The_Wild.Horse.Summon_Amount should be greater than 0!");
+        if (getTamingCOTWAmount(EntityType.WOLF) <= 0) {
+            reason.add("Skills.Taming.Call_Of_The_Wild.Wolf_Amount should be greater than 0!");
        }

        return noErrorsInConfig(reason);
@@ -238,6 +218,7 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
    public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
    public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
+    public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }

    public String getPartyChatPrefix() { return config.getString("Commands.partychat.Chat_Prefix_Format", "[[GREEN]]([[WHITE]]{0}[[GREEN]])"); }
    public boolean getPartyChatColorLeaderName() { return config.getBoolean("Commands.partychat.Gold_Leader_Name", true); }
@@ -248,7 +229,6 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getAdminDisplayNames() { return config.getBoolean("Commands.adminchat.Use_Display_Names", true); }

    public boolean getMatchOfflinePlayers() { return config.getBoolean("Commands.Generic.Match_OfflinePlayers", false); }
-    public long getDatabasePlayerCooldown() { return config.getLong("Commands.Database.Player_Cooldown", 1750); }

    public boolean getLevelUpSoundsEnabled() { return config.getBoolean("General.LevelUp_Sounds", true); }

@@ -443,7 +423,7 @@ public class Config extends AutoUpdateConfigLoader {

    /* Acrobatics */
    public boolean getDodgeLightningDisabled() { return config.getBoolean("Skills.Acrobatics.Prevent_Dodge_Lightning", false); }
-    public int getXPAfterTeleportCooldown() { return config.getInt("Skills.Acrobatics.XP_After_Teleport_Cooldown", 5); }
+    public boolean getPreventXPAfterTeleport() { return config.getBoolean("Skills.Acrobatics.Prevent_XP_After_Teleport", true); }

    /* Alchemy */
    public boolean getEnabledForHoppers() { return config.getBoolean("Skills.Alchemy.Enabled_for_Hoppers", true); }
@@ -469,10 +449,11 @@ public class Config extends AutoUpdateConfigLoader {
    public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); }

    /* Taming */
-    public Material getTamingCOTWMaterial(EntityType type) { return Material.matchMaterial(config.getString("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Material")); }
-    public int getTamingCOTWCost(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Item_Amount"); }
-    public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type) + ".Summon_Amount"); }
+    public int getTamingCOTWHorseCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Apples_Required", 10); }
+    public int getTamingCOTWWolfCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Bones_Required", 10); }
+    public int getTamingCOTWOcelotCost() { return config.getInt("Skills.Taming.Call_Of_The_Wild.Fish_Required", 10); }
    public double getTamingCOTWRange() { return config.getDouble("Skills.Taming.Call_Of_The_Wild.Range", 40.0D); }
+    public int getTamingCOTWAmount(EntityType type) { return config.getInt("Skills.Taming.Call_Of_The_Wild." + StringUtils.getPrettyEntityTypeString(type)+ "_Amount"); }

    /* Woodcutting */
    public boolean getOakDoubleDropsEnabled() { return config.getBoolean("Double_Drops.Woodcutting.Oak", true); }
--- a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java
@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import com.gmail.nossr50.skills.alchemy.Alchemy;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.inventory.ItemStack;
--- a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/DatabaseManager.java
@@ -44,7 +44,7 @@ public interface DatabaseManager {
    /**
    * Retrieve leaderboard info.
    *
-    * @param skill The skill to retrieve info on
+    * @param skillName The skill to retrieve info on
    * @param pageNumber Which page in the leaderboards to retrieve
    * @param statsPerPage The number of stats per page
    * @return the requested leaderboard information
--- a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java
@@ -15,6 +15,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;

+import org.apache.commons.lang.ArrayUtils;
+
 import org.bukkit.OfflinePlayer;

 import com.gmail.nossr50.mcMMO;
@@ -28,8 +30,6 @@ import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.StringUtils;

-import org.apache.commons.lang.ArrayUtils;
-
 public final class FlatfileDatabaseManager implements DatabaseManager {
    private final HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
    private final List<PlayerStat> powerLevels = new ArrayList<PlayerStat>();
@@ -814,7 +814,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
        }
    }

-    private PlayerProfile loadFromLine(String[] character) {
+    private PlayerProfile loadFromLine(String[] character) throws Exception {
        Map<SkillType, Integer>   skills     = getSkillMapFromLine(character);      // Skill levels
        Map<SkillType, Float>     skillsXp   = new HashMap<SkillType, Float>();     // Skill & XP
        Map<AbilityType, Integer> skillsDATS = new HashMap<AbilityType, Integer>(); // Ability & Cooldown
--- a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
+++ b/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
@@ -799,6 +799,7 @@ public final class SQLDatabaseManager implements DatabaseManager {
        }

        ResultSet resultSet;
+        HashMap<Integer, ArrayList<String>> rows = new HashMap<Integer, ArrayList<String>>();
        PreparedStatement statement = null;

        try {
@@ -810,7 +811,13 @@ public final class SQLDatabaseManager implements DatabaseManager {
            resultSet = statement.executeQuery();

            while (resultSet.next()) {
-                // No reason to do anything here... we're just trying to catch exceptions
+                ArrayList<String> column = new ArrayList<String>();
+
+                for (int i = 1; i <= resultSet.getMetaData().getColumnCount(); i++) {
+                    column.add(resultSet.getString(i));
+                }
+
+                rows.put(resultSet.getRow(), column);
            }
        }
        catch (SQLException ex) {
--- a/src/main/java/com/gmail/nossr50/datatypes/party/Party.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/party/Party.java
@@ -7,7 +7,6 @@ import java.util.List;

 import org.bukkit.ChatColor;
 import org.bukkit.Sound;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

 import com.gmail.nossr50.mcMMO;
@@ -84,19 +83,6 @@ public class Party {
        return onlineMembers;
    }

-    public List<String> getOnlinePlayerNames(CommandSender sender) {
-        Player player = sender instanceof Player ? (Player) sender : null;
-        List<String> onlinePlayerNames = new ArrayList<String>();
-
-        for (Player onlinePlayer : getOnlineMembers()) {
-            if (player != null && player.canSee(onlinePlayer)) {
-                onlinePlayerNames.add(onlinePlayer.getName());
-            }
-        }
-
-        return onlinePlayerNames;
-    }
-
    public String getName() {
        return name;
    }
@@ -351,4 +337,9 @@ public class Party {

        return this.getName().equals(other.getName());
    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
 }
--- a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
@@ -79,6 +79,7 @@ public class McMMOPlayer {
    private final Map<AbilityType, Boolean> abilityInformed = new HashMap<AbilityType, Boolean>();

    private final Map<ToolType, Boolean> toolMode = new HashMap<ToolType, Boolean>();
+    private final Map<ToolType, Integer> toolATS  = new HashMap<ToolType, Integer>();

    private int recentlyHurt;
    private int respawnATS;
@@ -90,6 +91,8 @@ public class McMMOPlayer {
    private boolean isUsingUnarmed;
    private final FixedMetadataValue playerMetadata;

+    private String nameTag;
+
    public McMMOPlayer(Player player) {
        String playerName = player.getName();

@@ -121,6 +124,7 @@ public class McMMOPlayer {

        for (ToolType toolType : ToolType.values()) {
            toolMode.put(toolType, false);
+            toolATS.put(toolType, 0);
        }

        if (!profile.isLoaded()) {
@@ -338,6 +342,28 @@ public class McMMOPlayer {
        toolMode.put(tool, isPrepared);
    }

+    /**
+     * Get the current prep ATS of a tool.
+     *
+     * @param tool Tool to get the ATS for
+     * @return the ATS for the tool
+     */
+    public long getToolPreparationATS(ToolType tool) {
+        return toolATS.get(tool);
+    }
+
+    /**
+     * Set the current prep ATS of a tool.
+     *
+     * @param tool Tool to set the ATS for
+     * @param ATS the ATS of the tool
+     */
+    public void setToolPreparationATS(ToolType tool, long ATS) {
+        int startTime = (int) (ATS / Misc.TIME_CONVERSION_FACTOR);
+
+        toolATS.put(tool, startTime);
+    }
+
    /*
     * Recently Hurt
     */
@@ -570,6 +596,10 @@ public class McMMOPlayer {
        return player;
    }

+    public void setPlayer(Player player) {
+        this.player = player;
+    }
+
    public PlayerProfile getProfile() {
        return profile;
    }
@@ -849,6 +879,7 @@ public class McMMOPlayer {
                player.sendMessage(tool.getRaiseTool());
            }

+            setToolPreparationATS(tool, System.currentTimeMillis());
            setToolPreparationMode(tool, true);
            new ToolLowerTask(this, tool).runTaskLaterAsynchronously(mcMMO.p, 4 * Misc.TICK_CONVERSION_FACTOR);
        }
@@ -920,4 +951,12 @@ public class McMMOPlayer {
    public FixedMetadataValue getPlayerMetadata() {
        return playerMetadata;
    }
+
+    public String getNameTag() {
+        return nameTag;
+    }
+
+    public void setNameTag(String nameTag) {
+        this.nameTag = nameTag;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java
@@ -1,14 +0,0 @@
-package com.gmail.nossr50.events.fake;
-
-import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.event.entity.EntityTameEvent;
-
-/**
- * Called when mcMMO tames an animal via Call of the Wild
- */
-public class FakeEntityTameEvent extends EntityTameEvent {
-    public FakeEntityTameEvent(LivingEntity entity, AnimalTamer owner) {
-        super (entity, owner);
-    }
-}
--- a/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SecondaryAbilityWeightedActivationCheckEvent.java
+++ b/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SecondaryAbilityWeightedActivationCheckEvent.java
@@ -15,7 +15,6 @@ public class SecondaryAbilityWeightedActivationCheckEvent extends SecondaryAbili

    /**
     * Gets the activation chance of the ability 0D being no chance,  1.0D being 100% chance
-     *
     * @return The activation chance of the ability
     */
    public double getChance() {
@@ -24,8 +23,7 @@ public class SecondaryAbilityWeightedActivationCheckEvent extends SecondaryAbili

    /**
     * Sets the activation chance of the ability [0D-1.0D]
-     *
-     * @param chance The activation chance of the ability
+     * @param The activation chance of the ability
     */
    public void setChance(double chance) {
        this.chance = chance;
@@ -33,8 +31,7 @@ public class SecondaryAbilityWeightedActivationCheckEvent extends SecondaryAbili

    /**
     * Sets the activation chance of the ability to 100% or 0%
-     *
-     * @param success whether it should be successful or not
+     * @param whether it should be successful or not
     */
    public void setSuccessful(boolean success) {
        this.chance = success ? 1.0D : 0D;
--- a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -3,7 +3,6 @@ package com.gmail.nossr50.listeners;
 import java.util.List;

 import org.bukkit.GameMode;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
@@ -67,7 +66,7 @@ public class BlockListener implements Listener {
        for (Block b : blocks) {
            if (BlockUtils.shouldBeWatched(b.getState()) && mcMMO.getPlaceStore().isTrue(b)) {
                b.getRelative(direction).setMetadata(mcMMO.blockMetadataKey, mcMMO.metadataValue);
-                if (b.equals(futureEmptyBlock) && futureEmptyBlock.getType() == Material.AIR) {
+                if (b.equals(futureEmptyBlock)) {
                    mcMMO.getPlaceStore().setFalse(b);
                }
            }
@@ -90,14 +89,10 @@ public class BlockListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        if (!event.isSticky()) {
-            return;
+        if (event.isSticky()) {
+            // Needed only because under some circumstances Minecraft doesn't move the block
+            new StickyPistonTrackerTask(event.getDirection(), event.getBlock()).runTaskLater(plugin, 2);
        }
-
-        Block movedBlock = event.getRetractLocation().getBlock();
-
-        // Needed only because under some circumstances Minecraft doesn't move the block
-        new StickyPistonTrackerTask(event.getDirection(), event.getBlock(), movedBlock).runTaskLater(plugin, 2);
    }

    /**
@@ -137,15 +132,14 @@ public class BlockListener implements Listener {
        }

        BlockState blockState = event.getBlock().getState();
-        Location location = blockState.getLocation();

        if (!BlockUtils.shouldBeWatched(blockState)) {
            return;
        }

        /* ALCHEMY - Cancel any brew in progress for that BrewingStand */
-        if (blockState instanceof BrewingStand && Alchemy.brewingStandMap.containsKey(location)) {
-            Alchemy.brewingStandMap.get(location).cancelBrew();
+        if (blockState instanceof BrewingStand && Alchemy.brewingStandMap.containsKey(event.getBlock())) {
+            Alchemy.brewingStandMap.get(event.getBlock()).cancelBrew();
        }

        Player player = event.getPlayer();
@@ -182,7 +176,7 @@ public class BlockListener implements Listener {
        }

        /* WOOD CUTTING */
-        else if (BlockUtils.isLog(blockState) && ItemUtils.isAxe(heldItem) && SkillType.WOODCUTTING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) {
+        else if (BlockUtils.isLog(blockState) && SkillType.WOODCUTTING.getPermissions(player) && !mcMMO.getPlaceStore().isTrue(blockState)) {
            WoodcuttingManager woodcuttingManager = mcMMOPlayer.getWoodcuttingManager();

            if (woodcuttingManager.canUseTreeFeller(heldItem)) {
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -5,7 +5,6 @@ import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.AnimalTamer;
 import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.LivingEntity;
@@ -31,10 +30,10 @@ import org.bukkit.event.entity.ExplosionPrimeEvent;
 import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
@@ -43,7 +42,6 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
 import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
-import com.gmail.nossr50.events.fake.FakeEntityTameEvent;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
@@ -53,7 +51,6 @@ import com.gmail.nossr50.skills.herbalism.Herbalism;
 import com.gmail.nossr50.skills.mining.MiningManager;
 import com.gmail.nossr50.skills.taming.Taming;
 import com.gmail.nossr50.skills.taming.TamingManager;
-import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
@@ -75,12 +72,14 @@ public class EntityListener implements Listener {
            return;
        }

-        if (event.getBow().containsEnchantment(Enchantment.ARROW_INFINITE)) {
+        ItemStack bow = event.getBow();
+
+        if (bow != null && bow.containsEnchantment(Enchantment.ARROW_INFINITE)) {
            projectile.setMetadata(mcMMO.infiniteArrowKey, mcMMO.metadataValue);
        }

        projectile.setMetadata(mcMMO.bowForceKey, new FixedMetadataValue(plugin, Math.min(event.getForce() * AdvancedConfig.getInstance().getForceMultiplier(), 1.0)));
-        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, projectile.getLocation()));
+        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, Archery.locationToString(projectile.getLocation())));
    }

    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -92,7 +91,7 @@ public class EntityListener implements Listener {
        }

        projectile.setMetadata(mcMMO.bowForceKey, new FixedMetadataValue(plugin, 1.0));
-        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, projectile.getLocation()));
+        projectile.setMetadata(mcMMO.arrowDistanceKey, new FixedMetadataValue(plugin, Archery.locationToString(projectile.getLocation())));
    }

    /**
@@ -102,29 +101,21 @@ public class EntityListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onEntityChangeBlock(EntityChangeBlockEvent event) {
-        Block block = event.getBlock();
+        Entity entity = event.getEntity();

-        if (!BlockUtils.shouldBeWatched(block.getState())) {
+        if (!(entity instanceof FallingBlock)) {
            return;
        }

-        Entity entity = event.getEntity();
+        Block block = event.getBlock();
+        boolean isTracked = entity.hasMetadata(mcMMO.entityMetadataKey);

-        if (entity instanceof FallingBlock || entity instanceof Enderman) {
-            boolean isTracked = entity.hasMetadata(mcMMO.entityMetadataKey);
-
-            if (mcMMO.getPlaceStore().isTrue(block) && !isTracked) {
-                mcMMO.getPlaceStore().setFalse(block);
-                entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
-            }
-            else if (isTracked) {
-                mcMMO.getPlaceStore().setTrue(block);
-            }
+        if (mcMMO.getPlaceStore().isTrue(block) && !isTracked) {
+            mcMMO.getPlaceStore().setFalse(block);
+            entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
        }
-        else {
-            if (mcMMO.getPlaceStore().isTrue(block)) {
-                mcMMO.getPlaceStore().setFalse(block);
-            }
+        else if (isTracked) {
+            mcMMO.getPlaceStore().setTrue(block);
        }
    }

@@ -183,10 +174,6 @@ public class EntityListener implements Listener {
            Player defendingPlayer = (Player) defender;
            Player attackingPlayer = (Player) attacker;

-            if (!UserManager.hasPlayerDataKey(defendingPlayer) || !UserManager.hasPlayerDataKey(attackingPlayer)) {
-                return;
-            }
-
            // We want to make sure we're not gaining XP or applying abilities when we hit ourselves
            if (defendingPlayer.equals(attackingPlayer)) {
                return;
@@ -199,7 +186,6 @@ public class EntityListener implements Listener {
        }

        CombatUtils.processCombatAttack(event, attacker, target);
-        CombatUtils.handleHealthbars(attacker, target, event.getDamage());
    }

    /**
@@ -240,11 +226,6 @@ public class EntityListener implements Listener {

        if (livingEntity instanceof Player) {
            Player player = (Player) entity;
-
-            if (!UserManager.hasPlayerDataKey(player)) {
-                return;
-            }
-
            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);

            /* Check for invincibility */
@@ -255,7 +236,7 @@ public class EntityListener implements Listener {

            switch (cause) {
                case FALL:
-                    if (!SkillUtils.cooldownExpired((long) mcMMOPlayer.getTeleportATS(), Config.getInstance().getXPAfterTeleportCooldown())) {
+                    if (Config.getInstance().getPreventXPAfterTeleport() && SkillUtils.calculateTimeLeft((long) mcMMOPlayer.getTeleportATS() * Misc.TIME_CONVERSION_FACTOR, 5, player) > 0) {
                        return;
                    }

@@ -576,10 +557,6 @@ public class EntityListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onEntityTame(EntityTameEvent event) {
-        if (event instanceof FakeEntityTameEvent) {
-            return;
-        }
-
        Player player = (Player) event.getOwner();
        LivingEntity entity = event.getEntity();

@@ -626,8 +603,9 @@ public class EntityListener implements Listener {
     */
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
    public void onPotionSplash(PotionSplashEvent event) {
-        for (PotionEffect effect : ((PotionMeta) event.getPotion().getItem().getItemMeta()).getCustomEffects()) {
-            if (!effect.getType().equals(PotionEffectType.SATURATION)) {
+        for (PotionEffect effect : ((PotionMeta) event.getEntity().getItem().getItemMeta()).getCustomEffects()) {
+            // (effect.getType() != PotionEffectType.SATURATION) is seemingly broken, so we use deprecated method for now.
+            if (effect.getType().getId() != 23) {
                return;
            }

--- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
@@ -183,10 +183,7 @@ public class InventoryListener implements Listener {
                        return;
                    }

-                    if (!AlchemyPotionBrewer.transferItems(event.getView(), event.getRawSlot(), click)) {
-                        return;
-                    }
-
+                    AlchemyPotionBrewer.transferItems(event.getView(), event.getRawSlot(), Alchemy.INGREDIENT_SLOT, click);
                    event.setCancelled(true);
                    AlchemyPotionBrewer.scheduleUpdate(inventory);
                    AlchemyPotionBrewer.scheduleCheck(player, stand);
--- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -6,7 +6,6 @@ import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -82,7 +81,7 @@ public class PlayerListener implements Listener {
    public void onPlayerTeleport(PlayerTeleportEvent event) {
        Player player = event.getPlayer();

-        if (!UserManager.hasPlayerDataKey(player) || Config.getInstance().getXPAfterTeleportCooldown() <= 0 || event.getFrom().equals(event.getTo())) {
+        if (!UserManager.hasPlayerDataKey(player) || !Config.getInstance().getPreventXPAfterTeleport() || event.getFrom().equals(event.getTo())) {
            return;
        }

@@ -305,7 +304,7 @@ public class PlayerListener implements Listener {
        ItemStack dropStack = drop.getItemStack();

        if (drop.hasMetadata(mcMMO.disarmedItemKey)) {
-            if (!player.getName().equals(drop.getMetadata(mcMMO.disarmedItemKey).get(0).asString())) {
+            if (!player.getName().equals(drop.getMetadata(mcMMO.disarmedItemKey).get(0).value())) {
                event.setCancelled(true);
            }

@@ -597,14 +596,21 @@ public class PlayerListener implements Listener {
                Material type = heldItem.getType();
                TamingManager tamingManager = mcMMOPlayer.getTamingManager();

-                if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.WOLF)) {
-                    tamingManager.summonWolf();
-                }
-                else if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.OCELOT)) {
-                    tamingManager.summonOcelot();
-                }
-                else if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.HORSE)) {
-                    tamingManager.summonHorse();
+                switch (type) {
+                    case APPLE:
+                        tamingManager.summonHorse();
+                        break;
+
+                    case BONE:
+                        tamingManager.summonWolf();
+                        break;
+
+                    case RAW_FISH:
+                        tamingManager.summonOcelot();
+                        break;
+
+                    default:
+                        break;
                }

                break;
@@ -627,7 +633,7 @@ public class PlayerListener implements Listener {
            return;
        }

-        McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(player);
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player, true);

        if (mcMMOPlayer == null) {
            mcMMO.p.debug(player.getName() + "is chatting, but is currently not logged in to the server.");
--- a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
@@ -1,16 +1,16 @@
 package com.gmail.nossr50.listeners;

+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
-import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;

 public class SelfListener implements Listener {
    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
--- a/src/main/java/com/gmail/nossr50/listeners/TagListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/TagListener.java
@@ -0,0 +1,59 @@
+package com.gmail.nossr50.listeners;
+
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+
+import org.kitteh.tag.AsyncPlayerReceiveNameTagEvent;
+
+public class TagListener implements Listener {
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onAsyncPlayerReceiveNameTag(AsyncPlayerReceiveNameTagEvent event) {
+        Player player = event.getNamedPlayer();
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player, true);
+
+        if (mcMMOPlayer == null) {
+            return;
+        }
+
+        String tag = event.getTag();
+        String colorlessTag = ChatColor.stripColor(tag);
+
+        if (colorlessTag.equals(tag)) {
+            mcMMOPlayer.setNameTag(null);
+            return;
+        }
+
+        if (colorlessTag.equals(player.getName()) && (mcMMOPlayer.getNameTag() == null || !mcMMOPlayer.getNameTag().equals(tag))) {
+            mcMMOPlayer.setNameTag(tag);
+            ScoreboardManager.tagUpdate(player);
+        }
+
+        /*
+        mbax:
+            With TagAPI, you can set the name tag over anybody's head to any value.
+            You can have five people with the name 'Notch' (And one named 'notch' for
+            good measure). That makes it difficult to properly utilize the scoreboard
+            feature to match a changed name to a score for below name objective display.
+
+            Additionally, every single player can be seeing a different username over
+            the head of the same player. So even if you're just trying to detect colored usernames
+            you could be encountering 16 different colors before a username (15, generally, who does white?)
+            and maybe some format codes as well. The Scoreboard API doesn't support per-player setting of names,
+               so you'd have to add an entry for each.
+
+            At best, what you could do is listen to TagAPI's event on MONITOR priority and track all the names.
+            Check if a set name is the same as their actual name, sans colors. If yes, store that and each time
+            you update a player's below-name objective, update an OfflinePlayer with that colored version as well.
+            This is not a good idea if the objective will ever change DisplaySlot, particularly if it goes to the
+            sidebar, since you'll then need to clear the color ones.
+         */
+    }
+}
--- a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
@@ -1,6 +1,7 @@
 package com.gmail.nossr50.listeners;

 import java.io.File;
+import java.util.ArrayList;

 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -17,6 +18,7 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionMain;

 public class WorldListener implements Listener {
+    private final ArrayList<BlockStoreConversionMain> converters = new ArrayList<BlockStoreConversionMain>();
    private final mcMMO plugin;

    public WorldListener(final mcMMO plugin) {
@@ -54,7 +56,9 @@ public class WorldListener implements Listener {

        plugin.getLogger().info("Converting block storage for " + world.getName() + " to a new format.");

-        new BlockStoreConversionMain(world).run();
+        BlockStoreConversionMain converter = new BlockStoreConversionMain(world);
+        converter.run();
+        converters.add(converter);
    }

    /**
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -28,11 +28,11 @@ import com.gmail.nossr50.listeners.EntityListener;
 import com.gmail.nossr50.listeners.InventoryListener;
 import com.gmail.nossr50.listeners.PlayerListener;
 import com.gmail.nossr50.listeners.SelfListener;
+import com.gmail.nossr50.listeners.TagListener;
 import com.gmail.nossr50.listeners.WorldListener;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.metrics.MetricsManager;
 import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.runnables.CheckDateTask;
 import com.gmail.nossr50.runnables.SaveTimerTask;
 import com.gmail.nossr50.runnables.backups.CleanBackupsTask;
 import com.gmail.nossr50.runnables.database.UserPurgeTask;
@@ -88,6 +88,10 @@ public class mcMMO extends JavaPlugin {
    /* Plugin Checks */
    private static boolean combatTagEnabled;
    private static boolean healthBarPluginEnabled;
+    private static boolean noCheatPlusPluginEnabled;
+    private static boolean compatNoCheatPlusPluginEnabled;
+    private static boolean tagapiPluginEnabled;
+    private static boolean mcpcEnabled;

    // Config Validation Check
    public boolean noErrorsInConfigFiles = true;
@@ -123,9 +127,12 @@ public class mcMMO extends JavaPlugin {
            getLogger().setFilter(new LogFilter(this));
            metadataValue = new FixedMetadataValue(this, true);

-            PluginManager pluginManager = getServer().getPluginManager();
-            combatTagEnabled = pluginManager.getPlugin("CombatTag") != null;
-            healthBarPluginEnabled = pluginManager.getPlugin("HealthBar") != null;
+            mcpcEnabled = getServer().getName().equals("MCPC+");
+            combatTagEnabled = getServer().getPluginManager().getPlugin("CombatTag") != null;
+            healthBarPluginEnabled = getServer().getPluginManager().getPlugin("HealthBar") != null;
+            noCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("NoCheatPlus") != null;
+            compatNoCheatPlusPluginEnabled = getServer().getPluginManager().getPlugin("CompatNoCheatPlus") != null;
+            tagapiPluginEnabled = getServer().getPluginManager().getPlugin("TagAPI") != null && checkTagVersion();

            setupFilePaths();

@@ -137,7 +144,7 @@ public class mcMMO extends JavaPlugin {
                return;
            }

-            if (getServer().getName().equals("MCPC+")) {
+            if (mcpcEnabled) {
                checkModConfigs();
            }

@@ -145,7 +152,7 @@ public class mcMMO extends JavaPlugin {
                getLogger().info("HealthBar plugin found, mcMMO's healthbars are automatically disabled.");
            }

-            if (pluginManager.getPlugin("NoCheatPlus") != null && pluginManager.getPlugin("CompatNoCheatPlus") == null) {
+            if (noCheatPlusPluginEnabled && !compatNoCheatPlusPluginEnabled) {
                getLogger().warning("NoCheatPlus plugin found, but CompatNoCheatPlus was not found!");
                getLogger().warning("mcMMO will not work properly alongside NoCheatPlus without CompatNoCheatPlus");
            }
@@ -311,6 +318,10 @@ public class mcMMO extends JavaPlugin {
        return healthBarPluginEnabled;
    }

+    public static boolean isMCPCEnabled() {
+        return mcpcEnabled;
+    }
+
    /**
     * Setup the various storage file paths
     */
@@ -437,6 +448,10 @@ public class mcMMO extends JavaPlugin {
        pluginManager.registerEvents(new InventoryListener(this), this);
        pluginManager.registerEvents(new SelfListener(), this);
        pluginManager.registerEvents(new WorldListener(this), this);
+
+        if (tagapiPluginEnabled) {
+            pluginManager.registerEvents(new TagListener(), this);
+        }
    }

    private void registerCustomRecipes() {
@@ -478,10 +493,6 @@ public class mcMMO extends JavaPlugin {

        // Update power level tag scoreboards
        new PowerLevelUpdatingTask().runTaskTimer(this, 2 * Misc.TICK_CONVERSION_FACTOR, 2 * Misc.TICK_CONVERSION_FACTOR);
-
-        if (getHolidayManager().nearingAprilFirst()) {
-            new CheckDateTask().runTaskTimer(this, 10L * Misc.TICK_CONVERSION_FACTOR, 1L * 60L * 60L * Misc.TICK_CONVERSION_FACTOR);
-        }
    }

    private void checkModConfigs() {
@@ -505,4 +516,17 @@ public class mcMMO extends JavaPlugin {
            getLogger().info("To enable, set Mods.Entity_Mods_Enabled to TRUE in config.yml.");
        }
    }
+
+    private boolean checkTagVersion() {
+        try {
+            Class.forName("org.kitteh.tag.AsyncPlayerReceiveNameTagEvent");
+        }
+        catch (final ClassNotFoundException e) {
+            getLogger().info("This TagAPI version does not have AsyncPlayerReceiveNameTagEvent");
+            getLogger().info("Please update TagAPI to ensure full compatibility with mcMMO");
+            return false;
+        }
+
+        return true;
+    }
 }
--- a/src/main/java/com/gmail/nossr50/party/PartyManager.java
+++ b/src/main/java/com/gmail/nossr50/party/PartyManager.java
@@ -260,11 +260,6 @@ public final class PartyManager {
            processPartyLeaving(UserManager.getPlayer(member));
        }

-        // Disband the alliance between the disbanded party and it's ally
-        if (party.getAlly() != null) {
-            party.getAlly().setAlly(null);
-        }
-
        parties.remove(party);
    }

@@ -464,6 +459,16 @@ public final class PartyManager {
        return !party.isLocked() || party.getLeader().equalsIgnoreCase(mcMMOPlayer.getPlayer().getName());
    }

+    /**
+     * Check if a string is a valid party name.
+     *
+     * @param partyName The party name to check
+     * @return true if this is a valid party, false otherwise
+     */
+    public static boolean isParty(String partyName) {
+        return getParty(partyName) != null;
+    }
+
    /**
     * Load party file.
     */
--- a/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java
@@ -1,24 +0,0 @@
-package com.gmail.nossr50.runnables;
-
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.skills.AprilTask;
-import com.gmail.nossr50.util.Misc;
-
-public class CheckDateTask extends BukkitRunnable {
-
-    @Override
-    public void run() {
-        if (!mcMMO.getHolidayManager().isAprilFirst()) {
-            return;
-        }
-
-        // Set up jokes
-        new AprilTask().runTaskTimer(mcMMO.p, 1L * 60L * Misc.TICK_CONVERSION_FACTOR, 10L * 60L * Misc.TICK_CONVERSION_FACTOR);
-        mcMMO.getHolidayManager().registerAprilCommand();
-
-        // Jokes deployed.
-        this.cancel();
-    }
-}
--- a/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java
@@ -1,31 +1,31 @@
 package com.gmail.nossr50.runnables;

+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.PistonMoveReaction;
 import org.bukkit.scheduler.BukkitRunnable;

 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.BlockUtils;

 public class StickyPistonTrackerTask extends BukkitRunnable {
    private BlockFace direction;
    private Block block;
-    private Block movedBlock;

-    public StickyPistonTrackerTask(BlockFace direction, Block block, Block movedBlock) {
+    public StickyPistonTrackerTask(BlockFace direction, Block block) {
        this.direction = direction;
        this.block = block;
-        this.movedBlock = movedBlock;
    }

    @Override
    public void run() {
-        if (!BlockUtils.shouldBeWatched(movedBlock.getState()) || movedBlock.getPistonMoveReaction() != PistonMoveReaction.MOVE || !mcMMO.getPlaceStore().isTrue(movedBlock)) {
+        Block newBlock = block.getRelative(direction);
+        Block originalBlock = newBlock.getRelative(direction);
+
+        if (originalBlock.getType() != Material.AIR || !mcMMO.getPlaceStore().isTrue(originalBlock)) {
            return;
        }

-        mcMMO.getPlaceStore().setFalse(movedBlock);
-        mcMMO.getPlaceStore().setTrue(block.getRelative(direction));
+        mcMMO.getPlaceStore().setFalse(originalBlock);
+        mcMMO.getPlaceStore().setTrue(newBlock);
    }
 }
--- a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java
@@ -28,7 +28,7 @@ public class FormulaConversionTask extends BukkitRunnable {
        int convertedUsers = 0;
        long startMillis = System.currentTimeMillis();
        for (String playerName : mcMMO.getDatabaseManager().getStoredUsers()) {
-            McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);
            PlayerProfile profile;

            // 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.
--- a/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java
@@ -1,55 +0,0 @@
-package com.gmail.nossr50.runnables.skills;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.HolidayManager;
-import com.gmail.nossr50.util.Misc;
-
-public class AprilTask extends BukkitRunnable {
-
-    @Override
-    public void run() {
-        if (!mcMMO.getHolidayManager().isAprilFirst()) {
-            this.cancel();
-            return;
-        }
-
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            int betterRandom = Misc.getRandom().nextInt(2000);
-            if (betterRandom == 0) {
-                player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
-                player.sendMessage(unknown("superskill") + " skill increased by 1. Total (" + unknown("12") + ")");
-                fireworksShow(player);
-            }
-
-            for (HolidayManager.FakeSkillType fakeSkillType : HolidayManager.FakeSkillType.values()) {
-                int random = Misc.getRandom().nextInt(250);
-                if (random == 0) {
-                    mcMMO.getHolidayManager().levelUpApril(player, fakeSkillType);
-                    break;
-                }
-            }
-        }
-    }
-
-    private void fireworksShow(final Player player) {
-        final int firework_amount = 10;
-        for (int i = 0; i < firework_amount; i++) {
-            int delay = (int) (Misc.getRandom().nextDouble() * 3 * Misc.TICK_CONVERSION_FACTOR) + 4;
-            mcMMO.p.getServer().getScheduler().runTaskLater(mcMMO.p, new Runnable() {
-                @Override
-                public void run() {
-                    mcMMO.getHolidayManager().spawnFireworks(player);
-                }
-            }, delay);
-        }
-    }
-
-    private String unknown(String string) {
-        return ChatColor.MAGIC + string + ChatColor.RESET + ChatColor.YELLOW;
-    }
-}
--- a/src/main/java/com/gmail/nossr50/skills/SkillManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillManager.java
@@ -17,6 +17,10 @@ public abstract class SkillManager {
        this.skill = skill;
    }

+    public McMMOPlayer getMcMMOPlayer() {
+        return mcMMOPlayer;
+    }
+
    public Player getPlayer() {
        return mcMMOPlayer.getPlayer();
    }
--- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.skills.alchemy;

 import java.util.List;

+import com.gmail.nossr50.util.Permissions;
 import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.config.experience.ExperienceConfig;
--- a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java
+++ b/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java
@@ -15,8 +15,8 @@ import org.bukkit.inventory.ItemStack;

 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
-import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
+import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.runnables.PlayerUpdateInventoryTask;
 import com.gmail.nossr50.runnables.skills.AlchemyBrewCheckTask;
 import com.gmail.nossr50.util.Permissions;
@@ -54,7 +54,7 @@ public final class AlchemyPotionBrewer {
    }

    private static boolean removeIngredient(BrewerInventory inventory, Player player) {
-        ItemStack ingredient = inventory.getIngredient() == null ? null : inventory.getIngredient().clone();
+        ItemStack ingredient = inventory.getIngredient().clone();

        if (isEmpty(ingredient) || !isValidIngredient(player, ingredient)) {
            return false;
@@ -124,24 +124,25 @@ public final class AlchemyPotionBrewer {
        }
    }

-    public static boolean transferItems(InventoryView view, int fromSlot, ClickType click) {
+    public static boolean transferItems(InventoryView view, int fromSlot, int toSlot, ClickType click) {
        boolean success = false;

        if (click.isLeftClick()) {
-            success = transferItems(view, fromSlot);
+            success = transferItems(view, fromSlot, toSlot);
        }
        else if (click.isRightClick()) {
-            success = transferOneItem(view, fromSlot);
+            success = transferOneItem(view, fromSlot, toSlot);
        }

        return success;
    }

-    private static boolean transferOneItem(InventoryView view, int fromSlot) {
+    private static boolean transferOneItem(InventoryView view, int fromSlot, int toSlot) {
        ItemStack from = view.getItem(fromSlot).clone();
-        ItemStack to = view.getItem(Alchemy.INGREDIENT_SLOT).clone();
+        ItemStack to = view.getItem(toSlot).clone();
+        boolean emptyFrom = isEmpty(from);

-        if (isEmpty(from)) {
+        if (emptyFrom) {
            return false;
        }

@@ -161,8 +162,8 @@ public final class AlchemyPotionBrewer {
            }

            from.setAmount(fromAmount - 1);
-            view.setItem(Alchemy.INGREDIENT_SLOT, to);
-            view.setItem(fromSlot, from);
+            view.setItem(toSlot, emptyTo ? null : to);
+            view.setItem(fromSlot, emptyFrom ? null : from);

            return true;
        }
@@ -173,15 +174,15 @@ public final class AlchemyPotionBrewer {
    /**
     * Transfer items between two ItemStacks, returning the leftover status
     */
-    private static boolean transferItems(InventoryView view, int fromSlot) {
+    private static boolean transferItems(InventoryView view, int fromSlot, int toSlot) {
        ItemStack from = view.getItem(fromSlot).clone();
-        ItemStack to = view.getItem(Alchemy.INGREDIENT_SLOT).clone();
+        ItemStack to = view.getItem(toSlot).clone();

        if (isEmpty(from)) {
            return false;
        }
        else if (isEmpty(to)) {
-            view.setItem(Alchemy.INGREDIENT_SLOT, from);
+            view.setItem(toSlot, from);
            view.setItem(fromSlot, null);

            return true;
@@ -195,7 +196,7 @@ public final class AlchemyPotionBrewer {
                int left = fromAmount + toAmount - maxSize;

                to.setAmount(maxSize);
-                view.setItem(Alchemy.INGREDIENT_SLOT, to);
+                view.setItem(toSlot, to);

                from.setAmount(left);
                view.setItem(fromSlot, from);
@@ -205,7 +206,7 @@ public final class AlchemyPotionBrewer {

            to.setAmount(fromAmount + toAmount);
            view.setItem(fromSlot, null);
-            view.setItem(Alchemy.INGREDIENT_SLOT, to);
+            view.setItem(toSlot, to);

            return true;
        }
--- a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/Archery.java
@@ -4,10 +4,12 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;

+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;

+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.util.Misc;

@@ -61,4 +63,14 @@ public class Archery {
            }
        }
    }
+
+    public static Location stringToLocation(String location) {
+        String[] values = location.split(",");
+
+        return new Location(mcMMO.p.getServer().getWorld(values[0]), Double.parseDouble(values[1]), Double.parseDouble(values[2]), Double.parseDouble(values[3]), Float.parseFloat(values[4]), Float.parseFloat(values[5]));
+    }
+
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + "," + location.getX() + "," + location.getY() + "," + location.getZ() + "," + location.getYaw() + "," + location.getPitch();
+    }
 }
--- a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
@@ -45,7 +45,7 @@ public class ArcheryManager extends SkillManager {
     * @param damager The {@link Entity} who shot the arrow
     */
    public void distanceXpBonus(LivingEntity target, Entity damager) {
-        Location firedLocation = (Location) damager.getMetadata(mcMMO.arrowDistanceKey).get(0).value();
+        Location firedLocation = Archery.stringToLocation(damager.getMetadata(mcMMO.arrowDistanceKey).get(0).asString());
        Location targetLocation = target.getLocation();

        if (firedLocation.getWorld() != targetLocation.getWorld()) {
--- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java
+++ b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java
@@ -3,9 +3,9 @@ package com.gmail.nossr50.skills.excavation;
 import java.util.ArrayList;
 import java.util.List;

+import com.gmail.nossr50.mcMMO;
 import org.bukkit.block.BlockState;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
--- a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
+++ b/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
@@ -54,6 +54,8 @@ public final class Fishing {
    public static int fishermansDietRankLevel2 = fishermansDietRankLevel1 * 2;
    public static int fishermansDietMaxLevel   = fishermansDietRankLevel1 * 5;

+    public static final double STORM_MODIFIER = 0.909;
+
    private Fishing() {}

    /**
--- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java
@@ -1,10 +1,10 @@
 package com.gmail.nossr50.skills.mining;

+import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.inventory.ItemStack;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
--- a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java
@@ -115,8 +115,8 @@ public class MiningManager extends SkillManager {
    /**
     * Handler for explosion drops and XP gain.
     *
-     * @param yield The % of blocks to drop
-     * @param blockList The list of blocks to drop
+     * @param yield
+     * @param blockList
     */
    public void blastMiningDropProcessing(float yield, List<Block> blockList) {
        List<BlockState> ores = new ArrayList<BlockState>();
--- a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
@@ -340,7 +340,7 @@ public class RepairManager extends SkillManager {
            if (getKeepEnchantChance() > Misc.getRandom().nextInt(activationChance)) {
                int enchantLevel = enchant.getValue();

-                if (ArcaneForging.arcaneForgingDowngrades && enchantLevel > 1 && (100 - getDowngradeEnchantChance()) <= Misc.getRandom().nextInt(activationChance)) {
+                if (ArcaneForging.arcaneForgingDowngrades && enchantLevel > 1 && getDowngradeEnchantChance() > Misc.getRandom().nextInt(activationChance)) {
                    item.addUnsafeEnchantment(enchantment, enchantLevel - 1);
                    downgraded = true;
                }
--- a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java
+++ b/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java
@@ -1,10 +1,10 @@
 package com.gmail.nossr50.skills.smelting;

+import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
--- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
@@ -16,7 +16,6 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.events.fake.FakeEntityTameEvent;
 import com.gmail.nossr50.events.skills.secondaryabilities.SecondaryAbilityWeightedActivationCheckEvent;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.runnables.skills.BleedTimerTask;
@@ -146,7 +145,7 @@ public class TamingManager extends SkillManager {
            return;
        }

-        callOfTheWild(EntityType.OCELOT, Config.getInstance().getTamingCOTWCost(EntityType.OCELOT));
+        callOfTheWild(EntityType.OCELOT, Config.getInstance().getTamingCOTWOcelotCost());
    }

    /**
@@ -157,7 +156,7 @@ public class TamingManager extends SkillManager {
            return;
        }

-        callOfTheWild(EntityType.WOLF, Config.getInstance().getTamingCOTWCost(EntityType.WOLF));
+        callOfTheWild(EntityType.WOLF, Config.getInstance().getTamingCOTWWolfCost());
    }

    /**
@@ -168,7 +167,7 @@ public class TamingManager extends SkillManager {
            return;
        }

-        callOfTheWild(EntityType.HORSE, Config.getInstance().getTamingCOTWCost(EntityType.HORSE));
+        callOfTheWild(EntityType.HORSE, Config.getInstance().getTamingCOTWHorseCost());
    }

    /**
@@ -227,16 +226,8 @@ public class TamingManager extends SkillManager {
        for (int i = 0; i < amount; i++) {
            LivingEntity entity = (LivingEntity) player.getWorld().spawnEntity(player.getLocation(), type);

-            FakeEntityTameEvent event = new FakeEntityTameEvent(entity, player);
-            mcMMO.p.getServer().getPluginManager().callEvent(event);
-
-            if (event.isCancelled()) {
-                continue;
-            }
-
            entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
            ((Tameable) entity).setOwner(player);
-            entity.setRemoveWhenFarAway(false);

            switch (type) {
                case OCELOT:
@@ -255,7 +246,7 @@ public class TamingManager extends SkillManager {
                    entity.setHealth(entity.getMaxHealth());
                    horse.setColor(Horse.Color.values()[Misc.getRandom().nextInt(Horse.Color.values().length)]);
                    horse.setStyle(Horse.Style.values()[Misc.getRandom().nextInt(Horse.Style.values().length)]);
-                    horse.setJumpStrength(Math.max(AdvancedConfig.getInstance().getMinHorseJumpStrength(), Math.min(Math.min(Misc.getRandom().nextDouble(), Misc.getRandom().nextDouble()) * 2, AdvancedConfig.getInstance().getMaxHorseJumpStrength())));
+                    horse.setJumpStrength(Math.min(Math.min(Misc.getRandom().nextDouble(), Misc.getRandom().nextDouble()) * 2, AdvancedConfig.getInstance().getMaxHorseJumpStrength()));
                    //TODO: setSpeed, once available
                    break;

--- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java
+++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java
@@ -3,6 +3,7 @@ package com.gmail.nossr50.skills.woodcutting;
 import java.util.HashSet;
 import java.util.Set;

+import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -11,7 +12,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.Tree;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
--- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java
@@ -2,6 +2,7 @@ package com.gmail.nossr50.util;

 import java.util.HashSet;

+import com.gmail.nossr50.mcMMO;
 import org.bukkit.CropState;
 import org.bukkit.Material;
 import org.bukkit.NetherWartsState;
@@ -12,7 +13,6 @@ import org.bukkit.material.Crops;
 import org.bukkit.material.NetherWarts;
 import org.bukkit.material.SmoothBrick;

-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.Repair;

 public final class BlockUtils {
--- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java
+++ b/src/main/java/com/gmail/nossr50/util/HolidayManager.java
@@ -19,56 +19,25 @@ import org.bukkit.Color;
 import org.bukkit.DyeColor;
 import org.bukkit.FireworkEffect;
 import org.bukkit.FireworkEffect.Type;
-import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Firework;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.meta.FireworkMeta;

 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.commands.skills.AprilCommand;
-import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.ParticleEffectUtils;

 import com.google.common.collect.ImmutableList;

 public final class HolidayManager {
    private ArrayList<String> hasCelebrated;
    private int currentYear;
-    private static final int START_YEAR = 2011;
+    private final int startYear = 2011;

    private static final List<Color> ALL_COLORS;
    private static final List<ChatColor> ALL_CHAT_COLORS;
    private static final List<ChatColor> CHAT_FORMATS;

-    public enum FakeSkillType {
-        MACHO,
-        JUMPING,
-        THROWING,
-        WRECKING,
-        CRAFTING,
-        WALKING,
-        SWIMMING,
-        FALLING,
-        CLIMBING,
-        FLYING,
-        DIVING,
-        PIGGY,
-        UNKNOWN;
-
-        public static FakeSkillType getByName(String skillName) {
-            for (FakeSkillType type : values()) {
-                if (type.name().equalsIgnoreCase(skillName)) {
-                    return type;
-                }
-            }
-            return null;
-        }
-    }
-
    static {
        List<Color> colors = new ArrayList<Color>();
        List<ChatColor> chatColors = new ArrayList<ChatColor>();
@@ -196,7 +165,7 @@ public final class HolidayManager {
            return;
        }

-        sender.sendMessage(ChatColor.BLUE + "Happy " + (currentYear - START_YEAR) + " Year Anniversary!  In honor of all of");
+        sender.sendMessage(ChatColor.BLUE + "Happy " + (currentYear - startYear) + " Year Anniversary!  In honor of all of");
        sender.sendMessage(ChatColor.BLUE + "nossr50's work and all the devs, here's a firework show!");
        if (sender instanceof Player) {
            final int firework_amount = 10;
@@ -252,11 +221,11 @@ public final class HolidayManager {
        hasCelebrated.add(sender.getName());
    }

-    public boolean getDateRange(Date date, Date start, Date end) {
+    private boolean getDateRange(Date date, Date start, Date end) {
        return !(date.before(start) || date.after(end));
    }

-    public void spawnFireworks(Player player) {
+    private void spawnFireworks(Player player) {
        int power = Misc.getRandom().nextInt(3) + 1;
        Type fireworkType = Type.values()[Misc.getRandom().nextInt(Type.values().length)];
        double varX = Misc.getRandom().nextGaussian() * 3;
@@ -285,31 +254,4 @@ public final class HolidayManager {

        return ret.toString();
    }
-
-    public boolean isAprilFirst() {
-        GregorianCalendar aprilFirst = new GregorianCalendar(currentYear, Calendar.APRIL, 1);
-        GregorianCalendar aprilSecond = new GregorianCalendar(currentYear, Calendar.APRIL, 2);
-        GregorianCalendar day = new GregorianCalendar();
-        return getDateRange(day.getTime(), aprilFirst.getTime(), aprilSecond.getTime());
-    }
-
-    public boolean nearingAprilFirst() {
-        GregorianCalendar start = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.MARCH, 28);
-        GregorianCalendar end = new GregorianCalendar(Calendar.getInstance().get(Calendar.YEAR), Calendar.APRIL, 2);
-        GregorianCalendar day = new GregorianCalendar();
-
-        return mcMMO.getHolidayManager().getDateRange(day.getTime(), start.getTime(), end.getTime());
-    }
-
-    public void levelUpApril(Player player, FakeSkillType fakeSkillType) {
-        int levelTotal = Misc.getRandom().nextInt(UserManager.getPlayer(player).getSkillLevel(SkillType.MINING)) + 1;
-        player.playSound(player.getLocation(), Sound.LEVEL_UP, Misc.LEVELUP_VOLUME, Misc.LEVELUP_PITCH);
-        player.sendMessage(ChatColor.YELLOW + StringUtils.getCapitalized(fakeSkillType.toString()) + " skill increased by 1. Total (" + levelTotal + ")");
-        ParticleEffectUtils.fireworkParticleShower(player, ALL_COLORS.get(Misc.getRandom().nextInt(ALL_COLORS.size())));
-    }
-
-    public void registerAprilCommand() {
-        PluginCommand command = mcMMO.p.getCommand("mcfools");
-        command.setExecutor(new AprilCommand());
-    }
 }
--- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/ItemUtils.java
@@ -498,7 +498,11 @@ public final class ItemUtils {
    }

    public static boolean isSmeltable(ItemStack item) {
-        return item != null && MaterialUtils.isOre(item.getData());
+        if (item == null) {
+            return false;
+        }
+
+        return MaterialUtils.isOre(item.getData());
    }

    public static boolean isSmelted(ItemStack item) {
--- a/src/main/java/com/gmail/nossr50/util/MaterialUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/MaterialUtils.java
@@ -1,8 +1,7 @@
 package com.gmail.nossr50.util;

-import org.bukkit.material.MaterialData;
-
 import com.gmail.nossr50.mcMMO;
+import org.bukkit.material.MaterialData;

 public final class MaterialUtils {
    private MaterialUtils() {}
--- a/src/main/java/com/gmail/nossr50/util/Misc.java
+++ b/src/main/java/com/gmail/nossr50/util/Misc.java
@@ -22,6 +22,7 @@ public final class Misc {
    public static final int TIME_CONVERSION_FACTOR = 1000;
    public static final int TICK_CONVERSION_FACTOR = 20;

+    public static final long PLAYER_DATABASE_COOLDOWN_MILLIS = 1750;
    public static final int PLAYER_RESPAWN_COOLDOWN_SECONDS = 5;
    public static final double SKILL_MESSAGE_MAX_SENDING_DISTANCE = 10.0;

@@ -63,7 +64,11 @@ public final class Misc {
     * @return true if the distance between {@code first} and {@code second} is less than {@code maxDistance}, false otherwise
     */
    public static boolean isNear(Location first, Location second, double maxDistance) {
-        return (first.getWorld() == second.getWorld()) && (first.distanceSquared(second) < (maxDistance * maxDistance) || maxDistance == 0);
+        if (first.getWorld() != second.getWorld()) {
+            return false;
+        }
+
+        return first.distanceSquared(second) < (maxDistance * maxDistance) || maxDistance == 0;
    }

    public static void dropItems(Location location, Collection<ItemStack> drops) {
@@ -85,6 +90,41 @@ public final class Misc {
        }
    }

+    /**
+     * Randomly drop an item at a given location.
+     *
+     * @param location The location to drop the items at
+     * @param is The item to drop
+     * @param chance The percentage chance for the item to drop
+     */
+    public static void randomDropItem(Location location, ItemStack is, double chance) {
+        if (random.nextInt(100) < chance) {
+            dropItem(location, is);
+        }
+    }
+
+    /**
+     * Drop items with random quantity at a given location.
+     *
+     * @param location The location to drop the items at
+     * @param is The item to drop
+     * @param quantity The amount of items to drop
+     */
+    public static void randomDropItems(Location location, ItemStack is, int quantity) {
+        int dropCount = random.nextInt(quantity + 1);
+
+        if (dropCount > 0) {
+            is.setAmount(dropCount);
+            dropItem(location, is);
+        }
+    }
+
+    public static void randomDropItems(Location location, Collection<ItemStack> drops, double chance) {
+        for (ItemStack item : drops) {
+            randomDropItem(location, item, chance);
+        }
+    }
+
    /**
     * Drop an item at a given location.
     *
--- a/src/main/java/com/gmail/nossr50/util/ModManager.java
+++ b/src/main/java/com/gmail/nossr50/util/ModManager.java
@@ -1,18 +1,5 @@
 package com.gmail.nossr50.util;

-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.bukkit.Material;
-import org.bukkit.block.BlockState;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
-
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.mods.CustomArmorConfig;
 import com.gmail.nossr50.config.mods.CustomBlockConfig;
@@ -21,7 +8,19 @@ import com.gmail.nossr50.config.mods.CustomToolConfig;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.datatypes.mods.CustomEntity;
 import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;

 public class ModManager {
    private List<Repairable> repairables = new ArrayList<Repairable>();
--- a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
@@ -90,10 +90,6 @@ public final class CommandUtils {
     */
    public static boolean checkPlayerExistence(CommandSender sender, String playerName, McMMOPlayer mcMMOPlayer) {
        if (mcMMOPlayer != null) {
-            if (CommandUtils.hidden(sender, mcMMOPlayer.getPlayer(), false)) {
-                sender.sendMessage(LocaleLoader.getString("Commands.Offline"));
-                return false;
-            }
            return true;
        }

@@ -220,19 +216,6 @@ public final class CommandUtils {
        }
    }

-    public static List<String> getOnlinePlayerNames(CommandSender sender) {
-        Player player = sender instanceof Player ? (Player) sender : null;
-        List<String> onlinePlayerNames = new ArrayList<String>();
-
-        for (Player onlinePlayer : mcMMO.p.getServer().getOnlinePlayers()) {
-            if (player != null && player.canSee(onlinePlayer)) {
-                onlinePlayerNames.add(onlinePlayer.getName());
-            }
-        }
-
-        return onlinePlayerNames;
-    }
-
    /**
     * Get a matched player name if one was found in the database.
     *
--- a/src/main/java/com/gmail/nossr50/util/player/UserManager.java
+++ b/src/main/java/com/gmail/nossr50/util/player/UserManager.java
@@ -2,6 +2,8 @@ package com.gmail.nossr50.util.player;

 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;

 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
@@ -58,6 +60,16 @@ public final class UserManager {
        }
    }

+    public static Set<String> getPlayerNames() {
+        Set<String> playerNames = new HashSet<String>();
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            playerNames.add(player.getName());
+        }
+
+        return playerNames;
+    }
+
    public static Collection<McMMOPlayer> getPlayers() {
        Collection<McMMOPlayer> playerCollection  = new ArrayList<McMMOPlayer>();

@@ -78,16 +90,28 @@ public final class UserManager {
        return retrieveMcMMOPlayer(playerName, false);
    }

-    public static McMMOPlayer getOfflinePlayer(OfflinePlayer player) {
+    /**
+     * Get the McMMOPlayer of a player.
+     *
+     * @param player The player whose McMMOPlayer to retrieve
+     * @return the player's McMMOPlayer object
+     */
+    public static McMMOPlayer getPlayer(OfflinePlayer player) {
        if (player instanceof Player) {
            return getPlayer((Player) player);
        }
-
-        return retrieveMcMMOPlayer(player.getName(), true);
+        return retrieveMcMMOPlayer(player.getName(), false);
    }

-    public static McMMOPlayer getOfflinePlayer(String playerName) {
-        return retrieveMcMMOPlayer(playerName, true);
+    public static McMMOPlayer getPlayer(OfflinePlayer player, boolean offlineValid) {
+        if (player instanceof Player) {
+            return getPlayer((Player) player);
+        }
+        return retrieveMcMMOPlayer(player.getName(), offlineValid);
+    }
+
+    public static McMMOPlayer getPlayer(String playerName, boolean offlineValid) {
+        return retrieveMcMMOPlayer(playerName, offlineValid);
    }

    public static McMMOPlayer getPlayer(Player player) {
@@ -109,6 +133,10 @@ public final class UserManager {
    }

    public static boolean hasPlayerDataKey(Entity entity) {
-        return entity != null && entity.hasMetadata(mcMMO.playerDataKey);
+        if (entity == null) {
+            return false;
+        }
+
+        return entity.hasMetadata(mcMMO.playerDataKey);
    }
 }
--- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
+++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java
@@ -224,6 +224,15 @@ public class ScoreboardManager {
        }
    }

+    // Called by internal TagAPI event listener
+    public static void tagUpdate(Player player) {
+        String playerName = player.getName();
+
+        if (Config.getInstance().getPowerLevelTagsEnabled() && !dirtyPowerLevels.contains(playerName)) {
+            dirtyPowerLevels.add(playerName);
+        }
+    }
+
    // **** Setup methods **** //

    public static void enablePlayerSkillScoreboard(Player player, SkillType skill) {
@@ -329,7 +338,7 @@ public class ScoreboardManager {
        }

        for (String playerName : dirtyPowerLevels) {
-            McMMOPlayer mcMMOPlayer = UserManager.getOfflinePlayer(playerName);
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(playerName, true);

            if (mcMMOPlayer == null) {
                continue;
@@ -342,6 +351,10 @@ public class ScoreboardManager {

            for (ScoreboardWrapper wrapper : PLAYER_SCOREBOARDS.values()) {
                wrapper.updatePowerLevel(player, power);
+
+                if (mcMMOPlayer.getNameTag() != null) {
+                    wrapper.updatePowerLevel(mcMMO.p.getServer().getOfflinePlayer(mcMMOPlayer.getNameTag()), power);
+                }
            }
        }

--- a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java
+++ b/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;

 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
@@ -558,4 +559,8 @@ public class ScoreboardWrapper {
    public void updatePowerLevel(Player player, int newPowerLevel) {
        powerObjective.getScore(player).setScore(newPowerLevel);
    }
+
+    public void updatePowerLevel(OfflinePlayer offlinePlayer, int newPowerLevel) {
+        powerObjective.getScore(offlinePlayer).setScore(newPowerLevel);
+    }
 }
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -298,6 +298,15 @@ public final class CombatUtils {
                }
            }
        }
+        else if (attacker instanceof Player) {
+            Player player = (Player) attacker;
+
+            if (Misc.isNPCEntity(player) || Misc.isNPCEntity(target)) {
+                return;
+            }
+
+            MobHealthbarUtils.handleMobHealthbars(player, target, event.getDamage());
+        }
    }

    /**
@@ -497,7 +506,7 @@ public final class CombatUtils {
                return false;
            }

-            if ((PartyManager.inSameParty(player, defender) || PartyManager.areAllies(player, defender)) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) {
+            if (PartyManager.inSameParty(player, defender) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) {
                return false;
            }

@@ -549,7 +558,7 @@ public final class CombatUtils {
            if (tamer instanceof Player) {
                Player owner = (Player) tamer;

-                return (owner == attacker || PartyManager.inSameParty(attacker, owner) || PartyManager.areAllies(attacker, owner));
+                return (owner == attacker || PartyManager.inSameParty(attacker, owner));
            }
        }

@@ -605,18 +614,4 @@ public final class CombatUtils {

        return tier;
    }
-
-    public static void handleHealthbars(Entity attacker, LivingEntity target, double damage) {
-        if (!(attacker instanceof Player)) {
-            return;
-        }
-
-        Player player = (Player) attacker;
-
-        if (Misc.isNPCEntity(player) || Misc.isNPCEntity(target)) {
-            return;
-        }
-
-        MobHealthbarUtils.handleMobHealthbars(player, target, damage);
-    }
 }
--- a/src/main/java/net/gravitydevelopment/updater/mcmmo/Updater.java
+++ b/src/main/java/net/gravitydevelopment/updater/mcmmo/Updater.java
@@ -23,8 +23,6 @@ import java.util.zip.ZipFile;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;

-import com.gmail.nossr50.config.Config;
-
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
@@ -442,14 +440,14 @@ public class Updater {
                return true;
            }

-            // Check release vs. beta & SNAPSHOT
+            // Check release vs. beta & dev
            if (newTokens.length == 1 && oldTokens.length == 3 && oldVersion == newVersion) {
                return true;
            }

-            // Check beta vs. SNAPSHOT
-            if (version.contains("SNAPSHOT") && title.contains("beta")) {
-                if (Integer.parseInt(oldTokens[1].substring(8)) <= Integer.parseInt(newTokens[1].substring(4))) {
+            // Check beta vs. dev
+            if (version.contains("dev") && title.contains("beta")) {
+                if (Integer.parseInt(oldTokens[1].substring(3)) <= Integer.parseInt(newTokens[1].substring(4))) {
                    return true;
                }

@@ -467,7 +465,7 @@ public class Updater {
                return false;
            }

-            if (oldTokens.length == 3 && !version.contains("beta") && !version.contains("SNAPSHOT")) {
+            if (oldTokens.length == 3 && !version.contains("beta") && !version.contains("dev")) {
                plugin.getLogger().warning("Could not get information about this mcMMO version; perhaps you are running a custom one?");
                result = UpdateResult.FAIL_NOVERSION;
                return false;
@@ -521,11 +519,7 @@ public class Updater {
                this.plugin.getLogger().warning("If you have not recently modified your configuration and this is the first time you are seeing this message, the site may be experiencing temporary downtime.");
                this.result = UpdateResult.FAIL_DBO;
            }
-
-            if (Config.getInstance().getVerboseLoggingEnabled()) {
-                e.printStackTrace();
-            }
-
+            e.printStackTrace();
            return false;
        }
    }
--- a/src/main/resources/advanced.yml
+++ b/src/main/resources/advanced.yml
@@ -471,9 +471,7 @@ Skills:
            Bonus: 2.0

        CallOfTheWild:
-            # MinHorseJumpStrength: The minimum jump strength a summoned horse must have
            # MaxHorseJumpStrength: The maximum jump strength a summoned horse can have
-            MinHorseJumpStrength: 0.7
            MaxHorseJumpStrength: 2.0
    #
    #  Settings for Unarmed
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -267,8 +267,7 @@ Skills:
        Prevent_AFK_Leveling: true
        Max_Tries_At_Same_Location: 3
        Prevent_Dodge_Lightning: false
-        # Prevent earning Acrobatics XP a few seconds after teleporting
-        XP_After_Teleport_Cooldown: 5
+        Prevent_XP_After_Teleport: true
        Level_Cap: 0
    Alchemy:
        # Allow Hoppers to transfer ingredients and brew Rank 1 Alchemy potions
@@ -317,24 +316,16 @@ Skills:
        Enabled_For_PVE: true
        Level_Cap: 0
        Call_Of_The_Wild:
-            # Item_Material: Material of the item needed to summon the pet
-            # Item_Amount: Amount of items required to summon the pet
-            # Summon_Amount: Amount of pets to summon when using Call Of The Wild
-            Wolf:
-                Item_Material: BONE
-                Item_Amount: 10
-                Summon_Amount: 1
-            Ocelot:
-                Item_Material: RAW_FISH
-                Item_Amount: 10
-                Summon_Amount: 1
-            Horse:
-                Item_Material: APPLE
-                Item_Amount: 10
-                Summon_Amount: 1
+            Bones_Required: 10
+            Fish_Required: 10
+            Apples_Required: 10

            # Range to check for nearby pets when using Call Of The Wild, 0 will disable the check
            Range: 40.0
+            # Amount of pets to summon when using Call Of The Wild
+            Wolf_Amount: 1
+            Ocelot_Amount: 1
+            Horse_Amount: 1
    Unarmed:
        Enabled_For_PVP: true
        Enabled_For_PVE: true
@@ -395,10 +386,6 @@ Commands:
        # If true, when using partial names in commands mcMMO will try to look for a match from
        # the offline players. Enabling this might slow the server down if there are a lot of offline players.
        Match_OfflinePlayers: false
-    Database:
-        # Database command cooldown in milliseconds, cannot be changed below the default value. (1750)
-        # Prevents players from spamming /mctop or /mcrank
-        Player_Cooldown: 1750
    mcmmo:
        Donate_Message: true
    inspect:
--- a/src/main/resources/experience.yml
+++ b/src/main/resources/experience.yml
@@ -129,7 +129,7 @@ Experience:
        Mossy_Cobblestone: 30
        Netherrack: 30
        Obsidian: 150
-        Quartz_Ore: 100
+        Quartz_Ore: 250
        Redstone_Ore: 150
        Sandstone: 30
        Stone: 30
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -114,9 +114,6 @@ commands:
    kraken:
        aliases: [mckraken]
        description: Unleash the kraken!
-    mcfools:
-        aliases: [macho, jumping, throwing, wrecking, crafting, walking, swimming, falling, climbing, flying, diving, piggy]
-        description: Deploy jokes
 permissions:
    mcmmo.*:
        default: false
Author	SHA1	Message	Date
TfT_02	9e04e437e3	Compile with RELEASE	2014-02-28 19:50:20 +01:00
TfT_02	30e1d3fff3	No such thing as cancelled events	2014-02-28 19:49:53 +01:00
TfT_02	bada2f5d0d	Remove reflection	2014-02-28 19:15:11 +01:00
GJ	1edc12af3b	This is ugly & awful, but may keep us from needing to add Tag-API as a dependency.	2014-02-28 10:46:34 -05:00
TfT_02	f9a73c38d8	Step two	2014-02-27 22:25:54 +01:00
TfT_02	ccdab96650	First step in starting to fix this issue	2014-02-27 22:25:34 +01:00