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.

.gitignore

@@ -23,6 +23,10 @@
 /tools/MapleCouponInstaller/dist/
 /tools/MapleCouponInstaller/nbproject/
 
+/tools/MapleEquipmentOmnileveler/build/
+/tools/MapleEquipmentOmnileveler/dist/
+/tools/MapleEquipmentOmnileveler/nbproject/
+
 /tools/MapleIdRetriever/build/
 /tools/MapleIdRetriever/dist/
 /tools/MapleIdRetriever/nbproject/

README.md

@@ -3,7 +3,7 @@
 
 ## Head developer: Ronan C. P. Lana
 
-Besides myself for maintaining this repository, credits are to be given to Nexon(Duh!), the original MapleSolaxia staff and other colaborators, as just some changes/patches on the game were applied by myself, in which some of them diverged from the original v83 patch contents (alright, not just "some patches" by now since a whole lot of major server core changes have been applied on this development).
+Besides myself for maintaining this repository, credits are to be given to Wizet/Nexon (owners of MapleStory & it's IP contents), the original MapleSolaxia staff and other colaborators, as just some changes/patches on the game were applied by myself, in which some of them diverged from the original v83 patch contents (alright, not just "some patches" by now since a whole lot of major server core changes have been applied on this development).
 
 Regarding distributability and usage of the code presented here: like it was before, this MapleStory server is open-source. By that, it is meant that anyone is **free to install, use, modify and redistribute the contents**, as long as there is **no kind of commercial trading involved** and the **credits to the original creators are maintained** within the codes.
 

docs/feature_list.md

@@ -25,7 +25,7 @@ PQs:
 * HPQ/KPQ/LPQ/LMPQ/OPQ/EllinPQ/PiratePQ/MagatiaPQ/HorntailPQ/AmoriaPQ/TreasurePQ/ElnathPQ/HolidayPQ.
 * CWKPQ as Expedition-based event.
 * Expeditions: Scarga/Horntail/Showa/Balrog/Zakum/Pinkbean.
-* GuildPQ + Guild queue with multi-lobby systems available.
+* GuildPQ + Guild queue with multi-lobby system available.
 * Brand-new PQs: BossRushPQ, CafePQ.
 * Mu Lung Dojo.
 * Capt. Latanica remade as an event (parties can now fight the boss).
@@ -67,6 +67,7 @@ Player Social Network:
 * Further improved the server's ranking system, now displaying properly daily player ranking movement.
 * Automated support for Player NPCs and Hall of Fame.
 * Protected concurrently and improved the face expression system, guarding from trivial packet spam and exploits.
+* All upgradeable non-cash equipments in inventory with level & EXP information available for read by anyone, given proper visibility.
 
 Cash & Items:
 
@@ -98,6 +99,7 @@ Monsters, Maps & Reactors:
 * Mobs now can drop more than one of the same equipment (number of possible drops defined at droptime, uses the minimum/maximum quantity fields on DB).
 * Mobs only drops items that are visible/collectable by the player's party.
 * Redesigned HT mechanics for spawn and linked damage to the sponge.
+* Reviewed aspects of MoveLifeHandler: implemented banish move, patched MP cost not contabilized on non-skill mob moves and slightly fixed mobs dropping from footholds in certain cases.
 * Limited item count on maps, smartly expiring oldest registered items, preventing potential item flooding.
 * Implemented Zombify disease status.
 * Added Boss HP Bar for dozens of bosses (needs provided custom wz).
@@ -113,6 +115,7 @@ Monsters, Maps & Reactors:
 * Reactors pick items up smartly, checking for an option to pick up on many-items-nearby scenario.
 * Updated many scripted portals not implementing SFX properly.
 * Updated Crimsonwood, World Tour, Nihal Desert and Neo City, enabling quest completion and game progression in these areas.
+* Added world maps for Mushroom Castle, World Tour (Singapore, Malaysia and Zipangu) & Ellin Forest areas.
 * Giant Cake (anniversary-themed boss) drops Maple equipments, Maple scrolls, summoning bags and many more interesting items.
 
 PQ potentials:
@@ -122,13 +125,14 @@ PQ potentials:
 * Expedition system - Multiples parties can attempt on a same instance (lobbies and expeds are mutually-exclusive).
 * Guild queue system - Guilds can register themselves on a queue for the GPQ.
 * EIM Pool system - After the first instance setup, next event instances are loaded beforehand and set on a pooling queue, optimizing future loadouts.
+* Recall system - Players can rejoin the last event instance they were in before disconnection.
 
 Player potentials:
 
 * Adventurer Mount quests functional.
 * All Equipment levels up.
 * Player level rates.
-* Gain fame by quests.
+* Gain fame by quests and event instances.
 * Pet evolutions functional (not GMS-like).
 * Reviewed keybinding system.
 * Account's Character slots: either each world has it's own count or there's a shared value between all worlds.
@@ -145,6 +149,7 @@ Server potentials:
 * Enhanced AP auto-assigner: exactly matches AP with the needed for the player's current level, surplus assigned to the primary attribute.
 * Enhanced inventory check: free slots on inventory smartly fetched on demand.
 * Enhanced auto-loot handler: optimized the brute-force checks for some cash items on the player equipped inventory at every requisition.
+* Added players-appointed bestsellers item ranking system for Owl of Minerva and Cash Shop.
 * Tweaked pet/mount hunger: calculations for fullness/tiredness takes active time of the subject into account.
 * Consistent experience and meso gain system.
 * NPC crafters (equips, plates/jewels, etc) now won't take items freely if the requirement conditions are not properly met.
@@ -191,6 +196,7 @@ External tools:
 * MapleBossHpBarFetcher - Searches the quest WZ files and reports in all relevant data regarding mobs that has a boss HP bar whilst not having a proper "boss" label.
 * MapleCashDropFetcher - Searches the DB for any CASH drop data entry and lists them on a report file.
 * MapleCouponInstaller - Retrieves coupon info from the WZ and makes a SQL table with it. The server will use that table to gather info regarding rates and intervals.
+* MapleEquipmentOmnileveler - Updates the equipment WZ nodes with item level information, allowing thus access for item level and EXP info for common equipments.
 * MapleIdRetriever - Two behaviors: generates a SQL table with relation (id, name) of the handbook given as input. Given a file with names, outputs a file with ids.
 * MapleInvalidItemIdFetcher - Generates a file listing all inexistent itemid's currently laying on the DB.
 * MapleInvalidItemWithNoNameFetcher - Generates two files: one listing all itemid's with inexistent name and "cash" property. And other with a prepared XML to solve the name issue.

docs/mychanges_ptbr.txt

@@ -1293,3 +1293,35 @@ Adicionado world map em Ellin Forest.
 Protegido concorrentemente sistema de fames.
 Adicionado ganho de quest points para jogadores que participam de PQs. Reformulado sistema de quest points para viabilizar a nova feature.
 Otimizado método de ganho de experiência em equipamentos, agora devidamente cacheado e sem busca em strings no processo.
+
+08 Agosto 2018,
+MapleServerHandler agora é devidamente deregistrado ao finalizar uma instância de channel, eliminando possível foco de memory leak.
+Funções playerDead e playerRevive são agora opcionais em EIM scripts.
+Nova ferramenta: MapleEquipmentOmnileveler. Permite adicionar e atualizar nodos referentes a níveis para todos os equipamentos. Em jogo, essa adição permite jogadores a ver nível de qualquer equipamento do jogo.
+
+09 - 10 Agosto 2018,
+Adicionado cálculo de MP ao realizar ataques de mobs.
+Aplicado vários pequenos ajustes no handler que lida com movimentação de mobs, procurando assim reduzir ruidos no fluxo do jogo (e.g. mob caindo de foothold).
+Corrigido schedules de event instances sendo chamados após finalização da mesma, levando locks já liberados a serem chamados inesperadamente.
+Corrigido casos onde jogadores poderiam requisitar instanciação de uma nova PQ, cujo EM que já tenha sido liberado.
+Aplicado reformatação geral no Character.wz, adicionando nodos de level para todos os equipamentos do jogo. Tal mudança permite que todos os equipamentos exponham nível e experiência em todos os equipamentos no inventário.
+Implementado cálculo de experiência no lado do servidor que permite mostrar adequadamente EXP dos equipamentos no lado do cliente.
+
+11 - 19 Agosto 2018,
+Corrigido MP Recovery skill não atuando segundo descrição, além de matando jogador com pouco HP disponível.
+Refatorado completamente acessos de stats no código do server.
+Refatorado check de Berserk sendo chamado em múltiplas seções do código.
+Corrigido algumas cadeiras levando jogadores a desconectarem aleatoriamente.
+Corrigido puppets ficando no mapa indeterminadamente em certos cenários.
+Acrescentado proteção contra acesso concorrente em ganhos de EXP em equipamentos.
+Door bosses (Marbas, Crocell, etc) agora spawnam de tempos em tempos, ao invés de serem chamados ao entrar no mapa.
+Retrabalhado Chair Mastery, agora com cura atuando em porcentagem de HP/MP base.
+Corrigido problema de deadlock com inventário de jogadores e EXP/DROP coupons.
+Corrigido problema de deadlock com pickup de mesos e detecção de jogadores em party.
+Corrigido problema de deadlock com o handler de pet autopot.
+Melhorado desempenho do autopot handler.
+Corrigido diversos aspectos do novo modelo de acesso de stats, agora propriamente protegido contra acesso concorrente.
+Revitalizers de mounts são devidamente consumidos mesmo em casos mount tiredness seja zero.
+Corrigido alliances retendo informações de guilds que foram desfeitas na DB.
+Corrigido alliances não salvando nomes de ranks na DB ao serem criadas.
+Adicionado suporte para doors na região de Mushroom Castle.

scripts/event/AreaBossDoor1.js

@@ -0,0 +1,57 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+-- Odin JavaScript --------------------------------------------------------------------------------
+	Door boss Spawner (based on xQuasar's King Clang spawner)
+**/
+
+function init() {
+    scheduleNew();
+}
+
+function scheduleNew() {
+    setupTask = em.schedule("start", 0);    //spawns upon server start. Each 3 hours an server event checks if boss exists, if not spawns it instantly.
+}
+
+function cancelSchedule() {
+    if (setupTask != null)
+        setupTask.cancel(true);
+}
+
+function start() {
+    var bossMobid = 9400610;
+    var bossMapid = 677000003;
+    var bossMsg = "Amdusias has appeared!";
+    var bossPos = new Packages.java.awt.Point(467, 0);
+    
+    var map = em.getChannelServer().getMapFactory().getMap(bossMapid);
+    if (map.getMonsterById(bossMobid) != null) {
+        em.schedule("start", 3 * 60 * 60 * 1000);
+        return;
+    }
+    
+    var boss = Packages.server.life.MapleLifeFactory.getMonster(bossMobid);
+    map.spawnMonsterOnGroundBelow(boss, bossPos);
+    map.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, bossMsg));
+    
+    em.schedule("start", 3 * 60 * 60 * 1000);
+}

