Level/exp on all equips + Player stats overhaul + Chair handler patch

Implemented a massive overhaul on Character.wz, adding in equipment level-related nodes in order to make equipments level/EXP info available for anyone to check.
Implemented a major overhaul on the player stat management throughout the source, properly encapsulating and concurrency protecting it's mechanics.
Reviewed several MoveLifeHandler aspects, some of them trying to prevent mobs from falling from footholds in certain circumstances.
Fixed MP Recovery instant killing players when they run out of HP to use.
Fixed some chairs arbitrarily disconnecting players upon HP/MP recovery.
Fixed Puppets sticking to maps in certain scenarios.
Cached data and added concurrency protection for EXP gain on equipments.
Reworked Chair Mastery skill, now with recovering amounts based on a player's base HP/MP pool.
Fixed several deadlock issues revolving rate coupons and character inventory.
Improved overall autopot handler performance.
Reworked door bosses (such as Crocell), now spawning each 3 hours instead of upon player's demand.
Fixed alliances not saving rank names on DB at creation time.
Fixed alliances retaining disbanded guild info on DB.
Added Mystic Door support for the Mushroom Castle area.

src/client/command/commands/gm0/BuyBackCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleClient;
 import client.command.Command;

src/client/command/commands/gm0/DisposeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm0/DropLimitCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleClient;
 import client.command.Command;

src/client/command/commands/gm0/EquipLvCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm0/GachaCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm0/GmCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/HelpCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleClient;
 import client.command.Command;

src/client/command/commands/gm0/JoinEventCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/LeaveEventCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/OnlineCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/RanksCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/RatesCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/ReportBugCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/ShowRatesCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm0/StaffCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleClient;
 import client.command.Command;

src/client/command/commands/gm0/StatDexCommand.java

@@ -21,12 +21,12 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import client.MapleStat;
 import client.command.Command;
