Compile with RELEASE

Negate this permission node to hide the version number from /mcmmo and
motd

Changelog.txt

@@ -21,6 +21,9 @@ Version 1.4.08-dev
  + 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
+ = Fixed bug with updating (very) old user data.
+ = Fixed bug with checking maximum durability of mod items.
+ = Fixed exploit involving Call of The Wild.
  = Fixed bug where LeafBlower permissions were ignored
  = Fixed bug with toggle commands not properly displaying the success message.
  = Fixed IllegalArgumentException caused by an empty Fishing treasure category

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.

pom.xml

@@ -116,12 +116,16 @@
             <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>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>RELEASE</version>
+            <version>1.6.4-R2.0</version>
             <type>jar</type>
             <scope>compile</scope>
         </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>

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

@@ -30,7 +30,10 @@ public class McmmoCommand implements CommandExecutor {
                     sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "gjmcferrin@gmail.com" + ChatColor.GOLD + " Paypal");
                 }
 
-                sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                if (Permissions.showversion(sender)) {
+                    sender.sendMessage(LocaleLoader.getString("MOTD.Version", mcMMO.p.getDescription().getVersion()));
+                }
+
                 mcMMO.getHolidayManager().anniversaryCheck(sender);
                 return true;
 

src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -4,8 +4,10 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.chat.ChatMode;
 import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.datatypes.party.PartyFeature;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.player.UserManager;
@@ -28,6 +30,11 @@ public class PartyChatCommand extends ChatCommand {
                 return;
             }
 