scripts/event/AreaBossDoor2.js

@@ -0,0 +1,57 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+-- Odin JavaScript --------------------------------------------------------------------------------
+	Door boss Spawner (based on xQuasar's King Clang spawner)
+**/
+
+function init() {
+    scheduleNew();
+}
+
+function scheduleNew() {
+    setupTask = em.schedule("start", 0);    //spawns upon server start. Each 3 hours an server event checks if boss exists, if not spawns it instantly.
+}
+
+function cancelSchedule() {
+    if (setupTask != null)
+        setupTask.cancel(true);
+}
+
+function start() {
+    var bossMobid = 9400609;
+    var bossMapid = 677000005;
+    var bossMsg = "Andras has appeared!";
+    var bossPos = new Packages.java.awt.Point(201, 80);
+    
+    var map = em.getChannelServer().getMapFactory().getMap(bossMapid);
+    if (map.getMonsterById(bossMobid) != null) {
+        em.schedule("start", 3 * 60 * 60 * 1000);
+        return;
+    }
+    
+    var boss = Packages.server.life.MapleLifeFactory.getMonster(bossMobid);
+    map.spawnMonsterOnGroundBelow(boss, bossPos);
+    map.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, bossMsg));
+    
+    em.schedule("start", 3 * 60 * 60 * 1000);
+}