+import constants.ServerConstants;
 
 public class StatDexCommand extends Command {
     {
@@ -38,20 +38,9 @@ public class StatDexCommand extends Command {
         MapleCharacter player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
 
-        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : remainingAp;
-        if (amount > 0 && amount <= remainingAp && amount <= 32763) {
-            int playerStat = player.getDex();
-            
-            if (amount + playerStat <= 32767 && amount + playerStat >= 4) {
-                player.setDex(playerStat + amount);
-                player.updateSingleStat(MapleStat.DEX, playerStat);
-                player.setRemainingAp(remainingAp - amount);
-                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
-            } else {
-                player.dropMessage("Please make sure the stat you are trying to raise is not over 32,767 or under 4.");
-            }
-        } else {
-            player.dropMessage("Please make sure your AP is not over 32,767 and you have enough to distribute.");
+        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : Math.min(remainingAp, ServerConstants.MAX_AP - player.getDex());
+        if (!player.assignDex(amount)) {
+            player.dropMessage("Please make sure your AP is not over " + ServerConstants.MAX_AP + " and you have enough to distribute.");
         }
     }
 }

src/client/command/commands/gm0/StatIntCommand.java

@@ -21,12 +21,12 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
+import constants.ServerConstants;
 
 public class StatIntCommand extends Command {
     {
@@ -38,20 +38,9 @@ public class StatIntCommand extends Command {
         MapleCharacter player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
 
-        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : remainingAp;
-        if (amount > 0 && amount <= remainingAp && amount <= 32763) {
-            int playerStat = player.getInt();
-            
-            if (amount + playerStat <= 32767 && amount + playerStat >= 4) {
-                player.setInt(playerStat + amount);
-                player.updateSingleStat(MapleStat.INT, playerStat);
-                player.setRemainingAp(remainingAp - amount);
-                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
-            } else {
-                player.dropMessage("Please make sure the stat you are trying to raise is not over 32,767 or under 4.");
-            }
-        } else {
-            player.dropMessage("Please make sure your AP is not over 32,767 and you have enough to distribute.");
+        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : Math.min(remainingAp, ServerConstants.MAX_AP - player.getInt());
+        if (!player.assignInt(amount)) {
+            player.dropMessage("Please make sure your AP is not over " + ServerConstants.MAX_AP + " and you have enough to distribute.");
         }
     }
 }

src/client/command/commands/gm0/StatLukCommand.java

@@ -21,12 +21,12 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import client.MapleStat;
 import client.command.Command;
+import constants.ServerConstants;
 
 public class StatLukCommand extends Command {
     {
@@ -38,20 +38,9 @@ public class StatLukCommand extends Command {
         MapleCharacter player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
 
-        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : remainingAp;
-        if (amount > 0 && amount <= remainingAp && amount <= 32763) {
-            int playerStat = player.getLuk();
-            
-            if (amount + playerStat <= 32767 && amount + playerStat >= 4) {
-                player.setLuk(playerStat + amount);
-                player.updateSingleStat(MapleStat.LUK, playerStat);
-                player.setRemainingAp(remainingAp - amount);
-                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
-            } else {
-                player.dropMessage("Please make sure the stat you are trying to raise is not over 32,767 or under 4.");
-            }
-        } else {
-            player.dropMessage("Please make sure your AP is not over 32,767 and you have enough to distribute.");
+        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : Math.min(remainingAp, ServerConstants.MAX_AP - player.getLuk());
+        if (!player.assignLuk(amount)) {
+            player.dropMessage("Please make sure your AP is not over " + ServerConstants.MAX_AP + " and you have enough to distribute.");
         }
     }
 }

src/client/command/commands/gm0/StatStrCommand.java

@@ -21,12 +21,12 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
+import constants.ServerConstants;
 
 public class StatStrCommand extends Command {
     {
@@ -37,21 +37,10 @@ public class StatStrCommand extends Command {
     public void execute(MapleClient c, String[] params) {
         MapleCharacter player = c.getPlayer();
         int remainingAp = player.getRemainingAp();
-
-        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : remainingAp;
-        if (amount > 0 && amount <= remainingAp && amount <= 32763) {
-            int playerStat = player.getStr();
-            
-            if (amount + playerStat <= 32767 && amount + playerStat >= 4) {
-                player.setStr(playerStat + amount);
-                player.updateSingleStat(MapleStat.STR, playerStat);
-                player.setRemainingAp(remainingAp - amount);
-                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
-            } else {
-                player.dropMessage("Please make sure the stat you are trying to raise is not over 32,767 or under 4.");
-            }
-        } else {
-            player.dropMessage("Please make sure your AP is not over 32,767 and you have enough to distribute.");
+        int amount = (params.length > 0) ? Math.min(Integer.parseInt(params[0]), remainingAp) : Math.min(remainingAp, ServerConstants.MAX_AP - player.getStr());
+        
+        if (!player.assignStr(amount)) {
+            player.dropMessage("Please make sure your AP is not over " + ServerConstants.MAX_AP + " and you have enough to distribute.");
         }
     }
 }

src/client/command/commands/gm0/TimeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.MapleClient;
 import client.command.Command;

src/client/command/commands/gm0/UptimeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v0;
+package client.command.commands.gm0;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm1/BossHpCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v1;
+package client.command.commands.gm1;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm1/BuffMeCommand.java

@@ -21,10 +21,9 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v1;
+package client.command.commands.gm1;
 
 import client.MapleCharacter;
-import client.MapleStat;
 import client.SkillFactory;
 import client.command.Command;
 import client.MapleClient;
@@ -42,9 +41,6 @@ public class BuffMeCommand extends Command {
         SkillFactory.getSkill(1301007).getEffect(SkillFactory.getSkill(1301007).getMaxLevel()).applyTo(player);
         SkillFactory.getSkill(2301004).getEffect(SkillFactory.getSkill(2301004).getMaxLevel()).applyTo(player);
         SkillFactory.getSkill(1005).getEffect(SkillFactory.getSkill(1005).getMaxLevel()).applyTo(player);
-        player.setHp(player.getMaxHp());
-        player.updateSingleStat(MapleStat.HP, player.getMaxHp());
-        player.setMp(player.getMaxMp());
-        player.updateSingleStat(MapleStat.MP, player.getMaxMp());
+        player.healHpMp();
     }
 }

src/client/command/commands/gm1/GotoCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v1;
+package client.command.commands.gm1;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm1/MobHpCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v1;
+package client.command.commands.gm1;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm1/WhatDropsFromCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v1;
+package client.command.commands.gm1;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm1/WhoDropsCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v1;
+package client.command.commands.gm1;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm2/ApCommand.java

@@ -21,9 +21,8 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
@@ -47,8 +46,7 @@ public class ApCommand extends Command {
             if (newAp < 0) newAp = 0;
             else if (newAp > ServerConstants.MAX_AP) newAp = ServerConstants.MAX_AP;
 
-            player.setRemainingAp(newAp);
-            player.updateSingleStat(MapleStat.AVAILABLEAP, player.getRemainingAp());
+            player.changeRemainingAp(newAp, false);
         } else {
             MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
             if (victim != null) {
@@ -56,8 +54,7 @@ public class ApCommand extends Command {
                 if (newAp < 0) newAp = 0;
                 else if (newAp > ServerConstants.MAX_AP) newAp = ServerConstants.MAX_AP;
 
-                victim.setRemainingAp(newAp);
-                victim.updateSingleStat(MapleStat.AVAILABLEAP, victim.getRemainingAp());
+                victim.changeRemainingAp(newAp, false);
             } else {
                 player.message("Player '" + params[0] + "' could not be found on this channel.");
             }

src/client/command/commands/gm2/BombCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/BuffCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.Skill;
 import client.SkillFactory;

src/client/command/commands/gm2/BuffMapCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.SkillFactory;
 import client.command.Command;

src/client/command/commands/gm2/ClearDropsCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/ClearSlotCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/DcCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/EmpowerMeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.SkillFactory;
 import client.command.Command;

src/client/command/commands/gm2/GmShopCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/HealCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;
@@ -35,7 +35,7 @@ public class HealCommand extends Command {
     @Override
     public void execute(MapleClient c, String[] params) {
         MapleCharacter player = c.getPlayer();
-        player.setHpMp(30000);
+        player.healHpMp();
     }
 
 }

src/client/command/commands/gm2/HideCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.SkillFactory;
 import client.command.Command;

src/client/command/commands/gm2/ItemCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/ItemDropCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/JailCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/JobCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.MapleJob;
 import client.command.Command;

src/client/command/commands/gm2/LevelCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/LevelProCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/MaxSkillCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.*;
 import client.command.Command;

src/client/command/commands/gm2/MaxStatCommand.java

@@ -21,13 +21,12 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
-import client.command.CommandsExecutor;
 import constants.ServerConstants;
 
 public class MaxStatCommand extends Command {
@@ -43,21 +42,11 @@ public class MaxStatCommand extends Command {
         player.resetPlayerRates();
         if (ServerConstants.USE_ADD_RATES_BY_LEVEL) player.setPlayerRates();
         player.setWorldRates();
-        player.setStr(Short.MAX_VALUE);
-        player.setDex(Short.MAX_VALUE);
-        player.setInt(Short.MAX_VALUE);
-        player.setLuk(Short.MAX_VALUE);
-        player.updateSingleStat(MapleStat.STR, Short.MAX_VALUE);
-        player.updateSingleStat(MapleStat.DEX, Short.MAX_VALUE);
-        player.updateSingleStat(MapleStat.INT, Short.MAX_VALUE);
-        player.updateSingleStat(MapleStat.LUK, Short.MAX_VALUE);
+        player.updateStrDexIntLuk(Short.MAX_VALUE);
         player.setFame(13337);
-        player.setMaxHp(30000);
-        player.setMaxMp(30000);
+        player.updateMaxHpMaxMp(30000, 30000);
         player.updateSingleStat(MapleStat.LEVEL, 255);
         player.updateSingleStat(MapleStat.FAME, 13337);
-        player.updateSingleStat(MapleStat.MAXHP, 30000);
-        player.updateSingleStat(MapleStat.MAXMP, 30000);
         player.yellowMessage("Stats maxed out.");
     }
 }

src/client/command/commands/gm2/MesosCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/ReachCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/RechargeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.MapleCharacter;
 import client.command.Command;

src/client/command/commands/gm2/ResetSkillCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.*;
 import client.command.Command;

src/client/command/commands/gm2/SearchCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/SetStatCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.MapleStat;
 import client.command.Command;
@@ -41,23 +41,13 @@ public class SetStatCommand extends Command {
             return;
         }
 
-        int x;
         try {
-            x = Integer.parseInt(params[0]);
+            int x = Integer.parseInt(params[0]);
 
             if (x > Short.MAX_VALUE) x = Short.MAX_VALUE;
             else if (x < 0) x = 0;
 
-            player.setStr(x);
-            player.setDex(x);
-            player.setInt(x);
-            player.setLuk(x);
-            player.updateSingleStat(MapleStat.STR, x);
-            player.updateSingleStat(MapleStat.DEX, x);
-            player.updateSingleStat(MapleStat.INT, x);
-            player.updateSingleStat(MapleStat.LUK, x);
-
-        } catch (NumberFormatException nfe) {
-        }
+            player.updateStrDexIntLuk(x);
+        } catch (NumberFormatException nfe) {}
     }
 }

src/client/command/commands/gm2/SpCommand.java

@@ -21,9 +21,8 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
@@ -47,8 +46,7 @@ public class SpCommand extends Command {
             if (newSp < 0) newSp = 0;
             else if (newSp > ServerConstants.MAX_AP) newSp = ServerConstants.MAX_AP;
 
-            player.setRemainingSp(newSp);
-            player.updateSingleStat(MapleStat.AVAILABLESP, player.getRemainingSp());
+            player.updateRemainingSp(newSp);
         } else {
             MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
             if (victim != null) {
@@ -56,8 +54,7 @@ public class SpCommand extends Command {
                 if (newSp < 0) newSp = 0;
                 else if (newSp > ServerConstants.MAX_AP) newSp = ServerConstants.MAX_AP;
 
-                victim.setRemainingSp(newSp);
-                victim.updateSingleStat(MapleStat.AVAILABLESP, player.getRemainingSp());
+                victim.updateRemainingSp(newSp);
 
                 player.dropMessage(5, "SP given.");
             } else {

src/client/command/commands/gm2/SummonCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/UnBugCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/UnHideCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.SkillFactory;
 import client.command.Command;

src/client/command/commands/gm2/UnJailCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/WarpCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/WarpToCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm2/WhereaMiCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v2;
+package client.command.commands.gm2;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/BanCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/ChatCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/CheckDmgCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleBuffStat;
 import client.command.Command;

src/client/command/commands/gm3/ClosePortalCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/DebuffCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleDisease;
 import client.command.Command;

src/client/command/commands/gm3/EndEventCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/ExpedsCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/FaceCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleStat;
 import client.command.Command;

src/client/command/commands/gm3/FameCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleStat;
 import client.command.Command;

src/client/command/commands/gm3/FlyCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/GiveMesosCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/GiveNxCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/GiveVpCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/HairCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleStat;
 import client.command.Command;

src/client/command/commands/gm3/HealMapCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleStat;
 import client.command.Command;
@@ -38,10 +38,7 @@ public class HealMapCommand extends Command {
         MapleCharacter player = c.getPlayer();
         for (MapleCharacter mch : player.getMap().getCharacters()) {
             if (mch != null) {
-                mch.setHp(mch.getMaxHp());
-                mch.updateSingleStat(MapleStat.HP, mch.getMaxHp());
-                mch.setMp(mch.getMaxMp());
-                mch.updateSingleStat(MapleStat.MP, mch.getMaxMp());
+                mch.healHpMp();
             }
         }
     }

src/client/command/commands/gm3/HealPersonCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.MapleStat;
 import client.command.Command;
@@ -38,10 +38,7 @@ public class HealPersonCommand extends Command {
         MapleCharacter player = c.getPlayer();
         MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
         if (victim != null) {
-            victim.setHp(victim.getMaxHp());
-            victim.updateSingleStat(MapleStat.HP, victim.getMaxHp());
-            victim.setMp(victim.getMaxMp());
-            victim.updateSingleStat(MapleStat.MP, victim.getMaxMp());
+            victim.healHpMp();
         } else {
             player.message("Player '" + params[0] + "' could not be found on this channel.");
         }

src/client/command/commands/gm3/HpMpCommand.java

@@ -21,9 +21,8 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
@@ -49,12 +48,7 @@ public class HpMpCommand extends Command {
         }
 
         if (victim != null) {
-            victim.setHp(statUpdate);
-            victim.setMp(statUpdate);
-            victim.updateSingleStat(MapleStat.HP, statUpdate);
-            victim.updateSingleStat(MapleStat.MP, statUpdate);
-
-            victim.checkBerserk(victim.isHidden());
+            victim.updateHpMp(statUpdate);
         } else {
             player.message("Player '" + params[0] + "' could not be found on this world.");
         }

src/client/command/commands/gm3/HurtCommand.java

@@ -21,9 +21,8 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
@@ -38,8 +37,7 @@ public class HurtCommand extends Command {
         MapleCharacter player = c.getPlayer();
         MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
         if (victim != null) {
-            victim.setHp(1);
-            victim.updateSingleStat(MapleStat.HP, 1);
+            victim.updateHp(1);
         } else {
             player.message("Player '" + params[0] + "' could not be found on this channel.");
         }

src/client/command/commands/gm3/IdCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/IgnoreCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/IgnoredCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/InMapCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/KillAllCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/KillCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;
@@ -44,7 +44,7 @@ public class KillCommand extends Command {
 
         MapleCharacter victim = c.getChannelServer().getPlayerStorage().getCharacterByName(params[0]);
         if (victim != null) {
-            victim.setHpMp(0);
+            victim.updateHpMp(0);
             Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.serverNotice(5, player.getName() + " used !kill on " + victim.getName()));
         } else {
             player.message("Player '" + params[0] + "' could not be found on this channel.");

src/client/command/commands/gm3/KillMapCommand.java

@@ -21,9 +21,8 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
@@ -37,8 +36,7 @@ public class KillMapCommand extends Command {
     public void execute(MapleClient c, String[] params) {
         MapleCharacter player = c.getPlayer();
         for (MapleCharacter mch : player.getMap().getCharacters()) {
-            mch.setHp(0);
-            mch.updateSingleStat(MapleStat.HP, 0);
+            mch.updateHp(0);
         }
     }
 }

src/client/command/commands/gm3/MaxEnergyCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/MaxHpMpCommand.java

@@ -21,16 +21,11 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
-import client.MapleStat;
 import client.command.Command;
 import client.MapleClient;
 import client.MapleCharacter;
-import java.util.ArrayList;
-import java.util.List;
-import tools.MaplePacketCreator;
-import tools.Pair;
 
 public class MaxHpMpCommand extends Command {
     {
@@ -41,37 +36,25 @@ public class MaxHpMpCommand extends Command {
     public void execute(MapleClient c, String[] params) {
         MapleCharacter player = c.getPlayer();
         MapleCharacter victim = player;
+        
         int statUpdate = 1;
-
         if (params.length >= 2) {
             victim = c.getWorldServer().getPlayerStorage().getCharacterByName(params[0]);
-            statUpdate = Math.max(1, Integer.valueOf(params[1]));
+            statUpdate = Integer.valueOf(params[1]);
         } else if (params.length == 1) {
-            statUpdate = Math.max(1, Integer.valueOf(params[0]));
+            statUpdate = Integer.valueOf(params[0]);
         } else {
             player.yellowMessage("Syntax: !maxhpmp [<playername>] <value>");
         }
-
+        
         if (victim != null) {
-            List<Pair<MapleStat, Integer>> statup = new ArrayList<>(4);
-            
-            if (victim.getHp() > statUpdate) {
-                victim.setHp(statUpdate);
-                statup.add(new Pair<>(MapleStat.HP, statUpdate));
-            }
-            statup.add(new Pair<>(MapleStat.MAXHP, statUpdate));
+            int extraHp = victim.getCurrentMaxHp() - victim.getClientMaxHp();
+            int extraMp = victim.getCurrentMaxMp() - victim.getClientMaxMp();
+            statUpdate = Math.max(1 + Math.max(extraHp, extraMp), statUpdate);
 
-            if (victim.getMp() > statUpdate) {
-                victim.setMp(statUpdate);
-                statup.add(new Pair<>(MapleStat.MP, statUpdate));
-            }
-            statup.add(new Pair<>(MapleStat.MAXMP, statUpdate));
-            c.announce(MaplePacketCreator.updatePlayerStats(statup, victim));
-
-            victim.setMaxHp(statUpdate);
-            victim.setMaxMp(statUpdate);
-
-            victim.checkBerserk(victim.isHidden());
+            int maxhpUpdate = statUpdate - extraHp;
+            int maxmpUpdate = statUpdate - extraMp;
+            victim.updateMaxHpMaxMp(maxhpUpdate, maxmpUpdate);
         } else {
             player.message("Player '" + params[0] + "' could not be found on this world.");
         }

src/client/command/commands/gm3/MonitorCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/MonitorsCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/MusicCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/MuteMapCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/NightCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/NoticeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/NpcCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/OnlineTwoCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/OpenPortalCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/PeCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/PosCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/QuestCompleteCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;

src/client/command/commands/gm3/QuestResetCommand.java

@@ -21,7 +21,7 @@
 /*
    @Author: Arthur L - Refactored command content into modules
 */
-package client.command.commands.v3;
+package client.command.commands.gm3;
 
 import client.command.Command;
 import client.MapleClient;