+            if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
+                sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
+                return;
+            }
+
             message = buildChatMessage(args, 0);
         }
         else {

src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -217,7 +217,7 @@ public class PartyCommand implements TabExecutor {
     }
 
     private String[] extractArgs(String[] args) {
-        return Arrays.copyOfRange(args, 1, args.length - 1);
+        return Arrays.copyOfRange(args, 1, args.length);
     }
 
     private boolean isItemShareCategory(String category) {

src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java

@@ -20,7 +20,7 @@ public class PartyHelpCommand implements CommandExecutor {
                 sender.sendMessage(LocaleLoader.getString("Party.Help.7", "/party leader"));
                 sender.sendMessage(LocaleLoader.getString("Party.Help.8", "/party disband"));
                 sender.sendMessage(LocaleLoader.getString("Party.Help.9", "/party itemshare"));
-                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party expshare"));
+                sender.sendMessage(LocaleLoader.getString("Party.Help.10", "/party xpshare"));
                 return true;
 
             default:

src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java

@@ -23,6 +23,11 @@ public class PartyAllianceAcceptCommand implements CommandExecutor {
                     return true;
                 }
 
+                if (mcMMOPlayer.getParty().getAlly() != null) {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Alliance.AlreadyAllies"));
+                    return true;
+                }
+
                 PartyManager.acceptAllianceInvite(mcMMOPlayer);
                 return true;
 

src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java

@@ -33,8 +33,8 @@ public class AlchemyCommand extends SkillCommand {
         AlchemyManager alchemyManager = UserManager.getPlayer(player).getAlchemyManager();
         String[] displayValues = new String[2];
 
-        displayValues[0] = decimal.format(alchemyManager.getBrewSpeed()) + "x";
-        displayValues[1] = isLucky ? decimal.format(alchemyManager.getBrewSpeedLucky()) + "x" : null;
+        displayValues[0] = decimal.format(alchemyManager.calculateBrewSpeed(false)) + "x";
+        displayValues[1] = isLucky ? decimal.format(alchemyManager.calculateBrewSpeed(true)) + "x" : null;
 
         return displayValues;
     }

src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class ArmorConfigManager {
     public ArmorConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("armor\\.(?:.+)\\.yml");
@@ -15,7 +15,7 @@ public class ArmorConfigManager {
         ModManager modManager = mcMMO.getModManager();
 
         if (!vanilla.exists()) {
-            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "armor.default.yml", false);
+            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "armor.default.yml", false);
         }
 
         for (String fileName : dataFolder.list()) {

src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class BlockConfigManager {
     public BlockConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("blocks\\.(?:.+)\\.yml");
@@ -15,7 +15,7 @@ public class BlockConfigManager {
         ModManager modManager = mcMMO.getModManager();
 
         if (!vanilla.exists()) {
-            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "blocks.default.yml", false);
+            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "blocks.default.yml", false);
         }
 
         for (String fileName : dataFolder.list()) {

src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class EntityConfigManager {
     public EntityConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("entities\\.(?:.+)\\.yml");
@@ -15,7 +15,7 @@ public class EntityConfigManager {
         ModManager modManager = mcMMO.getModManager();
 
         if (!vanilla.exists()) {
-            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "entities.default.yml", false);
+            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "entities.default.yml", false);
         }
 
         for (String fileName : dataFolder.list()) {

src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.config.mods;
 
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.ModManager;
-
 import java.io.File;
 import java.util.regex.Pattern;
 
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
 public class ToolConfigManager {
     public ToolConfigManager(mcMMO plugin) {
         Pattern middlePattern = Pattern.compile("tools\\.(?:.+)\\.yml");
@@ -15,7 +15,7 @@ public class ToolConfigManager {
         ModManager modManager = mcMMO.getModManager();
 
         if (!vanilla.exists()) {
-            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "tools.default.yml", false);
+            plugin.saveResource(vanilla.getParentFile().getName() + File.separator + "tools.default.yml", false);
         }
 
         for (String fileName : dataFolder.list()) {

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;
@@ -18,16 +19,16 @@ import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 public class PotionConfig extends ConfigLoader {
     private static PotionConfig instance;
 
-    public List<ItemStack> concoctionsIngredientsTierOne = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierTwo = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierThree = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierFour = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierFive = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierSix = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
-    public List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierOne = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierTwo = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierThree = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierFour = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierFive = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierSix = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierSeven = new ArrayList<ItemStack>();
+    private List<ItemStack> concoctionsIngredientsTierEight = new ArrayList<ItemStack>();
 
-    public Map<Short, AlchemyPotion> potionMap = new HashMap<Short, AlchemyPotion>();
+    private Map<Short, AlchemyPotion> potionMap = new HashMap<Short, AlchemyPotion>();
 
     private PotionConfig() {
         super("potions.yml");
@@ -189,4 +190,34 @@ public class PotionConfig extends ConfigLoader {
 
         return null;
     }
+
+    public List<ItemStack> getIngredients(int tier) {
+        switch (tier) {
+            case 8:
+                return concoctionsIngredientsTierEight;
+            case 7:
+                return concoctionsIngredientsTierSeven;
+            case 6:
+                return concoctionsIngredientsTierSix;
+            case 5:
+                return concoctionsIngredientsTierFive;
+            case 4:
+                return concoctionsIngredientsTierFour;
+            case 3:
+                return concoctionsIngredientsTierThree;
+            case 2:
+                return concoctionsIngredientsTierTwo;
+            case 1:
+            default:
+                return concoctionsIngredientsTierOne;
+        }
+    }
+
+    public boolean isValidPotion(ItemStack item) {
+        return potionMap.containsKey(item.getDurability());
+    }
+
+    public AlchemyPotion getPotion(short durability) {
+        return potionMap.get(durability);
+    }
 }

src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java

@@ -96,6 +96,10 @@ public class RepairConfig extends ConfigLoader {
             // Maximum Durability
             short maximumDurability = (itemMaterial != null ? itemMaterial.getMaxDurability() : (short) config.getInt("Repairables." + key + ".MaximumDurability"));
 
+            if (maximumDurability <= 0) {
+                maximumDurability = (short) config.getInt("Repairables." + key + ".MaximumDurability");
+            }
+
             if (maximumDurability <= 0) {
                 reason.add("Maximum durability of " + key + " must be greater than 0!");
             }

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;
@@ -26,6 +28,7 @@ import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.StringUtils;
 
 public final class FlatfileDatabaseManager implements DatabaseManager {
     private final HashMap<SkillType, List<PlayerStat>> playerStatHash = new HashMap<SkillType, List<PlayerStat>>();
@@ -604,7 +607,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                         // Length checks depend on last character being ':'
                         if (line.charAt(line.length() - 1) != ':') {
-                            line = line + ":";
+                            line = line.concat(":");
                         }
                         String[] character = line.split(":");
 
@@ -621,29 +624,33 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
 
                         String oldVersion = null;
 
+                        if (character.length <= 33) {
+                            // Introduction of HUDType
+                            // Version 1.1.06
+                            // commit 78f79213cdd7190cd11ae54526f3b4ea42078e8a
+                            line = line.concat(" :");
+                            character = line.split(":");
+                            oldVersion = "1.1.06";
+                        }
+
                         if (!character[33].isEmpty()) {
                             // Removal of Spout Support
                             // Version 1.4.07-dev2
                             // commit 7bac0e2ca5143bce84dc160617fed97f0b1cb968
                             line = line.replace(character[33], "");
-                            oldVersion = "1.4.07";
+                            if (oldVersion == null) {
+                                oldVersion = "1.4.07";
+                            }
                         }
 
                         // If they're valid, rewrite them to the file.
-                        if (character.length > 40) {
+                        if (character.length == 41) {
                             writer.append(line).append("\r\n");
                             continue;
                         }
 
                         StringBuilder newLine = new StringBuilder(line);
 
-                        if (character.length <= 33) {
-                            // Introduction of HUDType
-                            // Version 1.1.06
-                            // commit 78f79213cdd7190cd11ae54526f3b4ea42078e8a
-                            newLine.append(":");
-                            oldVersion = "1.1.06";
-                        }
                         if (character.length <= 35) {
                             // Introduction of Fishing
                             // Version 1.2.00
@@ -682,7 +689,7 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                                 oldVersion = "1.4.06";
                             }
                         }
-                        if (character.length <= 40) {
+                        if (character.length <= 39) {
                             // Addition of Alchemy
                             // Version 1.4.08
                             newLine.append("0").append(":");
@@ -692,6 +699,46 @@ public final class FlatfileDatabaseManager implements DatabaseManager {
                             }
                         }
 
+                        // Remove any blanks that shouldn't be there, and validate the other fields
+                        String[] newCharacter = newLine.toString().split(":");
+                        boolean corrupted = false;
+
+                        for (int i = 0; i < newCharacter.length; i++) {
+                            if (newCharacter[i].isEmpty() && !(i == 2 || i == 3 || i == 23 || i == 33)) {
+                                corrupted = true;
+
+                                if (newCharacter.length != 41) {
+                                    newCharacter = (String[]) ArrayUtils.remove(newCharacter, i);
+                                }
+                                else {
+                                    if (i == 37) {
+                                        newCharacter[i] = String.valueOf(System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+                                    }
+                                    else if (i == 38) {
+                                        newCharacter[i] = Config.getInstance().getMobHealthbarDefault().toString();
+                                    }
+                                    else {
+                                        newCharacter[i] = "0";
+                                    }
+                                }
+                            }
+
+                            if (StringUtils.isInt(newCharacter[i]) && i == 38) {
+                                corrupted = true;
+                                newCharacter[i] = Config.getInstance().getMobHealthbarDefault().toString();
+                            }
+
+                            if (!StringUtils.isInt(newCharacter[i]) && !(i == 0 || i == 2 || i == 3 || i == 23 || i == 33 || i == 38)) {
+                                corrupted = true;
+                                newCharacter[i] = "0";
+                            }
+                        }
+
+                        if (corrupted) {
+                            mcMMO.p.debug("Updating corrupted database line for player " + newCharacter[0]);
+                            newLine = new StringBuilder(org.apache.commons.lang.StringUtils.join(newCharacter, ":"));
+                        }
+
                         if (oldVersion != null) {
                             mcMMO.p.debug("Updating database line for player " + character[0] + " from before version " + oldVersion);
                         }

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

@@ -91,6 +91,8 @@ public class McMMOPlayer {
     private boolean isUsingUnarmed;
     private final FixedMetadataValue playerMetadata;
 
+    private String nameTag;
+
     public McMMOPlayer(Player player) {
         String playerName = player.getName();
 
@@ -949,4 +951,12 @@ public class McMMOPlayer {
     public FixedMetadataValue getPlayerMetadata() {
         return playerMetadata;
     }
+
+    public String getNameTag() {
+        return nameTag;
+    }
+
+    public void setNameTag(String nameTag) {
+        this.nameTag = nameTag;
+    }
 }

src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java

@@ -25,25 +25,27 @@ public class AlchemyPotion {
     }
 
     public String toString() {
-        return "AlchemyPotion{" + dataValue + "," + name + ",Effects[" + effects.size() + "], Children[" + children.size() + "]}";
-    }
-
-    public ItemStack toItemStack() {
-        return toItemStack(1);
+        return "AlchemyPotion{" + dataValue + ", " + name + ", Effects[" + effects.size() + "], Children[" + children.size() + "]}";
     }
 
     public ItemStack toItemStack(int amount) {
         ItemStack potion = new ItemStack(Material.POTION, amount, this.getDataValue());
         PotionMeta meta = (PotionMeta) potion.getItemMeta();
-        meta.setDisplayName(this.getName());
+
+        if (this.getName() != null) {
+            meta.setDisplayName(this.getName());
+        }
+
         if (this.getLore() != null && !this.getLore().isEmpty()) {
             meta.setLore(this.getLore());
         }
+
         if (!this.getEffects().isEmpty()) {
             for (PotionEffect effect : this.getEffects()) {
                 meta.addCustomEffect(effect, true);
             }
         }
+
         potion.setItemMeta(meta);
         return potion;
     }

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

@@ -104,7 +104,7 @@ public class BlockListener implements Listener {
     public void onBlockPlace(BlockPlaceEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -144,7 +144,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 
@@ -214,7 +214,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 
@@ -261,7 +261,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -327,7 +327,7 @@ public class BlockListener implements Listener {
 
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 

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

@@ -424,7 +424,7 @@ public class EntityListener implements Listener {
         // We can make this assumption because we (should) be the only ones using this exact metadata
         Player player = plugin.getServer().getPlayerExact(entity.getMetadata(mcMMO.tntMetadataKey).get(0).asString());
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -451,7 +451,7 @@ public class EntityListener implements Listener {
         // We can make this assumption because we (should) be the only ones using this exact metadata
         Player player = plugin.getServer().getPlayerExact(entity.getMetadata(mcMMO.tntMetadataKey).get(0).asString());
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -494,7 +494,7 @@ public class EntityListener implements Listener {
 
         Player player = (Player) entity;
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -560,7 +560,7 @@ public class EntityListener implements Listener {
         Player player = (Player) event.getOwner();
         LivingEntity entity = event.getEntity();
 
-        if (Misc.isNPCEntity(player) || Misc.isNPCEntity(entity) || entity.hasMetadata(mcMMO.entityMetadataKey)) {
+        if (!UserManager.hasPlayerDataKey(player) || Misc.isNPCEntity(entity) || entity.hasMetadata(mcMMO.entityMetadataKey)) {
             return;
         }
 

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

@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.CraftItemEvent;
 import org.bukkit.event.inventory.FurnaceBurnEvent;
 import org.bukkit.event.inventory.FurnaceExtractEvent;
@@ -22,8 +23,10 @@ import org.bukkit.event.inventory.InventoryDragEvent;
 import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.BrewerInventory;
 import org.bukkit.inventory.FurnaceInventory;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.MetadataValue;
 
@@ -32,9 +35,9 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.runnables.PlayerUpdateInventoryTask;
+import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
 import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -56,7 +59,7 @@ public class InventoryListener implements Listener {
 
         HumanEntity player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -73,7 +76,7 @@ public class InventoryListener implements Listener {
 
         HumanEntity player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -92,7 +95,7 @@ public class InventoryListener implements Listener {
 
         Player player = getPlayerFromFurnace(furnaceBlock);
 
-        if (Misc.isNPCEntity(player) || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY)) {
+        if (!UserManager.hasPlayerDataKey(player) || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FUEL_EFFICIENCY)) {
             return;
         }
 
@@ -110,7 +113,7 @@ public class InventoryListener implements Listener {
 
         Player player = getPlayerFromFurnace(furnaceBlock);
 
-        if (Misc.isNPCEntity(player) || !SkillType.SMELTING.getPermissions(player)) {
+        if (!UserManager.hasPlayerDataKey(player) || !SkillType.SMELTING.getPermissions(player)) {
             return;
         }
 
@@ -129,7 +132,7 @@ public class InventoryListener implements Listener {
 
         Player player = getPlayerFromFurnace(furnaceBlock);
 
-        if (Misc.isNPCEntity(player) || !Permissions.vanillaXpBoost(player, SkillType.SMELTING)) {
+        if (!UserManager.hasPlayerDataKey(player) || !Permissions.vanillaXpBoost(player, SkillType.SMELTING)) {
             return;
         }
 
@@ -138,43 +141,164 @@ public class InventoryListener implements Listener {
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryClickEventNormal(InventoryClickEvent event) {
-        if (event.getInventory().getType() != InventoryType.BREWING || !(event.getInventory().getHolder() instanceof BrewingStand)) {
+        Inventory inventory = event.getInventory();
+
+        if (!(inventory instanceof BrewerInventory)) {
             return;
         }
 
-        if (!(event.getWhoClicked() instanceof Player) || Misc.isNPCEntity(event.getWhoClicked()) || !Permissions.concoctions(event.getWhoClicked())) {
+        InventoryHolder holder = inventory.getHolder();
+
+        if (!(holder instanceof BrewingStand)) {
             return;
         }
 
-        AlchemyPotionBrewer.handleInventoryClick(event);
+        HumanEntity whoClicked = event.getWhoClicked();
+
+        if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.CONCOCTIONS)) {
+            return;
+        }
+
+        Player player = (Player) whoClicked;
+        BrewingStand stand = (BrewingStand) holder;
+        ItemStack clicked = event.getCurrentItem();
+        ItemStack cursor = event.getCursor();
+
+        if ((clicked != null && clicked.getType() == Material.POTION) || (cursor != null && cursor.getType() == Material.POTION)) {
+            AlchemyPotionBrewer.scheduleCheck(player, stand);
+            return;
+        }
+
+        ClickType click = event.getClick();
+        InventoryType.SlotType slot = event.getSlotType();
+
+        if (click.isShiftClick()) {
+            switch (slot) {
+                case FUEL:
+                    AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    return;
+                case CONTAINER:
+                case QUICKBAR:
+                    if (!AlchemyPotionBrewer.isValidIngredient(player, clicked)) {
+                        return;
+                    }
+
+                    AlchemyPotionBrewer.transferItems(event.getView(), event.getRawSlot(), Alchemy.INGREDIENT_SLOT, click);
+                    event.setCancelled(true);
+                    AlchemyPotionBrewer.scheduleUpdate(inventory);
+                    AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    return;
+                default:
+                    return;
+            }
+        }
+        else if (slot == InventoryType.SlotType.FUEL) {
+            boolean emptyClicked = AlchemyPotionBrewer.isEmpty(clicked);
+
+            if (AlchemyPotionBrewer.isEmpty(cursor)) {
+                if (emptyClicked && click == ClickType.NUMBER_KEY) {
+                    AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    return;
+                }
+
+                AlchemyPotionBrewer.scheduleCheck(player, stand);
+            }
+            else if (emptyClicked) {
+                if (AlchemyPotionBrewer.isValidIngredient(player, cursor)) {
+                    int amount = cursor.getAmount();
+
+                    if (click == ClickType.LEFT || (click == ClickType.RIGHT && amount == 1)) {
+                        event.setCancelled(true);
+                        event.setCurrentItem(cursor.clone());
+                        event.setCursor(null);
+
+                        AlchemyPotionBrewer.scheduleUpdate(inventory);
+                        AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    }
+                    else if (click == ClickType.RIGHT) {
+                        event.setCancelled(true);
+
+                        ItemStack one = cursor.clone();
+                        one.setAmount(1);
+
+                        ItemStack rest = cursor.clone();
+                        rest.setAmount(amount - 1);
+
+                        event.setCurrentItem(one);
+                        event.setCursor(rest);
+
+                        AlchemyPotionBrewer.scheduleUpdate(inventory);
+                        AlchemyPotionBrewer.scheduleCheck(player, stand);
+                    }
+                }
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryDragEvent(InventoryDragEvent event) {
-        if (event.getInventory().getType() != InventoryType.BREWING || !(event.getInventory().getHolder() instanceof BrewingStand)) {
+        Inventory inventory = event.getInventory();
+
+        if (!(inventory instanceof BrewerInventory)) {
             return;
         }
 
-        if (!(event.getWhoClicked() instanceof Player) || Misc.isNPCEntity(event.getWhoClicked()) || !Permissions.concoctions(event.getWhoClicked())) {
+        InventoryHolder holder = inventory.getHolder();
+
+        if (!(holder instanceof BrewingStand)) {
             return;
         }
 
-        AlchemyPotionBrewer.handleInventoryDrag(event);
+        HumanEntity whoClicked = event.getWhoClicked();
+
+        if (!UserManager.hasPlayerDataKey(event.getWhoClicked()) || !Permissions.secondaryAbilityEnabled(whoClicked, SecondaryAbility.CONCOCTIONS)) {
+            return;
+        }
+
+        if (!event.getInventorySlots().contains(Alchemy.INGREDIENT_SLOT)) {
+            return;
+        }
+
+        ItemStack cursor = event.getCursor();
+        ItemStack ingredient = ((BrewerInventory) inventory).getIngredient();
+
+        if (AlchemyPotionBrewer.isEmpty(ingredient) || ingredient.isSimilar(cursor)) {
+            Player player = (Player) whoClicked;
+
+            if (AlchemyPotionBrewer.isValidIngredient(player, cursor)) {
+                // Not handled: dragging custom ingredients over ingredient slot (does not trigger any event)
+                AlchemyPotionBrewer.scheduleCheck(player, (BrewingStand) holder);
+                return;
+            }
+
+            event.setCancelled(true);
+            AlchemyPotionBrewer.scheduleUpdate(inventory);
+        }
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryMoveItemEvent(InventoryMoveItemEvent event) {
-        if (event.getDestination().getType() != InventoryType.BREWING || !(event.getDestination().getHolder() instanceof BrewingStand)) {
+        Inventory inventory = event.getDestination();
+
+        if (!(inventory instanceof BrewerInventory)) {
             return;
         }
 
-        if (Config.getInstance().getPreventHopperTransfer() && event.getItem() != null && event.getItem().getType() != Material.POTION) {
+        InventoryHolder holder = inventory.getHolder();
+
+        if (!(holder instanceof BrewingStand)) {
+            return;
+        }
+
+        ItemStack item = event.getItem();
+
+        if (Config.getInstance().getPreventHopperTransfer() && item.getType() != Material.POTION) {
             event.setCancelled(true);
             return;
         }
 
-        if (Config.getInstance().getEnabledForHoppers()) {
-            AlchemyPotionBrewer.handleInventoryMoveItem(event);
+        if (Config.getInstance().getEnabledForHoppers() && AlchemyPotionBrewer.isValidIngredient(null, item)) {
+            AlchemyPotionBrewer.scheduleCheck(null, (BrewingStand) holder);
         }
     }
 
@@ -187,7 +311,7 @@ public class InventoryListener implements Listener {
     public void onCraftItem(CraftItemEvent event) {
         final HumanEntity whoClicked = event.getWhoClicked();
 
-        if (Misc.isNPCEntity(whoClicked) || !(whoClicked instanceof Player)) {
+        if (!whoClicked.hasMetadata(mcMMO.playerDataKey)) {
             return;
         }
 

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -59,6 +58,7 @@ import com.gmail.nossr50.util.MobHealthbarUtils;
 import com.gmail.nossr50.util.Motd;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
 public class PlayerListener implements Listener {
@@ -81,7 +81,7 @@ public class PlayerListener implements Listener {
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || !Config.getInstance().getPreventXPAfterTeleport() || event.getFrom().equals(event.getTo())) {
+        if (!UserManager.hasPlayerDataKey(player) || !Config.getInstance().getPreventXPAfterTeleport() || event.getFrom().equals(event.getTo())) {
             return;
         }
 
@@ -130,7 +130,7 @@ public class PlayerListener implements Listener {
 
         Player killedPlayer = event.getEntity();
 
-        if (Misc.isNPCEntity(killedPlayer) || Permissions.hardcoreBypass(killedPlayer)) {
+        if (!killedPlayer.hasMetadata(mcMMO.playerDataKey) || Permissions.hardcoreBypass(killedPlayer)) {
             return;
         }
 
@@ -165,7 +165,7 @@ public class PlayerListener implements Listener {
     public void onPlayerWorldChange(PlayerChangedWorldEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -208,7 +208,7 @@ public class PlayerListener implements Listener {
     public void onPlayerFishHighest(PlayerFishEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || !SkillType.FISHING.getPermissions(player)) {
+        if (!UserManager.hasPlayerDataKey(player) || !SkillType.FISHING.getPermissions(player)) {
             return;
         }
 
@@ -253,7 +253,7 @@ public class PlayerListener implements Listener {
     public void onPlayerFishMonitor(PlayerFishEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || !SkillType.FISHING.getPermissions(player)) {
+        if (!UserManager.hasPlayerDataKey(player) || !SkillType.FISHING.getPermissions(player)) {
             return;
         }
 
@@ -294,7 +294,7 @@ public class PlayerListener implements Listener {
     public void onPlayerPickupItem(PlayerPickupItemEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -344,7 +344,7 @@ public class PlayerListener implements Listener {
     public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -353,7 +353,7 @@ public class PlayerListener implements Listener {
         mcMMOPlayer.resetAbilityMode();
         BleedTimerTask.bleedOut(player);
         mcMMOPlayer.getProfile().save();
-        UserManager.remove(player.getName());
+        UserManager.remove(player);
         ScoreboardManager.teardownPlayer(player);
     }
 
@@ -374,7 +374,8 @@ public class PlayerListener implements Listener {
             return;
         }
 
-        UserManager.addUser(player).actualizeRespawnATS();
+        McMMOPlayer mcMMOPlayer = UserManager.addUser(player);
+        mcMMOPlayer.actualizeRespawnATS();
         ScoreboardManager.setupPlayer(player);
 
         if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
@@ -404,7 +405,7 @@ public class PlayerListener implements Listener {
     public void onPlayerRespawn(PlayerRespawnEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player)) {
+        if (!UserManager.hasPlayerDataKey(player)) {
             return;
         }
 
@@ -420,7 +421,7 @@ public class PlayerListener implements Listener {
     public void onPlayerInteractLowest(PlayerInteractEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 
@@ -511,7 +512,7 @@ public class PlayerListener implements Listener {
     public void onPlayerInteractMonitor(PlayerInteractEvent event) {
         Player player = event.getPlayer();
 
-        if (Misc.isNPCEntity(player) || player.getGameMode() == GameMode.CREATIVE) {
+        if (!UserManager.hasPlayerDataKey(player) || player.getGameMode() == GameMode.CREATIVE) {
             return;
         }
 

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.
+         */
+    }
+}

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

@@ -5,11 +5,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gmail.nossr50.config.mods.ArmorConfigManager;
-import com.gmail.nossr50.config.mods.BlockConfigManager;
-import com.gmail.nossr50.config.mods.EntityConfigManager;
-import com.gmail.nossr50.config.mods.ToolConfigManager;
-import com.gmail.nossr50.util.ModManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -19,6 +14,10 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
+import com.gmail.nossr50.config.mods.ArmorConfigManager;
+import com.gmail.nossr50.config.mods.BlockConfigManager;
+import com.gmail.nossr50.config.mods.EntityConfigManager;
+import com.gmail.nossr50.config.mods.ToolConfigManager;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.config.skills.repair.RepairConfigManager;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
@@ -29,6 +28,7 @@ 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;
@@ -48,6 +48,7 @@ import com.gmail.nossr50.util.ChimaeraWing;
 import com.gmail.nossr50.util.HolidayManager;
 import com.gmail.nossr50.util.LogFilter;
 import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.util.ModManager;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
 import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
@@ -89,6 +90,7 @@ public class mcMMO extends JavaPlugin {
     private static boolean healthBarPluginEnabled;
     private static boolean noCheatPlusPluginEnabled;
     private static boolean compatNoCheatPlusPluginEnabled;
+    private static boolean tagapiPluginEnabled;
     private static boolean mcpcEnabled;
 
     // Config Validation Check
@@ -111,6 +113,7 @@ public class mcMMO extends JavaPlugin {
     public final static String arrowDistanceKey    = "mcMMO: Arrow Distance";
     public final static String customDamageKey     = "mcMMO: Custom Damage";
     public final static String disarmedItemKey     = "mcMMO: Disarmed Item";
+    public final static String playerDataKey       = "mcMMO: Player Data";
 
     public static FixedMetadataValue metadataValue;
 
@@ -129,6 +132,7 @@ public class mcMMO extends JavaPlugin {
             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();
 
@@ -374,6 +378,9 @@ public class mcMMO extends JavaPlugin {
                 getLogger().warning("Failed to rename tools.yml to tools.default.yml!");
             }
         }
+
+        File currentFlatfilePath = new File(flatFileDirectory);
+        currentFlatfilePath.mkdirs();
     }
 
     private void checkForUpdates() {
@@ -441,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() {
@@ -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;
+    }
 }

src/main/java/com/gmail/nossr50/party/PartyManager.java

@@ -170,7 +170,7 @@ public final class PartyManager {
      */
     public static Party getParty(String partyName) {
         for (Party party : parties) {
-            if (party.getName().equals(partyName)) {
+            if (party.getName().equalsIgnoreCase(partyName)) {
                 return party;
             }
         }

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

@@ -2,7 +2,7 @@ package com.gmail.nossr50.runnables.skills;
 
 import java.util.Arrays;
 
-import org.bukkit.block.Block;
+import org.bukkit.Location;
 import org.bukkit.block.BrewingStand;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -12,8 +12,6 @@ import com.gmail.nossr50.skills.alchemy.Alchemy;
 import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
 
 public class AlchemyBrewCheckTask extends BukkitRunnable {
-    private final static int INGREDIENT_SLOT = 3;
-
     private Player player;
     private BrewingStand brewingStand;
     private ItemStack[] oldInventory;
@@ -26,18 +24,17 @@ public class AlchemyBrewCheckTask extends BukkitRunnable {
 
     @Override
     public void run() {
-        Block block = brewingStand.getBlock();
-        ItemStack[] newInventory = Arrays.copyOfRange(((BrewingStand) block.getState()).getInventory().getContents(), 0, 4);
+        Location location = brewingStand.getLocation();
+        ItemStack[] newInventory = Arrays.copyOfRange(brewingStand.getInventory().getContents(), 0, 4);
+        boolean validBrew = AlchemyPotionBrewer.isValidBrew(player, newInventory);
 
-        if (Alchemy.brewingStandMap.containsKey(brewingStand)) {
-            if (oldInventory[INGREDIENT_SLOT] == null || newInventory[INGREDIENT_SLOT] == null || !oldInventory[INGREDIENT_SLOT].isSimilar(newInventory[INGREDIENT_SLOT]) || !AlchemyPotionBrewer.isValidBrew(player, newInventory)) {
-                Alchemy.brewingStandMap.get(brewingStand).cancelBrew();
+        if (Alchemy.brewingStandMap.containsKey(location)) {
+            if (oldInventory[Alchemy.INGREDIENT_SLOT] == null || newInventory[Alchemy.INGREDIENT_SLOT] == null || !oldInventory[Alchemy.INGREDIENT_SLOT].isSimilar(newInventory[Alchemy.INGREDIENT_SLOT]) || !validBrew) {
+                Alchemy.brewingStandMap.get(location).cancelBrew();
             }
         }
-
-        if (!Alchemy.brewingStandMap.containsKey(brewingStand) && AlchemyPotionBrewer.isValidBrew(player, newInventory)) {
-            Alchemy.brewingStandMap.put(brewingStand, new AlchemyBrewTask(brewingStand, player));
+        else if (validBrew) {
+            Alchemy.brewingStandMap.put(location, new AlchemyBrewTask(brewingStand, player));
         }
     }
-
 }

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

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.runnables.skills;
 
+import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.BrewingStand;
@@ -22,44 +23,43 @@ public class AlchemyBrewTask extends BukkitRunnable {
     private static int    DEFAULT_BREW_TICKS = 400;
 
     private BlockState brewingStand;
+    private Location location;
     private double brewSpeed;
     private double brewTimer;
     private Player player;
 
     public AlchemyBrewTask(BlockState brewingStand, Player player) {
         this.brewingStand = brewingStand;
+        this.location = brewingStand.getLocation();
         this.player = player;
 
         brewSpeed = DEFAULT_BREW_SPEED;
         brewTimer = DEFAULT_BREW_TICKS;
 
         if (player != null && !Misc.isNPCEntity(player) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CATALYSIS)) {
-            double catalysis = UserManager.getPlayer(player).getAlchemyManager().getBrewSpeed();
-
-            if (Permissions.lucky(player, SkillType.ALCHEMY)) {
-                catalysis = UserManager.getPlayer(player).getAlchemyManager().getBrewSpeedLucky();
-            }
+            double catalysis = UserManager.getPlayer(player).getAlchemyManager().calculateBrewSpeed(Permissions.lucky(player, SkillType.ALCHEMY));
 
             McMMOPlayerCatalysisEvent event = new McMMOPlayerCatalysisEvent(player, catalysis);
             mcMMO.p.getServer().getPluginManager().callEvent(event);
+
             if (!event.isCancelled()) {
                 brewSpeed = catalysis;
             }
         }
 
-        if (Alchemy.brewingStandMap.containsKey(brewingStand)) {
-            Alchemy.brewingStandMap.get(brewingStand).cancel();
+        if (Alchemy.brewingStandMap.containsKey(location)) {
+            Alchemy.brewingStandMap.get(location).cancel();
         }
 
-        Alchemy.brewingStandMap.put(brewingStand, this);
+        Alchemy.brewingStandMap.put(location, this);
         this.runTaskTimer(mcMMO.p, 1, 1);
     }
 
     @Override
     public void run() {
         if (player == null || !player.isValid() || brewingStand == null || brewingStand.getType() != Material.BREWING_STAND) {
-            if (Alchemy.brewingStandMap.containsKey(brewingStand)) {
-                Alchemy.brewingStandMap.remove(brewingStand);
+            if (Alchemy.brewingStandMap.containsKey(location)) {
+                Alchemy.brewingStandMap.remove(location);
             }
 
             this.cancel();
@@ -87,20 +87,20 @@ public class AlchemyBrewTask extends BukkitRunnable {
             AlchemyPotionBrewer.finishBrewing(brewingStand, player, false);
         }
 
-        Alchemy.brewingStandMap.remove(brewingStand);
+        Alchemy.brewingStandMap.remove(location);
     }
 
     public void finishImmediately() {
         this.cancel();
 
         AlchemyPotionBrewer.finishBrewing(brewingStand, player, true);
-        Alchemy.brewingStandMap.remove(brewingStand);
+        Alchemy.brewingStandMap.remove(location);
     }
 
     public void cancelBrew() {
         this.cancel();
 
         ((BrewingStand) brewingStand).setBrewingTime(-1);
-        Alchemy.brewingStandMap.remove(brewingStand);
+        Alchemy.brewingStandMap.remove(location);
     }
 }

src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java

@@ -1,9 +1,11 @@
 package com.gmail.nossr50.skills.alchemy;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-import org.bukkit.block.BlockState;
+import org.bukkit.Location;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.AdvancedConfig;
@@ -44,36 +46,30 @@ public final class Alchemy {
         }
     }
 
+    public static final int INGREDIENT_SLOT = 3;
+
     public static int    catalysisUnlockLevel   = AdvancedConfig.getInstance().getCatalysisUnlockLevel();
     public static int    catalysisMaxBonusLevel = AdvancedConfig.getInstance().getCatalysisMaxBonusLevel();
     public static double catalysisMinSpeed      = AdvancedConfig.getInstance().getCatalysisMinSpeed();
     public static double catalysisMaxSpeed      = AdvancedConfig.getInstance().getCatalysisMaxSpeed();
 
-    public static Map<BlockState, AlchemyBrewTask> brewingStandMap = new HashMap<BlockState, AlchemyBrewTask>();
+    public static Map<Location, AlchemyBrewTask> brewingStandMap = new HashMap<Location, AlchemyBrewTask>();
 
     private Alchemy() {}
 
-    /**
-     * Calculate base brewing speed, given a skill level and ignoring all perks.
-     *
-     * @param skillLevel Skill level used for calculation.
-     *
-     * @return Base brewing speed for the level.
-     */
-    public static double calculateBrewSpeed(int skillLevel) {
-        if (skillLevel < catalysisUnlockLevel) {
-            return catalysisMinSpeed;
-        }
-
-        return Math.min(catalysisMaxSpeed, catalysisMinSpeed + (catalysisMaxSpeed - catalysisMinSpeed) * (skillLevel - catalysisUnlockLevel) / (catalysisMaxBonusLevel - catalysisUnlockLevel));
-    }
-
     /**
      * Finish all active brews.  Used upon Disable to prevent vanilla potions from being brewed upon next Enable.
      */
     public static void finishAllBrews() {
         mcMMO.p.debug("Completing " + brewingStandMap.size() + " unfinished Alchemy brews.");
+
+        List<AlchemyBrewTask> toFinish = new ArrayList<AlchemyBrewTask>();
+
         for (AlchemyBrewTask alchemyBrewTask : brewingStandMap.values()) {
+            toFinish.add(alchemyBrewTask);
+        }
+
+        for (AlchemyBrewTask alchemyBrewTask : toFinish) {
             alchemyBrewTask.finishImmediately();
         }
     }

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@@ -2,15 +2,14 @@ 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;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 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.skills.SkillManager;
-import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 
 public class AlchemyManager extends SkillManager {
@@ -20,23 +19,6 @@ public class AlchemyManager extends SkillManager {
         super(mcMMOPlayer, SkillType.ALCHEMY);
     }
 
-    public boolean canCatalysis() {
-        return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.CATALYSIS);
-    }
-
-    public boolean canConcoctions() {
-        return Permissions.secondaryAbilityEnabled(getPlayer(), SecondaryAbility.CONCOCTIONS);
-    }
-
-    public boolean canUseIngredient(ItemStack item) {
-        for (ItemStack ingredient : getIngredients()) {
-            if (item.isSimilar(ingredient)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public int getTier() {
         for (Alchemy.Tier tier : Alchemy.Tier.values()) {
             if (getSkillLevel() >= tier.getLevel()) {
@@ -48,31 +30,17 @@ public class AlchemyManager extends SkillManager {
     }
 
     public List<ItemStack> getIngredients() {
-        switch (Alchemy.Tier.fromNumerical(getTier())) {
-            case EIGHT:
-                return PotionConfig.getInstance().concoctionsIngredientsTierEight;
-            case SEVEN:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSeven;
-            case SIX:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSix;
-            case FIVE:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFive;
-            case FOUR:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFour;
-            case THREE:
-                return PotionConfig.getInstance().concoctionsIngredientsTierThree;
-            case TWO:
-                return PotionConfig.getInstance().concoctionsIngredientsTierTwo;
-            default:
-                return PotionConfig.getInstance().concoctionsIngredientsTierOne;
-        }
+        return PotionConfig.getInstance().getIngredients(getTier());
     }
 
     public String getIngredientList() {
         StringBuilder list = new StringBuilder();
 
         for (ItemStack ingredient : getIngredients()) {
-            String string = StringUtils.getPrettyItemString(ingredient.getType()) + (ingredient.getDurability() != 0 ? ":" + ingredient.getDurability() : "");
+            short durability = ingredient.getDurability();
+
+            String string = StringUtils.getPrettyItemString(ingredient.getType()) + (durability != 0 ? ":" + durability : "");
+
             if (string.equals("Long Grass:2")) {
                 string = "Fern";
             }
@@ -80,17 +48,20 @@ public class AlchemyManager extends SkillManager {
                 string = "Pufferfish";
             }
 
-            list.append(", " + string);
+            list.append(", ").append(string);
         }
+
         return list.substring(2);
     }
 
-    public double getBrewSpeed() {
-        return Alchemy.calculateBrewSpeed(getSkillLevel());
-    }
+    public double calculateBrewSpeed(boolean isLucky) {
+        int skillLevel = getSkillLevel();
 
-    public double getBrewSpeedLucky() {
-        return LUCKY_MODIFIER * Alchemy.calculateBrewSpeed(getSkillLevel());
+        if (skillLevel < Alchemy.catalysisUnlockLevel) {
+            return Alchemy.catalysisMinSpeed;
+        }
+
+        return Math.min(Alchemy.catalysisMaxSpeed, Alchemy.catalysisMinSpeed + (Alchemy.catalysisMaxSpeed - Alchemy.catalysisMinSpeed) * (skillLevel - Alchemy.catalysisUnlockLevel) / (Alchemy.catalysisMaxBonusLevel - Alchemy.catalysisUnlockLevel)) * (isLucky ? LUCKY_MODIFIER : 1.0);
     }
 
     public void handlePotionBrewSuccesses(int amount) {

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@@ -8,10 +8,6 @@ import org.bukkit.block.BrewingStand;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.inventory.InventoryMoveItemEvent;
-import org.bukkit.event.inventory.InventoryType.SlotType;
 import org.bukkit.inventory.BrewerInventory;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
@@ -27,60 +23,54 @@ import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 
 public final class AlchemyPotionBrewer {
-    private final static int[] BOTTLE_SLOTS = new int[]{0, 1, 2};
-    private final static int INGREDIENT_SLOT = 3;
-
     public static boolean isValidBrew(Player player, ItemStack[] contents) {
-        if (!isValidIngredient(player, contents[INGREDIENT_SLOT])) {
+        if (!isValidIngredient(player, contents[Alchemy.INGREDIENT_SLOT])) {
             return false;
         }
 
-        for (int bottle : BOTTLE_SLOTS) {
-            if (contents[bottle] != null && contents[bottle].getType() == Material.POTION) {
-                AlchemyPotion potion = PotionConfig.getInstance().potionMap.get(contents[bottle].getDurability());
+        for (int i = 0; i < 3; i++) {
+            if (contents[i] == null || contents[i].getType() != Material.POTION) {
+                continue;
+            }
 
-                if (getChildPotion(potion, contents[INGREDIENT_SLOT]) != null) {
-                    return true;
-                }
+            if (getChildPotion(PotionConfig.getInstance().getPotion(contents[i].getDurability()), contents[Alchemy.INGREDIENT_SLOT]) != null) {
+                return true;
             }
         }
 
         return false;
-
     }
 
     private static AlchemyPotion getChildPotion(AlchemyPotion potion, ItemStack ingredient) {
         if (potion != null && potion.getChildDataValue(ingredient) != -1) {
-            return PotionConfig.getInstance().potionMap.get(potion.getChildDataValue(ingredient));
+            return PotionConfig.getInstance().getPotion(potion.getChildDataValue(ingredient));
         }
 
         return null;
     }
 
-    private static boolean isEmpty(ItemStack item) {
+    public static boolean isEmpty(ItemStack item) {
         return item == null || item.getType() == Material.AIR || item.getAmount() == 0;
     }
 
     private static boolean removeIngredient(BrewerInventory inventory, Player player) {
-        ItemStack ingredient = inventory.getIngredient();
+        ItemStack ingredient = inventory.getIngredient().clone();
 
         if (isEmpty(ingredient) || !isValidIngredient(player, ingredient)) {
             return false;
         }
         else if (ingredient.getAmount() <= 1) {
-            inventory.setItem(INGREDIENT_SLOT, null);
-
+            inventory.setIngredient(null);
             return true;
         }
         else {
             ingredient.setAmount(ingredient.getAmount() - 1);
-            inventory.setItem(INGREDIENT_SLOT, ingredient);
-
+            inventory.setIngredient(ingredient);
             return true;
         }
     }
 
-    private static boolean isValidIngredient(Player player, ItemStack item) {
+    public static boolean isValidIngredient(Player player, ItemStack item) {
         if (isEmpty(item)) {
             return false;
         }
@@ -95,28 +85,7 @@ public final class AlchemyPotionBrewer {
     }
 
     private static List<ItemStack> getValidIngredients(Player player) {
-        if (player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS)) {
-            return PotionConfig.getInstance().concoctionsIngredientsTierOne;
-        }
-
-        switch (UserManager.getPlayer(player).getAlchemyManager().getTier()) {
-            case 8:
-                return PotionConfig.getInstance().concoctionsIngredientsTierEight;
-            case 7:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSeven;
-            case 6:
-                return PotionConfig.getInstance().concoctionsIngredientsTierSix;
-            case 5:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFive;
-            case 4:
-                return PotionConfig.getInstance().concoctionsIngredientsTierFour;
-            case 3:
-                return PotionConfig.getInstance().concoctionsIngredientsTierThree;
-            case 2:
-                return PotionConfig.getInstance().concoctionsIngredientsTierTwo;
-            default:
-                return PotionConfig.getInstance().concoctionsIngredientsTierOne;
-        }
+        return PotionConfig.getInstance().getIngredients((player == null || !Permissions.secondaryAbilityEnabled(player, SecondaryAbility.CONCOCTIONS)) ? 1 : UserManager.getPlayer(player).getAlchemyManager().getTier());
     }
 
     public static void finishBrewing(BlockState brewingStand, Player player, boolean forced) {
@@ -131,17 +100,21 @@ public final class AlchemyPotionBrewer {
             return;
         }
 
-        for (int bottle : BOTTLE_SLOTS) {
-            if (!isEmpty(inventory.getItem(bottle)) && PotionConfig.getInstance().potionMap.containsKey(inventory.getItem(bottle).getDurability())) {
-                AlchemyPotion input = PotionConfig.getInstance().potionMap.get(inventory.getItem(bottle).getDurability());
-                AlchemyPotion output = PotionConfig.getInstance().potionMap.get(input.getChildDataValue(ingredient));
+        for (int i = 0; i < 3; i++) {
+            ItemStack item = inventory.getItem(i);
 
-                if (output != null) {
-                    inventory.setItem(bottle, output.toItemStack(inventory.getItem(bottle).getAmount()).clone());
+            if (isEmpty(item) || item.getType() == Material.GLASS_BOTTLE || !PotionConfig.getInstance().isValidPotion(item)) {
+                continue;
+            }
 
-                    if (player != null) {
-                        UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(1);
-                    }
+            AlchemyPotion input = PotionConfig.getInstance().getPotion(item.getDurability());
+            AlchemyPotion output = PotionConfig.getInstance().getPotion(input.getChildDataValue(ingredient));
+
+            if (output != null) {
+                inventory.setItem(i, output.toItemStack(item.getAmount()).clone());
+
+                if (player != null) {
+                    UserManager.getPlayer(player).getAlchemyManager().handlePotionBrewSuccesses(1);
                 }
             }
         }
@@ -151,18 +124,36 @@ public final class AlchemyPotionBrewer {
         }
     }
 
+    public static boolean transferItems(InventoryView view, int fromSlot, int toSlot, ClickType click) {
+        boolean success = false;
+
+        if (click.isLeftClick()) {
+            success = transferItems(view, fromSlot, toSlot);
+        }
+        else if (click.isRightClick()) {
+            success = transferOneItem(view, fromSlot, toSlot);
+        }
+
+        return success;
+    }
+
     private static boolean transferOneItem(InventoryView view, int fromSlot, int toSlot) {
         ItemStack from = view.getItem(fromSlot).clone();
         ItemStack to = view.getItem(toSlot).clone();
+        boolean emptyFrom = isEmpty(from);
 
-        if (isEmpty(from)) {
+        if (emptyFrom) {
             return false;
         }
-        else if (!isEmpty(to) && from.getAmount() >= from.getType().getMaxStackSize()) {
+
+        boolean emptyTo = isEmpty(to);
+        int fromAmount = from.getAmount();
+
+        if (!emptyTo && fromAmount >= from.getType().getMaxStackSize()) {
             return false;
         }
-        else if (isEmpty(to) || from.isSimilar(to)) {
-            if (isEmpty(to)) {
+        else if (emptyTo || from.isSimilar(to)) {
+            if (emptyTo) {
                 to = from.clone();
                 to.setAmount(1);
             }
@@ -170,9 +161,9 @@ public final class AlchemyPotionBrewer {
                 to.setAmount(to.getAmount() + 1);
             }
 
-            from.setAmount(from.getAmount() - 1);
-            view.setItem(toSlot, isEmpty(to) ? null : to);
-            view.setItem(fromSlot, isEmpty(from) ? null : from);
+            from.setAmount(fromAmount - 1);
+            view.setItem(toSlot, emptyTo ? null : to);
+            view.setItem(fromSlot, emptyFrom ? null : from);
 
             return true;
         }
@@ -184,171 +175,50 @@ public final class AlchemyPotionBrewer {
      * Transfer items between two ItemStacks, returning the leftover status
      */
     private static boolean transferItems(InventoryView view, int fromSlot, int toSlot) {
-        if (isEmpty(view.getItem(fromSlot))) {
+        ItemStack from = view.getItem(fromSlot).clone();
+        ItemStack to = view.getItem(toSlot).clone();
+
+        if (isEmpty(from)) {
             return false;
         }
-        else if (isEmpty(view.getItem(toSlot))) {
-            view.setItem(toSlot, view.getItem(fromSlot).clone());
+        else if (isEmpty(to)) {
+            view.setItem(toSlot, from);
             view.setItem(fromSlot, null);
 
             return true;
         }
-        else if (view.getItem(fromSlot).isSimilar(view.getItem(toSlot))) {
-            if (view.getItem(fromSlot).getAmount() + view.getItem(toSlot).getAmount() > view.getItem(toSlot).getType().getMaxStackSize()) {
-                int left = view.getItem(fromSlot).getAmount() + view.getItem(toSlot).getAmount() - view.getItem(toSlot).getType().getMaxStackSize();
+        else if (from.isSimilar(to)) {
+            int fromAmount = from.getAmount();
+            int toAmount = to.getAmount();
+            int maxSize = to.getType().getMaxStackSize();
 
-                ItemStack to = new ItemStack(view.getItem(toSlot));
-                to.setAmount(to.getType().getMaxStackSize());
+            if (fromAmount + toAmount > maxSize) {
+                int left = fromAmount + toAmount - maxSize;
+
+                to.setAmount(maxSize);
                 view.setItem(toSlot, to);
 
-                ItemStack from = new ItemStack(view.getItem(fromSlot));
                 from.setAmount(left);
                 view.setItem(fromSlot, from);
 
                 return true;
             }
 
-            ItemStack to = new ItemStack(view.getItem(toSlot));
-            to.setAmount(view.getItem(fromSlot).getAmount() + view.getItem(toSlot).getAmount());
+            to.setAmount(fromAmount + toAmount);
             view.setItem(fromSlot, null);
             view.setItem(toSlot, to);
 
             return true;
         }
+
         return false;
     }
 
-    public static void handleInventoryClick(InventoryClickEvent event) {
-        Player player = event.getWhoClicked() instanceof Player ? (Player) event.getWhoClicked() : null;
-        BrewingStand brewingStand = (BrewingStand) event.getInventory().getHolder();
-
-        ItemStack cursor = event.getCursor();
-        ItemStack clicked = event.getCurrentItem();
-
-        if (clicked != null && clicked.getType() == Material.POTION) {
-            scheduleCheck(player, brewingStand);
-
-            return;
-        }
-
-        if (event.isShiftClick()) {
-            if (event.getSlotType() == SlotType.FUEL) {
-                scheduleCheck(player, brewingStand);
-
-                return;
-            }
-            else if (event.getSlotType() == SlotType.CONTAINER || event.getSlotType() == SlotType.QUICKBAR) {
-                if (isValidIngredient(player, clicked)) {
-                    if (event.isLeftClick()) {
-                        transferItems(event.getView(), event.getRawSlot(), INGREDIENT_SLOT);
-                    }
-                    else if (event.isRightClick()) {
-                        transferOneItem(event.getView(), event.getRawSlot(), INGREDIENT_SLOT);
-                    }
-
-                    event.setCancelled(true);
-
-                    scheduleUpdate(brewingStand.getInventory());
-                    scheduleCheck(player, brewingStand);
-
-                    return;
-                }
-            }
-        }
-        else if (event.getRawSlot() == INGREDIENT_SLOT) {
-            if (isEmpty(cursor) && isEmpty(clicked)) {
-                if (event.getClick() == ClickType.NUMBER_KEY) {
-                    scheduleCheck(player, brewingStand);
-                    return;
-                }
-                return;
-            }
-            else if (isEmpty(cursor)) {
-                scheduleCheck(player, brewingStand);
-
-                return;
-            }
-            else if (isEmpty(clicked)) {
-                if (isValidIngredient(player, event.getCursor())) {
-                    if (event.getClick() == ClickType.LEFT || (event.getClick() == ClickType.RIGHT && event.getCursor().getAmount() == 1)) {
-                        event.setCancelled(true);
-
-                        event.setCurrentItem(event.getCursor().clone());
-                        event.setCursor(null);
-
-                        scheduleUpdate(brewingStand.getInventory());
-                        scheduleCheck(player, brewingStand);
-
-                        return;
-                    }
-                    else if (event.getClick() == ClickType.RIGHT) {
-                        event.setCancelled(true);
-
-                        ItemStack one = event.getCursor().clone();
-                        one.setAmount(1);
-
-                        ItemStack rest = event.getCursor().clone();
-                        rest.setAmount(event.getCursor().getAmount() - 1);
-
-                        event.setCurrentItem(one);
-                        event.setCursor(rest);
-
-                        scheduleUpdate(brewingStand.getInventory());
-                        scheduleCheck(player, brewingStand);
-
-                        return;
-                    }
-                }
-                return;
-            }
-        }
-    }
-
-    public static void handleInventoryDrag(InventoryDragEvent event) {
-        Player player = event.getWhoClicked() instanceof Player ? (Player) event.getWhoClicked() : null;
-        BrewingStand brewingStand = (BrewingStand) event.getInventory().getHolder();
-
-        ItemStack cursor = event.getCursor();
-        ItemStack ingredient = brewingStand.getInventory().getIngredient();
-
-        if (!event.getInventorySlots().contains(INGREDIENT_SLOT)) {
-            return;
-        }
-
-        if (isEmpty(ingredient) || ingredient.isSimilar(cursor)) {
-            if (isValidIngredient(player, cursor)) {
-                // Not handled: dragging custom ingredients over ingredient slot (does not trigger any event)
-                scheduleCheck(player, brewingStand);
-
-                return;
-            }
-            else {
-                event.setCancelled(true);
-
-                scheduleUpdate(brewingStand.getInventory());
-
-                return;
-            }
-        }
-
-    }
-
-    public static void handleInventoryMoveItem(InventoryMoveItemEvent event) {
-        Player player = null;
-        BrewingStand brewingStand = (BrewingStand) event.getDestination().getHolder();
-
-        if (isValidIngredient(player, event.getItem())) {
-            scheduleCheck(player, brewingStand);
-
-            return;
-        }
-    }
-
-    private static void scheduleCheck(Player player, BrewingStand brewingStand) {
+    public static void scheduleCheck(Player player, BrewingStand brewingStand) {
         new AlchemyBrewCheckTask(player, brewingStand).runTask(mcMMO.p);
     }
 
-    private static void scheduleUpdate(Inventory inventory) {
+    public static void scheduleUpdate(Inventory inventory) {
         for (HumanEntity humanEntity : inventory.getViewers()) {
             if (humanEntity instanceof Player) {
                 new PlayerUpdateInventoryTask((Player) humanEntity).runTask(mcMMO.p);

src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -90,7 +90,15 @@ public class RepairManager extends SkillManager {
         Material repairMaterial = repairable.getRepairMaterial();
         byte repairMaterialMetadata = repairable.getRepairMaterialMetadata();
         ItemStack toRemove = new MaterialData(repairMaterial, repairMaterialMetadata).toItemStack(1);
+        
+        short startDurability = item.getDurability();
 
+        // Do not repair if at full durability
+        if (startDurability <= 0) {
+            player.sendMessage(LocaleLoader.getString("Repair.Skills.FullDurability"));
+            return;
+        }
+        
         // Check if they have the proper material to repair with
         if (!inventory.contains(repairMaterial)) {
             String message = LocaleLoader.getString("Skills.NeedMore", StringUtils.getPrettyItemString(repairMaterial));
@@ -103,14 +111,6 @@ public class RepairManager extends SkillManager {
             return;
         }
 
-        short startDurability = item.getDurability();
-
-        // Do not repair if at full durability
-        if (startDurability <= 0) {
-            player.sendMessage(LocaleLoader.getString("Repair.Skills.FullDurability"));
-            return;
-        }
-
         // Do not repair stacked items
         if (item.getAmount() != 1) {
             player.sendMessage(LocaleLoader.getString("Repair.Skills.StackedItems"));

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -260,7 +260,7 @@ public class TamingManager extends SkillManager {
             }
         }
 
-        player.setItemInHand(new ItemStack(heldItem.getType(), heldItemAmount - summonAmount));
+        player.setItemInHand(heldItemAmount == summonAmount ? null : new ItemStack(heldItem.getType(), heldItemAmount - summonAmount));
         player.sendMessage(LocaleLoader.getString("Taming.Summon.Complete"));
     }
 

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

@@ -149,11 +149,10 @@ public final class Misc {
     }
 
     public static void profileCleanup(String playerName) {
-        UserManager.remove(playerName);
-
         Player player = mcMMO.p.getServer().getPlayerExact(playerName);
 
         if (player != null) {
+            UserManager.remove(player);
             UserManager.addUser(player);
         }
     }

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

@@ -34,7 +34,9 @@ public final class Motd {
      * @param version Plugin version
      */
     public static void displayVersion(Player player, String version) {
-        player.sendMessage(LocaleLoader.getString("MOTD.Version", version));
+        if (Permissions.showversion(player)) {
+            player.sendMessage(LocaleLoader.getString("MOTD.Version", version));
+        }
     }
 
     /**

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

@@ -25,6 +25,7 @@ public final class Permissions {
     public static boolean mobHealthDisplay(Permissible permissible) { return permissible.hasPermission("mcmmo.mobhealthdisplay"); }
     public static boolean updateNotifications(Permissible permissible) {return permissible.hasPermission("mcmmo.tools.updatecheck"); }
     public static boolean chimaeraWing(Permissible permissible) { return permissible.hasPermission("mcmmo.item.chimaerawing"); }
+    public static boolean showversion(Permissible permissible) { return permissible.hasPermission("mcmmo.showversion"); }
 
     /* BYPASS */
     public static boolean hardcoreBypass(Permissible permissible) { return permissible.hasPermission("mcmmo.bypass.hardcoremode"); }

src/main/java/com/gmail/nossr50/util/player/UserManager.java

@@ -1,18 +1,19 @@
 package com.gmail.nossr50.util.player;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.HashSet;
 import java.util.Set;
 
 import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.FixedMetadataValue;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 
 public final class UserManager {
-    private final static Map<String, McMMOPlayer> players = new HashMap<String, McMMOPlayer>();
 
     private UserManager() {}
 
@@ -23,16 +24,8 @@ public final class UserManager {
      * @return the player's {@link McMMOPlayer} object
      */
     public static McMMOPlayer addUser(Player player) {
-        String playerName = player.getName();
-        McMMOPlayer mcMMOPlayer = players.get(playerName);
-
-        if (mcMMOPlayer != null) {
-            mcMMOPlayer.setPlayer(player); // The player object is different on each reconnection and must be updated
-        }
-        else {
-            mcMMOPlayer = new McMMOPlayer(player);
-            players.put(playerName, mcMMOPlayer);
-        }
+        McMMOPlayer mcMMOPlayer = new McMMOPlayer(player);
+        player.setMetadata(mcMMO.playerDataKey, new FixedMetadataValue(mcMMO.p, mcMMOPlayer));
 
         return mcMMOPlayer;
     }
@@ -40,35 +33,51 @@ public final class UserManager {
     /**
      * Remove a user.
      *
-     * @param playerName The name of the player to remove
+     * @param player The Player object
      */
-    public static void remove(String playerName) {
-        players.remove(playerName);
+    public static void remove(Player player) {
+        player.removeMetadata(mcMMO.playerDataKey, mcMMO.p);
     }
 
     /**
      * Clear all users.
      */
     public static void clearAll() {
-        players.clear();
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            remove(player);
+        }
     }
 
     /**
      * Save all users.
      */
     public static void saveAll() {
-        mcMMO.p.debug("Saving mcMMOPlayers... (" + players.size() + ")");
-        for (McMMOPlayer mcMMOPlayer : players.values()) {
-            mcMMOPlayer.getProfile().save();
+        Player[] onlinePlayers = mcMMO.p.getServer().getOnlinePlayers();
+        mcMMO.p.debug("Saving mcMMOPlayers... (" + onlinePlayers.length + ")");
+
+        for (Player player : onlinePlayers) {
+            getPlayer(player).getProfile().save();
         }
     }
 
     public static Set<String> getPlayerNames() {
-        return players.keySet();
+        Set<String> playerNames = new HashSet<String>();
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            playerNames.add(player.getName());
+        }
+
+        return playerNames;
     }
 
     public static Collection<McMMOPlayer> getPlayers() {
-        return players.values();
+        Collection<McMMOPlayer> playerCollection  = new ArrayList<McMMOPlayer>();
+
+        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
+            playerCollection.add(getPlayer(player));
+        }
+
+        return playerCollection;
     }
 
     /**
@@ -88,10 +97,16 @@ public final class UserManager {
      * @return the player's McMMOPlayer object
      */
     public static McMMOPlayer getPlayer(OfflinePlayer player) {
+        if (player instanceof Player) {
+            return getPlayer((Player) player);
+        }
         return retrieveMcMMOPlayer(player.getName(), false);
     }
 
     public static McMMOPlayer getPlayer(OfflinePlayer player, boolean offlineValid) {
+        if (player instanceof Player) {
+            return getPlayer((Player) player);
+        }
         return retrieveMcMMOPlayer(player.getName(), offlineValid);
     }
 
@@ -99,24 +114,29 @@ public final class UserManager {
         return retrieveMcMMOPlayer(playerName, offlineValid);
     }
 
+    public static McMMOPlayer getPlayer(Player player) {
+        return (McMMOPlayer) player.getMetadata(mcMMO.playerDataKey).get(0).value();
+    }
+
     private static McMMOPlayer retrieveMcMMOPlayer(String playerName, boolean offlineValid) {
-        McMMOPlayer mcMMOPlayer = players.get(playerName);
+        Player player = mcMMO.p.getServer().getPlayerExact(playerName);
 
-        if (mcMMOPlayer == null) {
-            Player player = mcMMO.p.getServer().getPlayerExact(playerName);
-
-            if (player == null) {
-                if (!offlineValid) {
-                    mcMMO.p.getLogger().warning("A valid mcMMOPlayer object could not be found for " + playerName + ".");
-                }
-
-                return null;
+        if (player == null) {
+            if (!offlineValid) {
+                mcMMO.p.getLogger().warning("A valid mcMMOPlayer object could not be found for " + playerName + ".");
             }
 
-            mcMMOPlayer = new McMMOPlayer(player);
-            players.put(playerName, mcMMOPlayer);
+            return null;
         }
 
-        return mcMMOPlayer;
+        return getPlayer(player);
+    }
+
+    public static boolean hasPlayerDataKey(Entity entity) {
+        if (entity == null) {
+            return false;
+        }
+
+        return entity.hasMetadata(mcMMO.playerDataKey);
     }
 }

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) {
@@ -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);
+                }
             }
         }
 

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);
+    }
 }

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

@@ -197,7 +197,7 @@ public final class CombatUtils {
         if (attacker instanceof Player && entityType == EntityType.PLAYER) {
             Player player = (Player) attacker;
 
-            if (Misc.isNPCEntity(player)) {
+            if (!UserManager.hasPlayerDataKey(player)) {
                 return;
             }
 

src/main/resources/locale/locale_en_US.properties

@@ -523,7 +523,7 @@ Commands.Party.Alliance.Invite.0=[[RED]]ALERT: [[GREEN]]You have received a part
 Commands.Party.Alliance.Invite.1=[[YELLOW]]Type [[GREEN]]/party alliance accept[[YELLOW]] to accept the invite
 Commands.Party.Alliance.Invite.Accepted=[[GREEN]]Alliance invite Accepted.
 Commands.Party.Alliance.None=[[RED]]Your does not have an ally.
-Commands.Party.Alliance.AlreadyAllies=[[RED]]Your party already has an ally.
+Commands.Party.Alliance.AlreadyAllies=[[RED]]Your party already has an ally. Disband with [[DARK_AQUA]]/party alliance disband
 Commands.Party.Alliance.Help.0=[[RED]]This party hasn't formed an alliance. Invite a party leader
 Commands.Party.Alliance.Help.1=[[RED]] to an alliance with [[DARK_AQUA]]/party alliance invite <player>[[RED]].
 Commands.ptp.Enabled=Party teleporting [[GREEN]]enabled

src/main/resources/plugin.yml

@@ -1937,6 +1937,9 @@ permissions:
         children:
             mcmmo.ability.woodcutting.all: true
             mcmmo.commands.woodcutting: true
+    mcmmo.showversion:
+        default: true
+        description: Show mcMMO version number in /mcmmo and motd
     mcmmo.tools.*:
         default: false
         description: Implies all mcmmo.tools permissions.

src/main/resources/potions.yml

@@ -116,38 +116,33 @@ Potions:
     ### DRINKABLE POTIONS ######################################################
 
     8194: # Potion of Swiftness
-        Effects: ["SPEED 0 3600"]        
         Children:
             FERMENTED_SPIDER_EYE: 8202
             GLOWSTONE_DUST: 8226
             REDSTONE: 8258
             SULPHUR: 16386
     8226: # Potion of Swiftness II
-        Effects: ["SPEED 1 1800"]        
         Children:
             FERMENTED_SPIDER_EYE: 8266
             REDSTONE: 8258
             SULPHUR: 16418
     8258: # Potion of Swiftness Extended
-        Effects: ["SPEED 0 9600"]        
         Children:
             FERMENTED_SPIDER_EYE: 8202
             GLOWSTONE_DUST: 8226
             SULPHUR: 16450
 
     8202: # Potion of Slowness
-        Effects: ["SLOW 0 1800"]        
         Children:
             REDSTONE: 8266
             SULPHUR: 16394
     8266: # Potion of Slowness Extended
-        Effects: ["SLOW 0 4800"]        
         Children:
             GLOWSTONE_DUST: 8202
             SULPHUR: 16458
 
     768: # Potion of Haste
-        Effects: ["FAST_DIGGING 0 3600"]        
+        Effects: ["FAST_DIGGING 0 3600"]
         Children:
             GLOWSTONE_DUST: 800
             REDSTONE: 832
@@ -160,7 +155,7 @@ Potions:
             SULPHUR: 17184
 
     832: # Potion of Haste Extended
-        Effects: ["FAST_DIGGING 0 9600"]        
+        Effects: ["FAST_DIGGING 0 9600"]
         Children:
             GLOWSTONE_DUST: 800
             SULPHUR: 17216
@@ -183,45 +178,38 @@ Potions:
             SULPHUR: 17472
 
     8201: # Potion of Strength
-        Effects: ["INCREASE_DAMAGE 0 3600"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             GLOWSTONE_DUST: 8233
             REDSTONE: 8265
             SULPHUR: 16393
     8233: # Potion of Strength II
-        Effects: ["INCREASE_DAMAGE 1 1800"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             REDSTONE: 8265
             SULPHUR: 16425
     8265: # Potion of Strength Extended
-        Effects: ["INCREASE_DAMAGE 0 9600"]
         Children:
             FERMENTED_SPIDER_EYE: 8264
             GLOWSTONE_DUST: 8233
             SULPHUR: 16457
 
     8197: # Potion of Healing
-        Effects: ["HEAL 0"]
         Children:
             FERMENTED_SPIDER_EYE: 8204
             GLOWSTONE_DUST: 8229
             SULPHUR: 16389
     8229: # Potion of Healing II
-        Effects: ["HEAL 1"]
         Children:
             FERMENTED_SPIDER_EYE: 8236
             REDSTONE: 8197
             SULPHUR: 16421
 
     8204: # Potion of Harming
-        Effects: ["HARM 0"]
         Children:
             GLOWSTONE_DUST: 8236
             SULPHUR: 16396
     8236: # Potion of Harming II
-        Effects: ["HARM 1"]
         Children:
             REDSTONE: 8204
             SULPHUR: 16428
@@ -255,20 +243,17 @@ Potions:
             SULPHUR: 18752
 
     8193: # Potion of Regeneration
-        Effects: ["REGENERATION 0 900"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             GLOWSTONE_DUST: 8225
             REDSTONE: 8257
             SULPHUR: 16385
     8225: # Potion of Regeneration II
-        Effects: ["REGENERATION 1 450"]
         Children:
             FERMENTED_SPIDER_EYE: 8200
             REDSTONE: 8257
             SULPHUR: 16417
     8257: # Potion of Regeneration Extended
-        Effects: ["REGENERATION 0 2400"]
         Children:
             FERMENTED_SPIDER_EYE: 8264
             GLOWSTONE_DUST: 8225
@@ -292,38 +277,32 @@ Potions:
             SULPHUR: 19264
 
     8195: # Potion of Fire Resistance
-        Effects: ["FIRE_RESISTANCE 0 3600"]
         Children:
             FERMENTED_SPIDER_EYE: 8202
-            REDSTONE: 3139
+            REDSTONE: 8259
             SULPHUR: 16387
-    3139: # Potion of Fire Resistance Extended
-        Effects: ["FIRE_RESISTANCE 0 9600"]
+    8259: # Potion of Fire Resistance Extended
         Children:
             FERMENTED_SPIDER_EYE: 8266
             GLOWSTONE_DUST: 8195
             SULPHUR: 16451
 
     8205: # Potion of Water Breathing
-        Effects: ["WATER_BREATHING 0 3600"]
         Children:
-            REDSTONE: 3405
+            REDSTONE: 8269
             SULPHUR: 16397
-    3405: # Potion of Water Breathing Extended
-        Effects: ["WATER_BREATHING 0 9600"]
+    8269: # Potion of Water Breathing Extended
         Children:
             GLOWSTONE_DUST: 8205
             SULPHUR: 16461
 
-    3598: # Potion of Invisibility
-        Effects: ["INVISIBILITY 0 3600"]
+    8206: # Potion of Invisibility
         Children:
-            REDSTONE: 3662
+            REDSTONE: 8270
             SULPHUR: 16398
-    3662: # Potion of Invisibility Extended
-        Effects: ["INVISIBILITY 0 9600"]
+    8270: # Potion of Invisibility Extended
         Children:
-            GLOWSTONE_DUST: 3598
+            GLOWSTONE_DUST: 8206
             SULPHUR: 16462
 
     3840: # Potion of Blindness
@@ -338,15 +317,13 @@ Potions:
             SULPHUR: 20288
 
     8198: # Potion of Night Vision
-        Effects: ["NIGHT_VISION 0 3600"]
         Children:
-            FERMENTED_SPIDER_EYE: 3598
-            REDSTONE: 4166
+            FERMENTED_SPIDER_EYE: 8206
+            REDSTONE: 8262
             SULPHUR: 16390
-    4166: # Potion of Night Vision Extended
-        Effects: ["NIGHT_VISION 0 9600"]
+    8262: # Potion of Night Vision Extended
         Children:
-            FERMENTED_SPIDER_EYE: 3662
+            FERMENTED_SPIDER_EYE: 8270
             GLOWSTONE_DUST: 8198
             SULPHUR: 16454
 
@@ -368,31 +345,26 @@ Potions:
             SULPHUR: 20800
 
     8200: # Potion of Weakness
-        Effects: ["WEAKNESS 0 1800"]
         Children:
             REDSTONE: 8264
             SULPHUR: 16392
     8264: # Potion of Weakness Extended
-        Effects: ["WEAKNESS 0 4800"]
         Children:
             GLOWSTONE_DUST: 8200
             SULPHUR: 16456
 
     8196: # Potion of Poison
-        Effects: ["POISON 0 900"]
         Children:
             FERMENTED_SPIDER_EYE: 8204
             GLOWSTONE_DUST: 8228
             REDSTONE: 8260
             SULPHUR: 16388
     8228: # Potion of Poison II
-        Effects: ["POISON 1 450"]
         Children:
             FERMENTED_SPIDER_EYE: 8236
             REDSTONE: 8260
-            SULPHUR: 16452
+            SULPHUR: 16420
     8260: # Potion of Poison Extended
-        Effects: ["POISON 0 2400"]
         Children:
             FERMENTED_SPIDER_EYE: 8204
             GLOWSTONE_DUST: 8228
@@ -467,28 +439,23 @@ Potions:
             FERMENTED_SPIDER_EYE: 16392
 
     16386: # Splash Potion of Swiftness
-        Effects: ["SPEED 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             GLOWSTONE_DUST: 16418
             REDSTONE: 16450
     16418: # Splash Potion of Swiftness II
-        Effects: ["SPEED 1 1350"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             REDSTONE: 16450
     16450: # Splash Potion of Swiftness Extended
-        Effects: ["SPEED 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             GLOWSTONE_DUST: 16418
 
     16394: # Splash Potion of Slowness
-        Effects: ["SLOW 0 1350"]
         Children:
             REDSTONE: 16458
     16458: # Splash Potion of Slowness Extended
-        Effects: ["SLOW 0 3600"]
         Children:
             GLOWSTONE_DUST: 16394
 
@@ -521,39 +488,32 @@ Potions:
             GLOWSTONE_DUST: 17440
 
     16393: # Splash Potion of Strength
-        Effects: ["INCREASE_DAMAGE 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             GLOWSTONE_DUST: 16425
             REDSTONE: 16457
     16425: # Splash Potion of Strength II
-        Effects: ["INCREASE_DAMAGE 1 1350"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             REDSTONE: 16457
     16457: # Splash Potion of Strength Extended
-        Effects: ["INCREASE_DAMAGE 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16456
             GLOWSTONE_DUST: 16425
 
     16389: # Splash Potion of Healing
-        Effects: ["HEAL 0"]
         Children:
             FERMENTED_SPIDER_EYE: 16396
             GLOWSTONE_DUST: 16421
     16421: # Splash Potion of Healing II
-        Effects: ["HEAL 1"]
         Children:
             FERMENTED_SPIDER_EYE: 16428
             REDSTONE: 16389
 
     16396: # Splash Potion of Harming
-        Effects: ["HARM 0"]
         Children:
             GLOWSTONE_DUST: 16428
     16428: # Splash Potion of Harming II
-        Effects: ["HARM 1"]
         Children:
             REDSTONE: 16396
 
@@ -581,18 +541,15 @@ Potions:
             GLOWSTONE_DUST: 18688
 
     16385: # Splash Potion of Regeneration
-        Effects: ["REGENERATION 0 675"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             GLOWSTONE_DUST: 16417
             REDSTONE: 16449
     16417: # Splash Potion of Regeneration II
-        Effects: ["REGENERATION 1 338"]
         Children:
             FERMENTED_SPIDER_EYE: 16392
             REDSTONE: 16449
     16449: # Splash Potion of Regeneration Extended
-        Effects: ["REGENERATION 0 1800"]
         Children:
             FERMENTED_SPIDER_EYE: 16456
             GLOWSTONE_DUST: 16417
@@ -612,31 +569,25 @@ Potions:
             GLOWSTONE_DUST: 19232
 
     16387: # Splash Potion of Fire Resistance
-        Effects: ["FIRE_RESISTANCE 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16394
             REDSTONE: 16451
     16451: # Splash Potion of Fire Resistance Extended
-        Effects: ["FIRE_RESISTANCE 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16458
             GLOWSTONE_DUST: 16387
 
     16397: # Splash Potion of Water Breathing
-        Effects: ["WATER_BREATHING 0 2700"]
         Children:
             REDSTONE: 16461
     16461: # Splash Potion of Water Breathing Extended
-        Effects: ["WATER_BREATHING 0 7200"]
         Children:
             GLOWSTONE_DUST: 16397
 
     16398: # Splash Potion of Invisibility
-        Effects: ["INVISIBILITY 0 2700"]
         Children:
             REDSTONE: 16462
     16462: # Splash Potion of Invisibility Extended
-        Effects: ["INVISIBILITY 0 7200"]
         Children:
             GLOWSTONE_DUST: 16398
 
@@ -650,12 +601,10 @@ Potions:
             GLOWSTONE_DUST: 20224
 
     16390: # Splash Potion of Night Vision
-        Effects: ["NIGHT_VISION 0 2700"]
         Children:
             FERMENTED_SPIDER_EYE: 16398
             REDSTONE: 16454
     16454: # Splash Potion of Night Vision Extended
-        Effects: ["NIGHT_VISION 0 7200"]
         Children:
             FERMENTED_SPIDER_EYE: 16462
             GLOWSTONE_DUST: 16390
@@ -675,30 +624,25 @@ Potions:
             GLOWSTONE_DUST: 20768
 
     16392: # Splash Potion of Weakness
-        Effects: ["WEAKNESS 0 1350"]
         Children:
             REDSTONE: 16456
     16456: # Splash Potion of Weakness Extended
-        Effects: ["WEAKNESS 0 3600"]
         Children:
             GLOWSTONE_DUST: 16392
 
     16388: # Splash Potion of Poison
-        Effects: ["POISON 0 675"]
         Children:
             FERMENTED_SPIDER_EYE: 16396
-            GLOWSTONE_DUST: 16452
+            GLOWSTONE_DUST: 16420
             REDSTONE: 16452
-    16452: # Splash Potion of Poison II
-        Effects: ["POISON 1 338"]
+    16420: # Splash Potion of Poison II
         Children:
             FERMENTED_SPIDER_EYE: 16428
             REDSTONE: 16452
     16452: # Splash Potion of Poison Extended
-        Effects: ["POISON 0 1800"]
         Children:
             FERMENTED_SPIDER_EYE: 16396
-            GLOWSTONE_DUST: 16452
+            GLOWSTONE_DUST: 16420
 
     21504: # Splash Potion of Decay
         Effects: ["WITHER 0 338"]