scripts/event/AreaBossDoor3.js

@@ -0,0 +1,57 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+-- Odin JavaScript --------------------------------------------------------------------------------
+	Door boss Spawner (based on xQuasar's King Clang spawner)
+**/
+
+function init() {
+    scheduleNew();
+}
+
+function scheduleNew() {
+    setupTask = em.schedule("start", 0);    //spawns upon server start. Each 3 hours an server event checks if boss exists, if not spawns it instantly.
+}
+
+function cancelSchedule() {
+    if (setupTask != null)
+        setupTask.cancel(true);
+}
+
+function start() {
+    var bossMobid = 9400613;
+    var bossMapid = 677000009;
+    var bossMsg = "Valefor has appeared!";
+    var bossPos = new Packages.java.awt.Point(251, -841);
+    
+    var map = em.getChannelServer().getMapFactory().getMap(bossMapid);
+    if (map.getMonsterById(bossMobid) != null) {
+        em.schedule("start", 3 * 60 * 60 * 1000);
+        return;
+    }
+    
+    var boss = Packages.server.life.MapleLifeFactory.getMonster(bossMobid);
+    map.spawnMonsterOnGroundBelow(boss, bossPos);
+    map.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, bossMsg));
+    
+    em.schedule("start", 3 * 60 * 60 * 1000);
+}

scripts/event/AreaBossDoor4.js

@@ -0,0 +1,57 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+-- Odin JavaScript --------------------------------------------------------------------------------
+	Door boss Spawner (based on xQuasar's King Clang spawner)
+**/
+
+function init() {
+    scheduleNew();
+}
+
+function scheduleNew() {
+    setupTask = em.schedule("start", 0);    //spawns upon server start. Each 3 hours an server event checks if boss exists, if not spawns it instantly.
+}
+
+function cancelSchedule() {
+    if (setupTask != null)
+        setupTask.cancel(true);
+}
+
+function start() {
+    var bossMobid = 9400633;
+    var bossMapid = 677000012;
+    var bossMsg = "Astaroth has appeared!";
+    var bossPos = new Packages.java.awt.Point(842, 0);
+    
+    var map = em.getChannelServer().getMapFactory().getMap(bossMapid);
+    if (map.getMonsterById(bossMobid) != null) {
+        em.schedule("start", 3 * 60 * 60 * 1000);
+        return;
+    }
+    
+    var boss = Packages.server.life.MapleLifeFactory.getMonster(bossMobid);
+    map.spawnMonsterOnGroundBelow(boss, bossPos);
+    map.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, bossMsg));
+    
+    em.schedule("start", 3 * 60 * 60 * 1000);
+}

scripts/event/AreaBossDoor5.js

@@ -0,0 +1,57 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+-- Odin JavaScript --------------------------------------------------------------------------------
+	Door boss Spawner (based on xQuasar's King Clang spawner)
+**/
+
+function init() {
+    scheduleNew();
+}
+
+function scheduleNew() {
+    setupTask = em.schedule("start", 0);    //spawns upon server start. Each 3 hours an server event checks if boss exists, if not spawns it instantly.
+}
+
+function cancelSchedule() {
+    if (setupTask != null)
+        setupTask.cancel(true);
+}
+
+function start() {
+    var bossMobid = 9400612;
+    var bossMapid = 677000001;
+    var bossMsg = "Marbas has appeared!";
+    var bossPos = new Packages.java.awt.Point(461, 61);
+    
+    var map = em.getChannelServer().getMapFactory().getMap(bossMapid);
+    if (map.getMonsterById(bossMobid) != null) {
+        em.schedule("start", 3 * 60 * 60 * 1000);
+        return;
+    }
+    
+    var boss = Packages.server.life.MapleLifeFactory.getMonster(bossMobid);
+    map.spawnMonsterOnGroundBelow(boss, bossPos);
+    map.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, bossMsg));
+    
+    em.schedule("start", 3 * 60 * 60 * 1000);
+}

scripts/event/AreaBossDoor6.js

@@ -0,0 +1,57 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <[email protected]>
+		       Matthias Butz <[email protected]>
+		       Jan Christian Meyer <[email protected]>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+-- Odin JavaScript --------------------------------------------------------------------------------
+	Door boss Spawner (based on xQuasar's King Clang spawner)
+**/
+
+function init() {
+    scheduleNew();
+}
+
+function scheduleNew() {
+    setupTask = em.schedule("start", 0);    //spawns upon server start. Each 3 hours an server event checks if boss exists, if not spawns it instantly.
+}
+
+function cancelSchedule() {
+    if (setupTask != null)
+        setupTask.cancel(true);
+}
+
+function start() {
+    var bossMobid = 9400611;
+    var bossMapid = 677000007;
+    var bossMsg = "Crocell has appeared!";
+    var bossPos = new Packages.java.awt.Point(171, 50);
+    
+    var map = em.getChannelServer().getMapFactory().getMap(bossMapid);
+    if (map.getMonsterById(bossMobid) != null) {
+        em.schedule("start", 3 * 60 * 60 * 1000);
+        return;
+    }
+    
+    var boss = Packages.server.life.MapleLifeFactory.getMonster(bossMobid);
+    map.spawnMonsterOnGroundBelow(boss, bossPos);
+    map.broadcastMessage(Packages.tools.MaplePacketCreator.serverNotice(6, bossMsg));
+    
+    em.schedule("start", 3 * 60 * 60 * 1000);
+}

scripts/event/Cygnus_Magic_Library.js

@@ -40,10 +40,7 @@ function scheduledTimeout(eim){
 }
 
 function playerRevive(eim, player){
-	player.setHp(50);
-	player.setStance(0);
-	eim.unregisterPlayer(player);
-	player.changeMap(entryMap);
+        player.respawn(eim, entryMap);
 	return false;
 }
 

scripts/event/GuardianNex.js

@@ -36,10 +36,7 @@ function scheduledTimeout(eim){
 }
 
 function playerRevive(eim, player){
-	player.setHp(50);
-	player.setStance(0);
-	eim.unregisterPlayer(player);
-	player.changeMap(exitMap);
+	player.respawn(eim, exitMap);
 	return false;
 }
 

scripts/event/GuildQuest.js

@@ -254,16 +254,11 @@ function playerDead(eim, player) {
 function playerRevive(eim, player) { // player presses ok on the death pop up.
         if(eim.getIntProperty("canRevive") == 0) {
                 if (eim.isEventTeamLackingNow(true, minPlayers, player) && eim.getIntProperty("canJoin") == 0) {
-                        eim.unregisterPlayer(player);
-                        player.setHp(50);
-                        player.changeMap(exitMap);
-                        
+                        player.respawn(eim, exitMap);
                         end(eim);
                 }
                 else {
-                        eim.unregisterPlayer(player);
-                        player.setHp(50);
-                        player.changeMap(exitMap);
+                        player.respawn(eim, exitMap);
                 }
                 
                 return false;

scripts/event/MK_PrimeMinister.js

@@ -39,10 +39,7 @@ function scheduledTimeout(eim){
 }
 
 function playerRevive(eim, player){
-	player.setHp(50);
-	player.setStance(0);
-	eim.unregisterPlayer(player);
-	player.changeMap(entryMap);
+	player.respawn(eim, entryMap);
 	return false;
 }
 

scripts/event/MK_PrimeMinister2.js

@@ -50,10 +50,7 @@ function scheduledTimeout(eim){
 }
 
 function playerRevive(eim, player){
-	player.setHp(50);
-	player.setStance(0);
-	eim.unregisterPlayer(player);
-	player.changeMap(entryMap);
+	player.respawn(eim, entryMap);
 	return false;
 }
 

scripts/event/Puppeteer.js

@@ -34,10 +34,7 @@ function scheduledTimeout(eim){
 }
 
 function playerRevive(eim, player){
-	player.setHp(50);
-	player.setStance(0);
-	eim.unregisterPlayer(player);
-	player.changeMap(exitMap);
+	player.respawn(eim, exitMap);
 	return false;
 }
 

scripts/event/RockSpirit.js

@@ -61,10 +61,7 @@ function playerEntry(eim, player) {
 }
 
 function playerRevive(eim, player) {
-    player.setHp(50);
-    player.setStance(0);
-    eim.unregisterPlayer(player);
-    player.changeMap(exitMap);
+    player.respawn(eim, exitMap);
     return false;
 }
 
@@ -136,9 +133,9 @@ function timeOut(eim) {
         if (eim.getPlayerCount() > 0) {
             var pIter = eim.getPlayers().iterator();
             while (pIter.hasNext()){
-				var player = pIter.next();
+                var player = pIter.next();
                 playerExit(eim, player);
-			}
+            }
         }
         eim.dispose();
     }

scripts/event/RockSpiritVIP.js

@@ -57,14 +57,11 @@ function respawn(eim) {
 function playerEntry(eim, player) {
 	var amplifierMap = eim.getMapInstance(startMap.getId());
 	player.changeMap(amplifierMap);
-    eim.schedule("timeOut", timer);
+        eim.schedule("timeOut", timer);
 }
 
 function playerRevive(eim, player) {
-    player.setHp(50);
-    player.setStance(0);
-    eim.unregisterPlayer(player);
-    player.changeMap(exitMap);
+    player.respawn(eim, exitMap);
     return false;
 }
 
@@ -136,9 +133,9 @@ function timeOut(eim) {
         if (eim.getPlayerCount() > 0) {
             var pIter = eim.getPlayers().iterator();
             while (pIter.hasNext()){
-				var player = pIter.next();
+                var player = pIter.next();
                 playerExit(eim, player);
-			}
+            }
         }
         eim.dispose();
     }

scripts/npc/9977777.js

@@ -81,6 +81,7 @@ function writeFeatureTab_PlayerSocialNetwork() {
         addFeature("Protected and improved face expression system.");
         addFeature("Automated support for Player NPCs and Hall of Fame.");
         addFeature("Engagement & Wedding system.");
+        addFeature("Equipments displays to everyone it's level & EXP info.");
 }
 
 function writeFeatureTab_CashItems() {
@@ -112,6 +113,9 @@ function writeFeatureTab_MonstersMapsReactors() {
         addFeature("Every skill/mastery book is now obtainable.");
         addFeature("Mobs now can drop more than one of the same equip.");
         addFeature("Mobs only drop items collectable by the player/party.");
+        addFeature("Mobs shouldn't fall from foothold too often now.");
+        addFeature("Properly applying MP cost on non-skill mob moves.");
+        addFeature("Implemented banish mob skill move.");
         addFeature("Redesigned HT mechanics: assemble & dmg taken.");
         addFeature("Implemented Zombify disease status.");
         addFeature("Added Boss HP Bar for dozens of bosses.");
@@ -126,7 +130,7 @@ function writeFeatureTab_MonstersMapsReactors() {
         addFeature("Uncovered missing portal SFX on scripted portals.");
         addFeature("PQ boxes sprays items when opened, GMS-like.");
         addFeature("Reactors pick items up smartly from the field.");
-        addFeature("Updated scripted portals now with proper portal SFX.");
+        addFeature("Updated scripted portals, now with proper portal SFX.");
         addFeature("Reviewed Masteria, W. Tour, N. Desert and Neo City.");
         addFeature("Added world maps for M. Castle, W. Tour & Ellin areas.");
         addFeature("Giant Cake boss drops s. bags and Maple items.");
@@ -232,6 +236,7 @@ function writeFeatureTab_Project() {
         addFeature("Developed many survey tools for content profiling.");
         addFeature("ThreadTracker: runtime tool for deadlock detection.");
         addFeature("Channel, World and Server-wide timer management.");
+        addFeature("Thoroughly reviewed encapsulation for player stats.");
         addFeature("Heavily reviewed future task management, spawning much less threads and relieving task overload on the TimerManager.");
 }
 

scripts/quest/1021.js

@@ -49,9 +49,8 @@ function start(mode, type, selection) {
         else if (status == 2)
             qm.sendAcceptDecline("So..... Let me just do this for fun! Abaracadabra~!");
         else if (status == 3) {
-            if (qm.c.getPlayer().getHp() >= 50) {
-                qm.c.getPlayer().setHp(25);
-                qm.c.getPlayer().updateSingleStat(MapleStat.HP, 25);
+            if (qm.getPlayer().getHp() >= 50) {
+                qm.getPlayer().updateHp(25);
             }
             
             if (!qm.haveItem(2010007)) {

scripts/quest/21010.js

@@ -46,9 +46,8 @@ function start(mode, type, selection) {
     } else if (status == 3) { 
 	qm.sendAcceptDecline("Oh, but it seems our hero has become very weak since the Black Mage's curse. It's only makes sense, considering that the hero has been asleep for hundreds of years. #bHere, I'll give you a HP Recovery Potion.#k");//nexon probably forgot to remove the '.' before '#k', lol	
     } else if (status == 4) {
-       	if (qm.c.getPlayer().getHp() >= 50) {
-            	qm.c.getPlayer().setHp(25);
-            	qm.c.getPlayer().updateSingleStat(MapleStat.HP, 25);
+       	if (qm.getPlayer().getHp() >= 50) {
+            	qm.getPlayer().updateHp(25);
         } 
 	if (!qm.isQuestStarted(21010) && !qm.isQuestCompleted(21010)) {
         	qm.gainItem(2000022, 1);
@@ -60,7 +59,7 @@ function start(mode, type, selection) {
     } else if (status == 6) {	
 	qm.guideHint(14);
         qm.dispose();
-	}	
+    }	
 }
 
 function end(mode, type, selection) {

sql/db_database.sql

@@ -55,11 +55,11 @@ CREATE TABLE IF NOT EXISTS `alliance` (
   `capacity` int(10) unsigned NOT NULL DEFAULT '2',
   `notice` varchar(20) NOT NULL DEFAULT '',
 
-  `rank1` varchar(11) NOT NULL DEFAULT '',
-  `rank2` varchar(11) NOT NULL DEFAULT '',
-  `rank3` varchar(11) NOT NULL DEFAULT '',
-  `rank4` varchar(11) NOT NULL DEFAULT '',
-  `rank5` varchar(11) NOT NULL DEFAULT '',
+  `rank1` varchar(11) NOT NULL DEFAULT 'Master',
+  `rank2` varchar(11) NOT NULL DEFAULT 'Jr. Master',
+  `rank3` varchar(11) NOT NULL DEFAULT 'Member',
+  `rank4` varchar(11) NOT NULL DEFAULT 'Member',
+  `rank5` varchar(11) NOT NULL DEFAULT 'Member',
   PRIMARY KEY (`id`),
   INDEX (name)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;

src/client/AbstractCharacterListener.java

@@ -0,0 +1,30 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2018 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package client;
+
+/**
+ *
+ * @author Ronan
+ */
+public interface AbstractCharacterListener {
+    public void onHpChanged(int oldHp);
+    public void onHpmpPoolUpdate();
+    public void onAnnounceStatPoolUpdate();
+}

src/client/AbstractMapleCharacterObject.java

@@ -0,0 +1,712 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2018 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package client;
+
+import constants.GameConstants;
+import constants.ServerConstants;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+import net.server.audit.locks.MonitoredLockType;
+import net.server.audit.locks.MonitoredReentrantReadWriteLock;
+import net.server.audit.locks.factory.MonitoredReentrantLockFactory;
+import server.maps.AbstractAnimatedMapleMapObject;
+
+/**
+ *
+ * @author RonanLana
+ */
+public abstract class AbstractMapleCharacterObject extends AbstractAnimatedMapleMapObject {
+    protected int str, dex, luk, int_, hp, maxhp, mp, maxmp;
+    protected int hpMpApUsed, remainingAp;
+    protected int[] remainingSp = new int[10];
+    protected transient int clientmaxhp, clientmaxmp, localmaxhp = 50, localmaxmp = 5;
+    
+    private AbstractCharacterListener listener = null;
+    protected Map<MapleStat, Integer> statUpdates = new HashMap<>();
+    
+    protected Lock effLock = MonitoredReentrantLockFactory.createLock(MonitoredLockType.CHARACTER_EFF, true);
+    protected ReadLock statRlock;
+    protected WriteLock statWlock;
+    
+    protected AbstractMapleCharacterObject() {
+        ReentrantReadWriteLock locks = new MonitoredReentrantReadWriteLock(MonitoredLockType.CHARACTER_STA, true);
+        statRlock = locks.readLock();
+        statWlock = locks.writeLock();
+        
+        for (int i = 0; i < remainingSp.length; i++) {
+            remainingSp[i] = 0;
+        }
+    }
+    
+    protected void setListener(AbstractCharacterListener listener) {
+        this.listener = listener;
+    }
+    
+    public int getStr() {
+        statRlock.lock();
+        try {
+            return str;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getDex() {
+        statRlock.lock();
+        try {
+            return dex;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getInt() {
+        statRlock.lock();
+        try {
+            return int_;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+
+    public int getLuk() {
+        statRlock.lock();
+        try {
+            return luk;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getRemainingAp() {
+        statRlock.lock();
+        try {
+            return remainingAp;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    protected int getRemainingSp(int jobid) {
+        statRlock.lock();
+        try {
+            return remainingSp[GameConstants.getSkillBook(jobid)];
+        } finally {
+            statRlock.unlock();
+        }
+    }
+
+    public int[] getRemainingSps() {
+        statRlock.lock();
+        try {
+            return Arrays.copyOf(remainingSp, remainingSp.length);
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getHpMpApUsed() {
+        statRlock.lock();
+        try {
+            return hpMpApUsed;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public boolean isAlive() {
+        statRlock.lock();
+        try {
+            return hp > 0;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getHp() {
+        statRlock.lock();
+        try {
+            return hp;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getMp() {
+        statRlock.lock();
+        try {
+            return mp;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getMaxHp() {
+        statRlock.lock();
+        try {
+            return maxhp;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getMaxMp() {
+        statRlock.lock();
+        try {
+            return maxmp;
+        } finally {
+            statRlock.unlock();
+        }
+    }
+    
+    public int getClientMaxHp() {
+        return clientmaxhp;
+    }
+    
+    public int getClientMaxMp() {
+        return clientmaxmp;
+    }
+    
+    public int getCurrentMaxHp() {
+        return localmaxhp;
+    }
+
+    public int getCurrentMaxMp() {
+        return localmaxmp;
+    }
+    
+    private void setHpMpApUsed(int mpApUsed) {
+        this.hpMpApUsed = mpApUsed;
+    }
+    
+    private void dispatchHpChanged(int oldHp) {
+        listener.onHpChanged(oldHp);
+    }
+    
+    private void dispatchHpmpPoolUpdated() {
+        listener.onHpmpPoolUpdate();
+    }
+    
+    private void dispatchStatPoolUpdateAnnounced() {
+        listener.onAnnounceStatPoolUpdate();
+    }
+    
+    protected void setHp(int newHp) {
+        int oldHp = hp;
+        
+        int thp = newHp;
+        if (thp < 0) {
+            thp = 0;
+        } else if (thp > localmaxhp) {
+            thp = localmaxhp;
+        }
+        this.hp = thp;
+        
+        dispatchHpChanged(oldHp);
+    }
+
+    protected void setMp(int newMp) {
+        int tmp = newMp;
+        if (tmp < 0) {
+            tmp = 0;
+        } else if (tmp > localmaxmp) {
+            tmp = localmaxmp;
+        }
+        this.mp = tmp;
+    }
+    
+    private void setRemainingAp(int remainingAp) {
+        this.remainingAp = remainingAp;
+    }
+    
+    private void setRemainingSp(int remainingSp, int skillbook) {
+        this.remainingSp[skillbook] = remainingSp;
+    }
+    
+    protected void setMaxHp(int hp_) {
+        this.maxhp = hp_;
+        this.clientmaxhp = Math.min(30000, hp_);
+    }
+    
+    protected void setMaxMp(int mp_) {
+        this.maxmp = mp_;
+        this.clientmaxmp = Math.min(30000, mp_);
+    }
+    
+    private static long calcStatPoolNode(long v, int displacement) {
+        if (v > Short.MAX_VALUE) {
+            v = Short.MAX_VALUE;
+        } else if (v < Short.MIN_VALUE) {
+            v = Short.MIN_VALUE;
+        }
+        
+        return ((v & 0x0FFFF) << displacement);
+    }
+    
+    private static long calcStatPoolLong(int v1, int v2, int v3, int v4) {
+        long ret = 0;
+        
+        ret |= calcStatPoolNode(v1, 48);
+        ret |= calcStatPoolNode(v2, 32);
+        ret |= calcStatPoolNode(v3, 16);
+        ret |= calcStatPoolNode(v4, 0);
+        
+        return ret;
+    }
+    
+    private void changeStatPool(Long hpMpPool, Long strDexIntLuk, Long newSp, int newAp, boolean silent) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            statUpdates.clear();
+            boolean poolUpdate = false;
+
+            if (hpMpPool != null) {
+                short newHp = (short) (hpMpPool >> 48);
+                short newMp = (short) (hpMpPool >> 32);
+                short newMaxHp = (short) (hpMpPool >> 16);
+                short newMaxMp = (short) (hpMpPool.shortValue());
+                
+                if (newMaxHp != Short.MIN_VALUE) {
+                    if (newMaxHp < 50) {
+                        newMaxHp = 50;
+                    }
+
+                    poolUpdate = true;
+                    setMaxHp(newMaxHp);
+                    statUpdates.put(MapleStat.MAXHP, clientmaxhp);
+                    statUpdates.put(MapleStat.HP, hp);
+                }
+
+                if (newHp != Short.MIN_VALUE) {
+                    setHp(newHp);
+                    statUpdates.put(MapleStat.HP, hp);
+                }
+
+                if (newMaxMp != Short.MIN_VALUE) {
+                    if (newMaxMp < 5) {
+                        newMaxMp = 5;
+                    }
+
+                    poolUpdate = true;
+                    setMaxMp(newMaxMp);
+                    statUpdates.put(MapleStat.MAXMP, clientmaxmp);
+                    statUpdates.put(MapleStat.MP, mp);
+                }
+
+                if (newMp != Short.MIN_VALUE) {
+                    setMp(newMp);
+                    statUpdates.put(MapleStat.MP, mp);
+                }
+            }
+
+            if (strDexIntLuk != null) {
+                short newStr = (short) (strDexIntLuk >> 48);
+                short newDex = (short) (strDexIntLuk >> 32);
+                short newInt = (short) (strDexIntLuk >> 16);
+                short newLuk = (short) (strDexIntLuk.shortValue());
+
+                if (newStr >= 4) {
+                    setStr(newStr);
+                    statUpdates.put(MapleStat.STR, str);
+                }
+
+                if (newDex >= 4) {
+                    setDex(newDex);
+                    statUpdates.put(MapleStat.DEX, dex);
+                }
+
+                if (newInt >= 4) {
+                    setInt(newInt);
+                    statUpdates.put(MapleStat.INT, int_);
+                }
+
+                if (newLuk >= 4) {
+                    setLuk(newLuk);
+                    statUpdates.put(MapleStat.LUK, luk);
+                }
+
+                if (newAp >= 0) {
+                    setRemainingAp(newAp);
+                    statUpdates.put(MapleStat.AVAILABLEAP, remainingAp);
+                }
+
+                poolUpdate = true;  // recalc stats
+            }
+            
+            if (newSp != null) {
+                short sp = (short) (newSp >> 16);
+                short skillbook = (short) (newSp.shortValue());
+                
+                setRemainingSp(sp, skillbook);
+                statUpdates.put(MapleStat.AVAILABLESP, remainingSp[skillbook]);
+            }
+
+            if (!statUpdates.isEmpty()) {
+                if (poolUpdate) {
+                    dispatchHpmpPoolUpdated();
+                }
+
+                if (!silent) {
+                    dispatchStatPoolUpdateAnnounced();
+                }
+            }
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void healHpMp() {
+        updateHpMp(30000);
+    }
+    
+    public void updateHpMp(int x) {
+        updateHpMp(x, x);
+    }
+    
+    public void updateHpMp(int newhp, int newmp) {
+        changeHpMp(newhp, newmp, false);
+    }
+    
+    protected void changeHpMp(int newhp, int newmp, boolean silent) {
+        changeHpMpPool(newhp, newmp, Short.MIN_VALUE, Short.MIN_VALUE, silent);
+    }
+    
+    private void changeHpMpPool(int hp, int mp, int maxhp, int maxmp, boolean silent) {
+        long hpMpPool = calcStatPoolLong(hp, mp, maxhp, maxmp);
+        changeStatPool(hpMpPool, null, null, -1, silent);
+    }
+    
+    public void updateHp(int hp) {
+        updateHpMaxHp(hp, Short.MIN_VALUE);
+    }
+    
+    public void updateMaxHp(int maxhp) {
+        updateHpMaxHp(Short.MIN_VALUE, maxhp);
+    }
+    
+    public void updateHpMaxHp(int hp, int maxhp) {
+        changeHpMpPool(hp, Short.MIN_VALUE, maxhp, Short.MIN_VALUE, false);
+    }
+    
+    public void updateMp(int mp) {
+        updateMpMaxMp(mp, Short.MIN_VALUE);
+    }
+    
+    public void updateMaxMp(int maxmp) {
+        updateMpMaxMp(Short.MIN_VALUE, maxmp);
+    }
+    
+    public void updateMpMaxMp(int mp, int maxmp) {
+        changeHpMpPool(Short.MIN_VALUE, mp, Short.MIN_VALUE, maxmp, false);
+    }
+    
+    public void updateMaxHpMaxMp(int maxhp, int maxmp) {
+        changeHpMpPool(Short.MIN_VALUE, Short.MIN_VALUE, maxhp, maxmp, false);
+    }
+    
+    protected void enforceMaxHpMp() {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            if (mp > localmaxmp || hp > localmaxhp) {
+                changeHpMp(hp, mp, false);
+            }
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public int safeAddHP(int delta) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            if (hp + delta <= 0) {
+                delta = -hp + 1;
+            }
+
+            addHP(delta);
+            return delta;
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void addHP(int delta) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            updateHp(hp + delta);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void addMP(int delta) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            updateMp(mp + delta);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+
+    public void addMPHP(int hpDelta, int mpDelta) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            updateHpMp(hp + hpDelta, mp + mpDelta);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    protected void addMaxMPMaxHP(int hpdelta, int mpdelta, boolean silent) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            changeHpMpPool(Short.MIN_VALUE, Short.MIN_VALUE, maxhp + hpdelta, maxmp + mpdelta, silent);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void addMaxHP(int delta) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            updateMaxHp(maxhp + delta);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void addMaxMP(int delta) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            updateMaxMp(maxmp + delta);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    private void setStr(int str) {
+        this.str = str;
+    }
+    
+    private void setDex(int dex) {
+        this.dex = dex;
+    }
+    
+    private void setInt(int int_) {
+        this.int_ = int_;
+    }
+    
+    private void setLuk(int luk) {
+        this.luk = luk;
+    }
+    
+    public boolean assignStr(int x) {
+        return assignStrDexIntLuk(x, Short.MIN_VALUE, Short.MIN_VALUE, Short.MIN_VALUE);
+    }
+    
+    public boolean assignDex(int x) {
+        return assignStrDexIntLuk(Short.MIN_VALUE, x, Short.MIN_VALUE, Short.MIN_VALUE);
+    }
+    
+    public boolean assignInt(int x) {
+        return assignStrDexIntLuk(Short.MIN_VALUE, Short.MIN_VALUE, x, Short.MIN_VALUE);
+    }
+    
+    public boolean assignLuk(int x) {
+        return assignStrDexIntLuk(Short.MIN_VALUE, Short.MIN_VALUE, Short.MIN_VALUE, x);
+    }
+    
+    public boolean assignHP(int deltaHP, int deltaAp) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            if (remainingAp - deltaAp < 0 || hpMpApUsed + deltaAp < 0 || maxhp >= 30000) {
+                return false;
+            }
+            
+            long hpMpPool = calcStatPoolLong(Short.MIN_VALUE, Short.MIN_VALUE, maxhp + deltaHP, maxmp);
+            long strDexIntLuk = calcStatPoolLong(str, dex, int_, luk);
+
+            changeStatPool(hpMpPool, strDexIntLuk, null, remainingAp - deltaAp, false);
+            setHpMpApUsed(hpMpApUsed + deltaAp);
+            return true;
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public boolean assignMP(int deltaMP, int deltaAp) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            if (remainingAp - deltaAp < 0 || hpMpApUsed + deltaAp < 0 || maxmp >= 30000) {
+                return false;
+            }
+
+            long hpMpPool = calcStatPoolLong(Short.MIN_VALUE, Short.MIN_VALUE, maxhp, maxmp + deltaMP);
+            long strDexIntLuk = calcStatPoolLong(str, dex, int_, luk);
+
+            changeStatPool(hpMpPool, strDexIntLuk, null, remainingAp - deltaAp, false);
+            setHpMpApUsed(hpMpApUsed + deltaAp);
+            return true;
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    private static int apAssigned(int x) {
+        return x != Short.MIN_VALUE ? x : 0;
+    }
+    
+    public boolean assignStrDexIntLuk(int deltaStr, int deltaDex, int deltaInt, int deltaLuk) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            int apUsed = apAssigned(deltaStr) + apAssigned(deltaDex) + apAssigned(deltaInt) + apAssigned(deltaLuk);
+            if (apUsed > remainingAp) {
+                return false;
+            }
+
+            int newStr = str + deltaStr, newDex = dex + deltaDex, newInt = int_ + deltaInt, newLuk = luk + deltaLuk;
+            if (newStr < 4 && deltaStr != Short.MIN_VALUE || newStr > ServerConstants.MAX_AP) {
+                return false;
+            }
+
+            if (newDex < 4 && deltaDex != Short.MIN_VALUE || newDex > ServerConstants.MAX_AP) {
+                return false;
+            }
+
+            if (newInt < 4 && deltaInt != Short.MIN_VALUE || newInt > ServerConstants.MAX_AP) {
+                return false;
+            }
+
+            if (newLuk < 4 && deltaLuk != Short.MIN_VALUE || newLuk > ServerConstants.MAX_AP) {
+                return false;
+            }
+
+            int newAp = remainingAp - apUsed;
+            updateStrDexIntLuk(newStr, newDex, newInt, newLuk, newAp);
+            return true;
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void updateStrDexIntLuk(int x) {
+        updateStrDexIntLuk(x, x, x, x, -1);
+    }
+    
+    public void changeRemainingAp(int x, boolean silent) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            changeStrDexIntLuk(str, dex, int_, luk, x, silent);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    public void gainAp(int deltaAp, boolean silent) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            changeRemainingAp(Math.max(0, remainingAp + deltaAp), silent);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    protected void updateStrDexIntLuk(int str, int dex, int int_, int luk, int remainingAp) {
+        changeStrDexIntLuk(str, dex, int_, luk, remainingAp, false);
+    }
+    
+    private void changeStrDexIntLuk(int str, int dex, int int_, int luk, int remainingAp, boolean silent) {
+        long strDexIntLuk = calcStatPoolLong(str, dex, int_, luk);
+        changeStatPool(null, strDexIntLuk, null, remainingAp, silent);
+    }
+    
+    private void changeStrDexIntLukSp(int str, int dex, int int_, int luk, int remainingAp, int remainingSp, int skillbook, boolean silent) {
+        long strDexIntLuk = calcStatPoolLong(str, dex, int_, luk);
+        long sp = calcStatPoolLong(0, 0, remainingSp, skillbook);
+        changeStatPool(null, strDexIntLuk, sp, remainingAp, silent);
+    }
+    
+    protected void updateStrDexIntLukSp(int str, int dex, int int_, int luk, int remainingAp, int remainingSp, int skillbook) {
+        changeStrDexIntLukSp(str, dex, int_, luk, remainingAp, remainingSp, skillbook, false);
+    }
+    
+    protected void setRemainingSp(int[] sps) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            System.arraycopy(sps, 0, remainingSp, 0, sps.length);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+    
+    protected void updateRemainingSp(int remainingSp, int skillbook) {
+        changeRemainingSp(remainingSp, skillbook, false);
+    }
+    
+    protected void changeRemainingSp(int remainingSp, int skillbook, boolean silent) {
+        long sp = calcStatPoolLong(0, 0, remainingSp, skillbook);
+        changeStatPool(null, null, sp, Short.MIN_VALUE, silent);
+    }
+    
+    public void gainSp(int deltaSp, int skillbook, boolean silent) {
+        effLock.lock();
+        statWlock.lock();
+        try {
+            changeRemainingSp(Math.max(0, remainingSp[skillbook] + deltaSp), skillbook, silent);
+        } finally {
+            statWlock.unlock();
+            effLock.unlock();
+        }
+    }
+}

src/client/MapleClient.java

@@ -1028,7 +1028,7 @@ public class MapleClient {
 	}
 
 	public void pongReceived() {
-		lastPong = System.currentTimeMillis();
+		lastPong = Server.getInstance().getCurrentTime();
 	}
 
         public void testPing(long timeThen) {
@@ -1381,12 +1381,7 @@ public class MapleClient {
                 player.cancelQuestExpirationTask();
 		//Cancelling magicdoor? Nope
 		//Cancelling mounts? Noty
-		if (player.getBuffedValue(MapleBuffStat.PUPPET) != null) {
-			player.cancelEffectFromBuffStat(MapleBuffStat.PUPPET);
-		}
-		if (player.getBuffedValue(MapleBuffStat.COMBO) != null) {
-			player.cancelEffectFromBuffStat(MapleBuffStat.COMBO);
-		}
+		
 		player.getInventory(MapleInventoryType.EQUIPPED).checked(false); //test
 		player.getMap().removePlayer(player);
                 player.clearBanishPlayerData();

src/client/autoban/AutobanManager.java

@@ -91,7 +91,6 @@ public class AutobanManager {
      * Timestamp checker
      *
      *  <code>type</code>:<br>
-     * 0: HealOverTime<br>
      * 1: Pet Food<br>
      * 2: InventoryMerge<br>
      * 3: InventorySort<br>
@@ -99,6 +98,8 @@ public class AutobanManager {
      * 5: UseCatchItem<br>
      * 6: Item Drop<br>
      * 7: Chat<br>
+     * 8: HealOverTimeHP<br>
+     * 9: HealOverTimeMP<br>
      *
      * @param type type
      * @return Timestamp checker
@@ -108,7 +109,7 @@ public class AutobanManager {
             this.timestampcounter[type]++;
             if (this.timestampcounter[type] >= times) {
                 chr.getClient().disconnect(false, false);
-                //System.out.println("Same timestamp for type: " + type + "; Character: " + chr);
+                FilePrinter.print(FilePrinter.EXPLOITS, "Player " + chr + " was caught spamming TYPE " + type + " and has been disconnected.");
             }
             return;
         }

src/client/command/CommandsExecutor.java

@@ -23,14 +23,16 @@
 */
 package client.command;
 
+import client.command.commands.gm0.*;
+import client.command.commands.gm1.*;
+import client.command.commands.gm2.*;
+import client.command.commands.gm3.*;
+import client.command.commands.gm4.*;
+import client.command.commands.gm5.*;
+import client.command.commands.gm6.*;
+
 import client.MapleClient;
-import client.command.commands.v0.*;
-import client.command.commands.v1.*;
-import client.command.commands.v2.*;
-import client.command.commands.v3.*;
-import client.command.commands.v4.*;
-import client.command.commands.v5.*;
-import client.command.commands.v6.*;
+
 import tools.FilePrinter;
 import tools.Pair;
 

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) : Math.min(remainingAp, ServerConstants.MAX_AP - player.getStr());
         
-        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.");
+        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;