Login Purification + Optimized currenttime calls + Standardized WZ

Repelled ultimately the game-breaking issue that was introduced recently on the revamp of the login phase.
Optimized the getcurrenttime calls to the OS. Made most of the handler calls fetch directly from the Server object instead, the Server itself delegated with periodically updating the current time value. The result is an slightly delayed currenttime, backed with realtime value update within minutes.
Protected concurrently inventory sort handlers. Expected no more NullPointers from the sorting feature.
Added a server flag to limit cash items being sold on player shops/hired merchants.
Stabilized the MapleTV mechanics, and activities properly split by world.
Normalized Character.wz: equipments supposed to have the "cash" property now implements it.
Normalized String.wz: every item that doesn't have a "name" property now implements it.
Normalized the XMLs that lost indentation on the last source update.
New tool: MapleInvalidItemWithNoNameFetcher. Fetches and reports itemids throughout the XMLs that doesn't contain the "name" property and equipments that lacks "cash" property.

Frolic Omniknight references aside, if you have run into any more issues regarding the new login system, please open an issue and show the steps you've done to reach the problem.

.gitignore

@@ -31,6 +31,10 @@
 /tools/MapleInvalidItemIdFetcher/dist/
 /tools/MapleInvalidItemIdFetcher/nbproject/
 
+/tools/MapleInvalidItemWithNoNameFetcher/build/
+/tools/MapleInvalidItemWithNoNameFetcher/dist/
+/tools/MapleInvalidItemWithNoNameFetcher/nbproject/
+
 /tools/MapleMapInfoRetriever/build/
 /tools/MapleMapInfoRetriever/dist/
 /tools/MapleMapInfoRetriever/nbproject/

README.md

@@ -51,7 +51,7 @@ Recommended localhost: https://hostr.co/m2bVtnizCtmD
 ---
 ### Development status
 
-Status: <span style="color:green">__Released__</span>.
+Status: <span style="color:grey">__In development (4th round)__</span>.
 
 HeavenMS development achieved an acceptable state-of-the-art and will get into a halt. A heartfelt thanks for everyone that contributed in some way for the progress of this server!
 

docs/feature_list.md

@@ -60,20 +60,24 @@ Player Social Network:
 * Implemented Marriage system from the ground-up (excluding character packet encoding parts that were already present, proper credits given throughout the source files).
 * Beginners can create and join a "beginner-only" party (characters up to level 10).
 * Enhanced synchronization on Player Shops and Hired Merchants. Transactions made are instantly informed to the owner.
-* Game minirooms such as match cards and omok now has semi-functional password system.
+* Game minirooms such as match cards and omok now has a functional password system.
 * Item pickup cooldown on non-owned/non-partyowned items functional.
 * 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.
 
 Cash & Items:
 
 * EXP/DROP/Cosmetic Coupons.
 * EXP/DROP coupons now appears as a buff effect when on active time.
 * Great deal of cash items functional.
+* MapleTV mechanics stabilized and separated by world.
+* GMS-esque omok/match card drop chances.
 * New scroll: antibanish. For use only in cases where bosses send a player back to town.
 * Inventory system properly checks for item slot free space and ownership.
 * Storage with "Arrange Items" feature functional.
 * Close-quarters evaluation mode for items (sandbox).
+* Further improved Karma scissors mechanics.
 * Spikes on shoes.
 * Vega's spell.
 * Owl of Minerva.
@@ -91,11 +95,11 @@ Monsters, Maps & Reactors:
 * Every skill/mastery book is now droppable by mobs.
 * 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).
 * Redesigned HT mechanics for spawn and linked damage to the sponge.
-* Improved map bounding checks for item drop points, assuring most of the items dropped will be available to pickup inside the accessible map area.
 * 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).
 * If multiple bosses are on the same area, client will prioritize Boss HP bar of the target of the player.
+* Improved map bounding checks for item drop points, assuring most of the items dropped will be available to pickup inside the accessible map area.
 * Boats, elevator and other travelling mechanics fully working.
 * HP decreasing overtime on maps and mechanics to prevent them (consumables, equips) fully functional.
 * Crimson Balrog boat approaching visual effect made functional.
@@ -131,7 +135,9 @@ Server potentials:
 * Enhanced buff system: smartly checks for the best available buff effects to be active on the player.
 * Enhanced AP auto-assigner: exactly matches AP with the needed for the player's current level, surplus assigned to the primary attribute.
 * Tweaked pet/mount hunger: calculations for fullness/tiredness takes active time of the subject into account.
+* Consistent experience gain system.
 * NPC crafters (equips, plates/jewels, etc) now won't take items freely if the requirement conditions are not properly met.
+* Improved Duey mechanics: package received popup and reviewed many delivery mechanics.
 * Pet item pickup now gives preference to player attacks rather than forcing attack disables when automatically picking up.
 * Channel capacity bar functional and world servers with max capacity checks.
 * Disease status are now visible for other players, even when changing maps.
@@ -140,6 +146,8 @@ Server potentials:
 * Custom jail system (needs provided custom wz).
 * Custom buyback system.
 * Delete Character (requires ENABLE_PIC activated).
+* Smoothed up view-all-char feature, now showing properly all available characters and not disconnecting players too often.
+* Centralized getcurrenttime throughout several server handlers, boosting it's performance overall.
 * Autosaver (periodically saves on DB current state of every player in-game).
 * Both fixed and randomized versions of HP/MP growth rate available, regarding player job (enable one at ServerConstants). Placeholder for HP/MP washing feature.
 * Reallocated mapobjectids utilization throughout the source, preventing issues such as "NPC disappearing mysteriously after some server time" from happening.
@@ -150,6 +158,7 @@ Server potentials:
 Custom NPCs:
 
 * Spiegelmann: automatized rock-refiner.
+* Asia: scroll & rarities shop NPC.
 * Abdula: lists droppers of needed skill/mastery books.
 * Agent E: accessory crafter.
 * Donation Box: automatized item-buyer.
@@ -169,6 +178,7 @@ External tools:
 * 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.
 * 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.
 * MapleMapInfoRetriever - Basic tool for detecting missing info nodes on the map field structures (maps failing to have an info node on the WZ is an critical issue).
 * MapleMesoFetcher - Creates meso drop data for mobs with more than 4 items (thus overworld mobs), calculations based on mob level and whether it's a boss or not.
 * MapleMobBookIndexer - Generates a SQL table with all relations of cardid and mobid present in the mob book.
@@ -190,8 +200,11 @@ Project:
 * Uncovered many Send/Recv opcodes throughout the source.
 * Reviewed many Java object aspects that needed concurrency protection.
 * Reviewed SQL data, eliminating duplicated entries on the tables.
+* Improved login phase, using cache over DB queries.
 * Usage of HikariCP to improve the DB connection management.
+* Developed many survey tools for content profiling.
 * Protected many flaws with login management system.
+* Channel, World and Server-wide timer management.
 * Heavily reviewed future task management inside the project. Way less trivial schedules are spawned now, relieving task overload on the TimerManager.
 * ThreadTracker: embedded auditing tool for run-time deadlock scanning throughout the server source (relies heavily on memory usage, designed only for debugging purposes).
 

docs/mychanges_ptbr.txt

@@ -1129,4 +1129,18 @@ Corrigido função monsterValue dos scripts de eventos sendo processado múltipl
 Corrigido pinkbean nao dropando itens dentro da expedição.
 
 14 Julho 2018,
-Movido "recharge" de Donator para JrGM.
+Movido "recharge" de Donator para JrGM.
+Otimizado busca por currenttimemillis, agora buscando do objeto do servidor ao invés de verificar pelo ambiente JVM.
+Corrigido handlers de organização de inventários não protegendo concorrentemente inventários antes de realizar a ordenação.
+
+15 - 16 Julho 2018,
+Implementado parte da questline level 120+ de Cygnus Knights.
+Corrigido itens de cash sendo vendidos em player shop/hired merchant.
+Corrigido login atribuindo sempre conta de GM (limitando ações como trade) quando há pelo menos um char GM naquela conta - isso pode até ser mesmo necessário, criado um flag pra continuar enforcando o "GM account".
+Estabilizado mecânicas de MapleTV e separado atividade da MapleTV pra cada world.
+Normalizado Character.wz: agora todos os equipamentos que precisam ter "cash" o tem.
+Normalizado String.wz: agora todos os itens sem "name" o tem.
+Nova ferramenta: MapleInvalidItemWithNoNameFetcher. Busca por itemids sem as propriedades "cash" e "name" nos conjuntos de wz.xml.
+
+17 Julho 2018,
+Corrigido problema crítico no novo sistema de login, que impedia contas recém-criadas de logar no jogo.

scripts/npc/1103000.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("I am Advanced Knight #b#p1103000##k. Thanks to your bravery I and all of Ereve have been rescued from the grasps of Eleanor. By the kindness of our Empress, well battled!");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104002.js

@@ -0,0 +1,61 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                var mapobj = cm.getMap();
+            
+                if (mode == 0 && type > 0) {
+                        cm.getPlayer().dropMessage(5, "Eleanor: Oh, lost the Empress and still challenging us? Now you've done it! Prepare yourself!!!");
+                        
+                        mapobj.spawnMonsterOnGroundBelow(Packages.server.life.MapleLifeFactory.getMonster(9001010), new Packages.java.awt.Point(850, 0));
+                        mapobj.destroyNPC(1104002);
+                        
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        if(!cm.isQuestStarted(20407)) {
+                            cm.sendOk("... Knight, you still #bseem unsure to face this fight#k, don't you? There's no grace in challenging someone when they are still not mentally ready for the battle. Talk your peace to that big clumsy bird of yours, maybe it'll put some guts on you.");
+                            cm.dispose();
+                            return;
+                        }
+                    
+                        cm.sendAcceptDecline("Hahahahaha! This place's Empress is already under my domain, that's surely a great advance on the #bBlack Wings#k' overthrow towards Maple World... And you, there? Still wants to face us? Or, better yet, #rfeel fancy to join us#k since there's nothing more you can do?");
+                } else if (status == 1) {
+                        cm.sendOk("Heh, cowards have no place on the #rBlack Mage's#k army. Begone!");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104200.js

@@ -0,0 +1,55 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendNext("#b#p1104002##k... The black witch... Trapped me here... There's no time now, she's already on her way to #rattack Ereve#k!");
+                } else if (status == 1) {
+                        cm.sendYesNo("Fellow Knight, you must reach to #rEreve#k right now, #rthe Empress is in danger#k!! Even in this condition, I can still Magic Warp you there. When you're ready talk to me. #bAre you ready to face Eleanor?#k");
+                } else if (status == 2) {
+                        if(cm.getWarpMap(913030000).countPlayers() == 0) {
+                                cm.warp(913030000, 0);
+                        } else {
+                                cm.sendOk("There's someone already challenging her. Please wait awhile.");
+                        }
+                        
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104201.js

@@ -0,0 +1,52 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        if (!(cm.isQuestCompleted(20407) || cm.isQuestStarted(20407) && cm.getQuestProgress(20407, 9001010) != 0) && cm.getMap().countMonster(9001010) == 0 && cm.getMap().getNPCById(1104002) == null) {
+                                cm.sendOk("... Hnngh... #b#h0##k, is that you...? #r#p1104002##k... She's already here... #b#h0##k, I'm truly sorry I can't help you right now in this state, just when a bigger threat appeared I could do nothing for my people.... Please I beg you, please defeat her, #b#h0##k!! ....");
+                                cm.spawnNpc(1104002, new java.awt.Point(850, 0), cm.getMap());
+                        } else {
+                                cm.sendOk("...");
+                        }
+                        
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104202.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("...");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104203.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("...");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104204.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("...");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104205.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("...");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104206.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("...");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/1104207.js

@@ -0,0 +1,46 @@
+/*
+    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/>.
+*/
+
+var status;
+ 
+function start() {
+        status = -1;
+        action(1, 0, 0);
+}
+
+function action(mode, type, selection) {
+        if (mode == -1) {
+                cm.dispose();
+        } else {
+                if (mode == 0 && type > 0) {
+                        cm.dispose();
+                        return;
+                }
+                if (mode == 1)
+                        status++;
+                else
+                        status--;
+    
+                if(status == 0) {
+                        cm.sendOk("...");
+                        cm.dispose();
+                }
+        }
+}

scripts/npc/2100002.js

@@ -6,6 +6,6 @@ function start() {
 }
 
 function action(mode, type, selection) {
-    cm.openShopNPC(48);
+    cm.openShopNPC(2100002);
     cm.dispose();
 }

scripts/npc/2100003.js

@@ -6,6 +6,6 @@ function start() {
 }
 
 function action(mode, type, selection) {
-    cm.openShopNPC(52);
+    cm.openShopNPC(2100003);
     cm.dispose();
 }

scripts/npc/2103002.js

@@ -43,7 +43,7 @@ function action(mode, type, selection) {
                 if(status == 0) {
                         if(cm.isQuestStarted(3923) && !cm.haveItem(4031578, 1)) {
                                 if(cm.canHold(4031578, 1)) {
-                                        cm.sendOk("You have just swiped the ring. Clear the area asap.", 2);
+                                        cm.sendOk("You have just swiped the ring. Clear the area asap!", 2);
                                         cm.gainItem(4031578, 1);
                                 } else {
                                         cm.sendOk("You don't have a ETC slot available.", 2);

scripts/npc/9977777.js

@@ -73,9 +73,10 @@ function writeFeatureTab_PlayerSocialNetwork() {
         addFeature("Party for novices-only.");
         addFeature("Thoroughly reviewed P. Shops and H. Merchants.");
         addFeature("Transactions on Merchs instantly announced to owner.");
-        addFeature("Game minirooms with semi-functional pw system.");
+        addFeature("Game minirooms with functional pw system.");
         addFeature("Proper item pickup cooldown on non-owned items.");
         addFeature("Improved ranking system, with daily movement.");
+        addFeature("Protected and improved face expression system.");
         addFeature("Automated support for Player NPCs and Hall of Fame.");
         addFeature("Engagement & Wedding system.");
 }
@@ -84,6 +85,7 @@ function writeFeatureTab_CashItems() {
         addFeature("EXP/DROP/Cosmetic Coupons.");
         addFeature("EXP/DROP Coupon as buff effect during active time.");
         addFeature("Great deal of cash items functional.");
+        addFeature("MapleTV mechanics stabilized and split by world.");
         addFeature("GMS-esque omok/match card drop chances.");
         addFeature("New town scroll: antibanish. Counters boss banishes.");
         addFeature("Inventory system checks for free slot & stack space.");
@@ -112,6 +114,7 @@ function writeFeatureTab_MonstersMapsReactors() {
         addFeature("Added Boss HP Bar for dozens of bosses.");
         addFeature("Game will favor showing the targeted boss HPbar.");
         addFeature("Dmg overtime on maps and neutralizers functional.");
+        addFeature("Items will consistently stay within the walking area.");
         addFeature("Boats, elevator and other travel mechanics functional.");
         addFeature("C. Balrog's boat approaching visual effect functional.");
         addFeature("Maps having everlasting items no longer expires them.");
@@ -119,6 +122,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("Reviewed Masteria, W. Tour, N. Desert and Neo City.");
         addFeature("Giant Cake boss drops s. bags and Maple items.");
 }
@@ -145,6 +149,7 @@ function writeFeatureTab_Serverpotentials() {
         addFeature("Enhanced auto-pot system: smart pet potion handle.");
         addFeature("Enhanced buff system: best buffs effects takes place.");
         addFeature("Enhanced AP auto-assigner: focus on eqp demands.");
+        addFeature("Tweaked pet/mount hunger to a balanced growth rate.");
         addFeature("Consistent experience gain system.");
         addFeature("NPC crafters won't take items freely anymore.");
         addFeature("Duey: pkg rcvd popup and many delivery mechanics.");
@@ -157,9 +162,11 @@ function writeFeatureTab_Serverpotentials() {
         addFeature("Custom buyback system, uses mesos / NX, via MTS.");
         addFeature("Delete Character.");
         addFeature("Smooth view-all-char, now showing all account chars.");
+        addFeature("Centralized servertime, boosting handler performance.");
         addFeature("Autosaver (periodically saves player's data on DB).");
         addFeature("Fixed and randomized HP/MP growth rate available.");
         addFeature("Prevented 'NPC gone after some uptime' issue.");
+        addFeature("Implemented starters' AP assigning for under level 11.");
         addFeature("AP assigning available for novices level 10 or below.");
         addFeature("Automatic account registration - thanks shavit!");
 }
@@ -202,6 +209,7 @@ function writeFeatureTab_Project() {
         addFeature("Reviewed SQL data, eliminating duplicated entries.");
         addFeature("Improved login phase, using cache over DB queries.");
         addFeature("Protected many flaws with login management system.");
+        addFeature("Usage of HikariCP to improve DB connection calls.");
         addFeature("Developed many survey tools for content profiling.");
         addFeature("ThreadTracker: runtime tool for deadlock detection.");
         addFeature("Channel, World and Server-wide timer management.");

scripts/portal/elevator.js

@@ -1,12 +1,11 @@
 function enter(pi) {
     try {
-        var elevator = pi.getEventManager("Elevator");
+        var elevator = pi.getEventManager("elevator");
         if (elevator == null) {
             pi.getPlayer().dropMessage(5, "The elevator is under maintenance.");
         } else if (elevator.getProperty(pi.getMapId() == 222020100 ? ("goingUp") : ("goingDown")).equals("false")) {
             pi.playPortalSound(); pi.warp(pi.getMapId() == 222020100 ? 222020110 : 222020210, 0);
-            //elevator.getIv().invokeFunction(pi.getMapId() == 222020110 ? "goUp" : "goDown");
-			return true;
+            return true;
         } else if (elevator.getProperty(pi.getMapId() == 222020100 ? ("goingUp") : ("goingDown")).equals("true")) {
             pi.getPlayer().dropMessage(5, "The elevator is currently moving.");
         }

scripts/portal/enterWitch.js

@@ -1,13 +1,20 @@
 function enter(pi) {
-    if (pi.getQuestStatus(20407) == 2) {
-	pi.playPortalSound(); pi.warp(924010200,0);
-        return true;
-    } else if (pi.getQuestStatus(20406) == 2) {
-	pi.playPortalSound(); pi.warp(924010100,0);
-        return true;
-    } else if (pi.getQuestStatus(20404) == 2) {
-	pi.playPortalSound(); pi.warp(924010000,0);
+    if (pi.isQuestCompleted(20404)) {
+        var warpMap;
+        
+        if (pi.isQuestCompleted(20407)) {
+            warpMap = 924010200;
+        } else if (pi.isQuestCompleted(20406)) {
+            warpMap = 924010100;
+        } else {
+            warpMap = 924010000;
+        }
+        
+        pi.playPortalSound();
+	pi.warp(warpMap, 1);
         return true;
+        
+    
     } else {
 	pi.playerMessage(5, "I shouldn't go here.. it's creepy!");
         return false;

scripts/portal/outDarkEreb.js

@@ -0,0 +1,27 @@
+/*
+	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/>.
+*/
+function enter(pi) {
+    var warpMap = pi.isQuestCompleted(20407) ? 924010200 : 924010100;
+    
+    pi.playPortalSound(); pi.warp(warpMap, 0);
+    return true;
+}

scripts/quest/1021.js

@@ -29,68 +29,81 @@ importPackage(Packages.client);
 var status = -1;
 
 function start(mode, type, selection) {
-    status++;
-    if (mode != 1) {
-        if(type == 1 && mode == 0)
-            status -= 2;
-        else{
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
             qm.dispose();
             return;
         }
-    }
-    if (status == 0)
-        qm.sendNext("Hey, Man~ What's up? Haha! I am Roger who can teach you adorable new Maplers lots of information.");
-    else if (status == 1)
-        qm.sendNextPrev("You are asking who made me do this? Ahahahaha!\r\nMyself! I wanted to do this and just be kind to you new travellers.");
-    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.haveItem(2010007))
-            qm.gainItem(2010007, 1);
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0)
+            qm.sendNext("Hey, Man~ What's up? Haha! I am Roger who can teach you adorable new Maplers lots of information.");
+        else if (status == 1)
+            qm.sendNextPrev("You are asking who made me do this? Ahahahaha!\r\nMyself! I wanted to do this and just be kind to you new travellers.");
+        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.haveItem(2010007)) {
+                qm.gainItem(2010007, 1);
+            }
+            
             qm.forceStartQuest();
             qm.sendNext("Surprised? If HP becomes 0, then you are in trouble. Now, I will give you #rRoger's Apple#k. Please take it. You will feel stronger. Open the Item window and double click to consume. Hey, it's very simple to open the Item window. Just press #bI#k on your keyboard.");
-    } else if (status == 4) {
-        qm.sendNextPrev("Please take all Roger's Apples that I gave you. You will be able to see the HP bar increasing. Please talk to me again when you recover your HP 100%.");
-    } else if (status == 5) {
-	qm.showInfo("UI/tutorial.img/28");
-        qm.dispose();
+        } else if (status == 4) {
+            qm.sendNextPrev("Please take all Roger's Apples that I gave you. You will be able to see the HP bar increasing. Please talk to me again when you recover your HP 100%.");
+        } else if (status == 5) {
+            qm.showInfo("UI/tutorial.img/28");
+            qm.dispose();
+        }
     }
 }
 
 function end(mode, type, selection) {
-    status++;
-    if (mode != 1) {
-        if(type == 1 && mode == 0)
-            status -= 2;
-        else{
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
             qm.dispose();
             return;
         }
-    }
-    if (status == 0)
-        if (qm.c.getPlayer().getHp() < 50) {
-            qm.sendNext("Hey, your HP is not fully recovered yet. Did you take all the Roger's Apple that I gave you? Are you sure?");
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0)
+            if (qm.c.getPlayer().getHp() < 50) {
+                qm.sendNext("Hey, your HP is not fully recovered yet. Did you take all the Roger's Apple that I gave you? Are you sure?");
+                qm.dispose();
+            } else
+                qm.sendNext("How easy is it to consume the item? Simple, right? You can set a #bhotkey#k on the right bottom slot. Haha you didn't know that! right? Oh, and if you are a beginner, HP will automatically recover itself as time goes by. Well it takes time but this is one of the strategies for the beginners.");
+        else if (status == 1)
+            qm.sendNextPrev("Alright! Now that you have learned alot, I will give you a present. This is a must for your travel in Maple World, so thank me! Please use this under emergency cases!");
+        else if (status == 2)
+            qm.sendNextPrev("Okay, this is all I can teach you. I know it's sad but it is time to say good bye. Well take care if yourself and Good luck my friend!\r\n\r\n#fUI/UIWindow.img/QuestIcon/4/0#\r\n#v2010000# 3 #t2010000#\r\n#v2010009# 3 #t2010009#\r\n\r\n#fUI/UIWindow.img/QuestIcon/8/0# 10 exp");
+        else if (status == 3) {
+            if(qm.isQuestCompleted(1021))
+                qm.dropMessage(1,"Unknown Error");
+            else if(qm.canHold(2010000) && qm.canHold(2010009)){
+                qm.gainExp(10);
+                qm.gainItem(2010000, 3);
+                qm.gainItem(2010009, 3);
+                qm.forceCompleteQuest();
+            }else
+                qm.dropMessage(1,"Your inventory is full");
             qm.dispose();
-        } else
-            qm.sendNext("How easy is it to consume the item? Simple, right? You can set a #bhotkey#k on the right bottom slot. Haha you didn't know that! right? Oh, and if you are a beginner, HP will automatically recover itself as time goes by. Well it takes time but this is one of the strategies for the beginners.");
-    else if (status == 1)
-        qm.sendNextPrev("Alright! Now that you have learned alot, I will give you a present. This is a must for your travel in Maple World, so thank me! Please use this under emergency cases!");
-    else if (status == 2)
-        qm.sendNextPrev("Okay, this is all I can teach you. I know it's sad but it is time to say good bye. Well take care if yourself and Good luck my friend!\r\n\r\n#fUI/UIWindow.img/QuestIcon/4/0#\r\n#v2010000# 3 #t2010000#\r\n#v2010009# 3 #t2010009#\r\n\r\n#fUI/UIWindow.img/QuestIcon/8/0# 10 exp");
-    else if (status == 3) {
-        if(qm.isQuestCompleted(1021))
-            qm.dropMessage(1,"Unknown Error");
-        else if(qm.canHold(2010000) && qm.canHold(2010009)){
-            qm.gainExp(10);
-            qm.gainItem(2010000, 3);
-            qm.gainItem(2010009, 3);
-            qm.forceCompleteQuest();
-        }else
-            qm.dropMessage(1,"Your inventory is full");
-        qm.dispose();
+        }
     }
 }

scripts/quest/20400.js

@@ -0,0 +1,48 @@
+/*
+    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/>.
+*/
+/* 
+	Chasing the Knight's Target
+	
+ */
+
+var status = -1;
+
+function start(mode, type, selection) {
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
+            qm.dispose();
+            return;
+        }
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0) {
+            qm.sendNext("Not long ago, we received a distress signal of #bAdvanced Knight #p1103000##k, currently stationed somewhere in #rEl Nath#k. His Your job is to find him, first go talk to #b#p1101002##k and receive further instructions on your mission.");
+        } else if (status == 1) {
+            qm.forceCompleteQuest();
+            qm.dispose();
+        }
+    }
+}

scripts/quest/20401.js

@@ -0,0 +1,48 @@
+/*
+    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/>.
+*/
+/* 
+	Chasing the Knight's Target
+	
+ */
+
+var status = -1;
+
+function start(mode, type, selection) {
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
+            qm.dispose();
+            return;
+        }
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0) {
+            qm.sendNext("Last time #bAdvanced Knight #p1103000##k was seen, he was investigating the surging increase on #rzombies#k lately on the #rhigh-grounds of El Nath#k. You should get yourself there to see if you can find any clue of what could have happened.");
+        } else if (status == 1) {
+            qm.forceCompleteQuest();
+            qm.dispose();
+        }
+    }
+}

scripts/quest/20405.js

@@ -0,0 +1,50 @@
+/*
+    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/>.
+*/
+/* 
+	Chasing the Knight's Target
+	
+ */
+
+var status = -1;
+
+function start(mode, type, selection) {
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
+            qm.dispose();
+            return;
+        }
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0) {
+            qm.sendNext("There's a note on the wall: 'The source of the curse still goes missing, but a strange device, that I suppose has been used by #rthem#k was found here.'", 3);
+        } else if (status == 1) {
+            qm.sendNextPrev("'The machine was sent to #rEreve#k for avaliation, I'll now set out to continue my mission. Let the Empress bless me on my journey.'", 3);
+        } else if (status == 2) {
+            qm.forceCompleteQuest();
+            qm.dispose();
+        }
+    }
+}

scripts/quest/20406.js

@@ -0,0 +1,48 @@
+/*
+    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/>.
+*/
+/* 
+	Chasing the Knight's Target
+	
+ */
+
+var status = -1;
+
+function start(mode, type, selection) {
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
+            qm.dispose();
+            return;
+        }
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0) {
+            qm.sendNext("Is that so? All there was was a saying that #p1103000# set out to continue his journey? That can't be, there were further instructions for him to detail the progress of his mission until then. #rReturn to the cave#k and report again if it really has nothing more there.");
+        } else if (status == 1) {
+            qm.forceCompleteQuest();
+            qm.dispose();
+        }
+    }
+}

scripts/quest/3927.js

@@ -53,14 +53,18 @@ function end(mode, type, selection) {
         } else if (status == 2) {
             if(selection == 0) {
                 qm.sendOk("If I had an iron hammer and a dagger... a bow and an arrow... what does that mean? Do you want me to tell you? I don't know myself. It's something you should think about. If you need a clue... it would go something like... a weapon is just an item... until someone uses it...?");
-                qm.gainExp(1000 * qm.getPlayer().getExpRate());
-                qm.forceCompleteQuest();
             } else if(selection == 1) {
                 qm.sendOk("Man, Jiyur wrote on the wall again! Arrgh!!");
+                qm.dispose();
+                return;
             } else {
                 qm.sendOk("What? You forgot? Do you remember where it was written?");
+                qm.dispose();
+                return;
             }
-
+        } else if (status == 3) {
+            qm.gainExp(1000 * qm.getPlayer().getExpRate());
+            qm.forceCompleteQuest();
             qm.dispose();
         }
     }

scripts/quest/3953.js

@@ -42,8 +42,7 @@ function end(mode, type, selection) {
             qm.sendSimple("Ehh... Yeah, the city is not really doing well because of the currently ruling govern, that's indeed a fact. If only the Guardians of the Deserts returned to put order on this mess...\r\n\r\n#L0##bWhat is the Guardian of the Deserts doing when we're under the Queen's tyranny?#k");
         } else if (status == 3) {
             qm.sendSimple("They have departed on an expedition to get rid of some major threats in the desert that were ravaging Ariant, for quite some time now... It's strange, they should have already returned... Thinking about it now, the last attack on the merchants was around the direction the Guardians departed... No, that can't be... Can it?\r\n\r\n#L0##bPerhaps Deo has already turned into a monster.#k");
-        }
-        else if (status == 4) {
+        } else if (status == 4) {
             qm.gainItem(4011008, -1);
             
             qm.sendNext("We're in great trouble, if it is like this. And it really seems like it. If the Royal Cactus Deo has gone insane, Ariant is done for. You, can you do something to defeat Deo? We really need your help now.");

sql/db_drops.sql

@@ -20264,6 +20264,8 @@ USE `heavenms`;
 (4300008, 4032521, 1, 1, 2291, 120000),
 (4300009, 4032521, 1, 1, 2291, 120000),
 (4300010, 4032521, 1, 1, 2291, 120000),
+(5130107, 4001207, 1, 1, 0, 2285),
+(5130108, 4001207, 1, 1, 0, 2285),
 (9400506, 2020020, 1, 1, 0, 100000),
 (9400506, 4031217, 1, 1, 0, 40000),
 (9400507, 2020020, 1, 1, 0, 100000),

src/client/MapleCharacter.java

@@ -199,7 +199,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
     private int expRate = 1, mesoRate = 1, dropRate = 1, expCoupon = 1, mesoCoupon = 1, dropCoupon = 1;
     private int omokwins, omokties, omoklosses, matchcardwins, matchcardties, matchcardlosses;
     private int owlSearch;
-    private long lastfametime, lastUsedCashItem, lastHealed, lastBuyback = 0, lastDeathtime, lastMesoDrop = -1, jailExpiration = -1;
+    private long lastfametime, lastUsedCashItem, lastExpression = 0, lastHealed, lastBuyback = 0, lastDeathtime, lastMesoDrop = -1, jailExpiration = -1;
     private transient int localmaxhp, localmaxmp, localstr, localdex, localluk, localint_, magic, watk;
     private boolean hidden, canDoor = true, berserk, hasMerchant, hasSandboxItem = false, whiteChat = false;
     private int linkedLevel = 0;
@@ -2369,7 +2369,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
         }
     }
 
-    private boolean dispelSkills(int skillid) {
+    private static boolean dispelSkills(int skillid) {
         switch (skillid) {
             case DarkKnight.BEHOLDER:
             case FPArchMage.ELQUINES:
@@ -2386,6 +2386,14 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
                 return false;
         }
     }
+    
+    public void changeFaceExpression(int emote) {
+        long timeNow = Server.getInstance().getCurrentTime();
+        if(timeNow - lastExpression > 2000) {
+            lastExpression = timeNow;
+            client.getChannelServer().registerFaceExpression(map, this, emote);
+        }
+    }
 
     private void doHurtHp() {
         if (!(this.getInventory(MapleInventoryType.EQUIPPED).findById(getMap().getHPDecProtect()) != null || buffMapProtection())) {

src/client/MapleClient.java

@@ -956,6 +956,7 @@ public class MapleClient {
             
                 Server.getInstance().unregisterLoginState(this);
             
+                this.session.setAttribute(MapleClient.CLIENT_KEY, null);
 		this.accountName = null;
 		this.macs = null;
 		this.hwid = null;
@@ -1153,6 +1154,10 @@ public class MapleClient {
                 lock.unlock();
 	}
         
+        public boolean trylockClient() {
+                return lock.tryLock();
+	}
+        
         public void lockEncoder() {
                 encoderLock.lock();
 	}
@@ -1356,12 +1361,16 @@ public class MapleClient {
 		this.sessionId = sessionId;
 	}  
 
+        public boolean canRequestCharlist(){
+		return lastNpcClick + 877 < Server.getInstance().getCurrentTime();
+	}
+        
 	public boolean canClickNPC(){
-		return lastNpcClick + 500 < System.currentTimeMillis();
+		return lastNpcClick + 500 < Server.getInstance().getCurrentTime();
 	}
 
 	public void setClickedNPC(){
-		lastNpcClick = System.currentTimeMillis();
+		lastNpcClick = Server.getInstance().getCurrentTime();
 	}
 
 	public void removeClickedNPC(){

src/client/command/Commands.java

@@ -607,33 +607,40 @@ public class Commands {
                 case "dex":
                 case "int":
                 case "luk":
-                        int amount = (sub.length > 1) ? Integer.parseInt(sub[1]) : player.getRemainingAp();
+                        int remainingAp = player.getRemainingAp();
+                    
+                        int amount = (sub.length > 1) ? Math.min(Integer.parseInt(sub[1]), remainingAp) : remainingAp;
                         boolean str = sub[0].equalsIgnoreCase("str");
                         boolean Int = sub[0].equalsIgnoreCase("int");
                         boolean luk = sub[0].equalsIgnoreCase("luk");
                         boolean dex = sub[0].equalsIgnoreCase("dex");
 
-                        if (amount > 0 && amount <= player.getRemainingAp() && amount <= 32763 || amount < 0 && amount >= -32763 && Math.abs(amount) + player.getRemainingAp() <= 32767) {
-                            if (str && amount + player.getStr() <= 32767 && amount + player.getStr() >= 4) {
-                                player.setStr(player.getStr() + amount);
-                                player.updateSingleStat(MapleStat.STR, player.getStr());
-                                player.setRemainingAp(player.getRemainingAp() - amount);
-                                player.updateSingleStat(MapleStat.AVAILABLEAP, player.getRemainingAp());
-                            } else if (Int && amount + player.getInt() <= 32767 && amount + player.getInt() >= 4) {
-                                player.setInt(player.getInt() + amount);
-                                player.updateSingleStat(MapleStat.INT, player.getInt());
-                                player.setRemainingAp(player.getRemainingAp() - amount);
-                                player.updateSingleStat(MapleStat.AVAILABLEAP, player.getRemainingAp());
-                            } else if (luk && amount + player.getLuk() <= 32767 && amount + player.getLuk() >= 4) {
-                                player.setLuk(player.getLuk() + amount);
-                                player.updateSingleStat(MapleStat.LUK, player.getLuk());
-                                player.setRemainingAp(player.getRemainingAp() - amount);
-                                player.updateSingleStat(MapleStat.AVAILABLEAP, player.getRemainingAp());
-                            } else if (dex && amount + player.getDex() <= 32767 && amount + player.getDex() >= 4) {
-                                player.setDex(player.getDex() + amount);
-                                player.updateSingleStat(MapleStat.DEX, player.getDex());
-                                player.setRemainingAp(player.getRemainingAp() - amount);
-                                player.updateSingleStat(MapleStat.AVAILABLEAP, player.getRemainingAp());
+                        if (amount > 0 && amount <= remainingAp && amount <= 32763) {
+                            int playerStr = player.getStr();
+                            int playerDex = player.getDex();
+                            int playerInt = player.getInt();
+                            int playerLuk = player.getLuk();
+                            
+                            if (str && amount + playerStr <= 32767 && amount + playerStr >= 4) {
+                                player.setStr(playerStr + amount);
+                                player.updateSingleStat(MapleStat.STR, playerStr);
+                                player.setRemainingAp(remainingAp - amount);
+                                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
+                            } else if (Int && amount + playerInt <= 32767 && amount + playerInt >= 4) {
+                                player.setInt(playerInt + amount);
+                                player.updateSingleStat(MapleStat.INT, playerInt);
+                                player.setRemainingAp(remainingAp - amount);
+                                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
+                            } else if (luk && amount + playerLuk <= 32767 && amount + playerLuk >= 4) {
+                                player.setLuk(playerLuk + amount);
+                                player.updateSingleStat(MapleStat.LUK, playerLuk);
+                                player.setRemainingAp(remainingAp - amount);
+                                player.updateSingleStat(MapleStat.AVAILABLEAP, remainingAp);
+                            } else if (dex && amount + playerDex <= 32767 && amount + playerDex >= 4) {
+                                player.setDex(playerDex + amount);
+                                player.updateSingleStat(MapleStat.DEX, playerDex);
+                                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.");
                             }

src/client/creator/CharacterFactory.java

@@ -56,7 +56,7 @@ public abstract class CharacterFactory {
                 MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
                 
                 int top = recipe.getTop(), bottom = recipe.getBottom(), shoes = recipe.getShoes(), weapon = recipe.getWeapon();
-
+                
                 if(top > 0) {
                     Item eq_top = ii.getEquipById(top);
                     eq_top.setPosition((byte) -5);
@@ -85,7 +85,7 @@ public abstract class CharacterFactory {
                         return -2;
                 }
                 c.announce(MaplePacketCreator.addNewCharEntry(newchar));
-
+                
                 Server.getInstance().createCharacterEntry(newchar);
                 Server.getInstance().broadcastGMMessage(c.getWorld(), MaplePacketCreator.sendYellowTip("[NEW CHAR]: " + c.getAccountName() + " has created a new character with IGN " + name));
                 

src/client/processor/BuybackProcessor.java

@@ -41,7 +41,7 @@ public class BuybackProcessor {
     public static void processBuyback(MapleClient c) {
         MapleCharacter chr = c.getPlayer();
         boolean buyback;
-            
+        
         c.lockClient();
         try {
             buyback = !chr.isAlive() && chr.couldBuyback();

src/constants/ItemConstants.java

@@ -126,6 +126,11 @@ public final class ItemConstants {
         return itemId >= 1110000 && itemId < 1140000;
     }
     
+    public static boolean isTaming(int itemId) {
+        int itemType = itemId / 1000;
+        return itemType == 1902 || itemType == 1912;
+    }
+    
     public static boolean isTownScroll(int itemId) {
         return itemId >= 2030000 && itemId < 2030100;
     }
@@ -164,7 +169,15 @@ public final class ItemConstants {
     public static boolean isPartyAllcure(int itemId) {
         return itemId == 2022433;
     }
-
+    
+    public static boolean isHiredMerchant(int itemId) {
+        return itemId / 10000 == 503;
+    }
+    
+    public static boolean isPlayerShop(int itemId) {
+        return itemId / 10000 == 514;
+    }
+    
     public static MapleInventoryType getInventoryType(final int itemId) {
         if (inventoryTypeCache.containsKey(itemId)) {
             return inventoryTypeCache.get(itemId);

src/constants/ServerConstants.java

@@ -23,7 +23,7 @@ public class ServerConstants {
     public static final long PURGING_INTERVAL = 5 * 60 * 1000;
     public static final long RANKING_INTERVAL = 60 * 60 * 1000;	//60 minutes, 3600000.
     public static final long  COUPON_INTERVAL = 60 * 60 * 1000;	//60 minutes, 3600000.
-    public static final long  UPDATE_INTERVAL = 777;
+    public static final long  UPDATE_INTERVAL = 777;            //Dictates the frequency on which the "centralized server time" is updated.
     
     public static final boolean ENABLE_PIC = false;             //Pick true/false to enable or disable Pic. Delete character needs this feature ENABLED.
     public static final boolean ENABLE_PIN = false;             //Pick true/false to enable or disable Pin.
@@ -62,10 +62,12 @@ public class ServerConstants {
     public static final boolean USE_AUTOSAVE = true;                //Enables server autosaving feature (saves characters to DB each 1 hour).
     public static final boolean USE_SERVER_AUTOASSIGNER = true;     //HeavenMS-builtin autoassigner, uses algorithm based on distributing AP accordingly with required secondary stat on equipments.
     public static final boolean USE_REFRESH_RANK_MOVE = true;
+    public static final boolean USE_ENFORCE_ADMIN_ACCOUNT = false;  //Forces accounts having GM characters to be treated as a "GM account" by the client (localhost). Some of the GM account perks is the ability to FLY, but unable to TRADE.
     public static final boolean USE_ENFORCE_HPMP_SWAP = false;      //Forces players to reuse stats (via AP Resetting) located on HP/MP pool only inside the HP/MP stats.
     public static final boolean USE_ENFORCE_MOB_LEVEL_RANGE = true; //Players N levels below the killed mob will gain no experience from defeating it.
     public static final boolean USE_ENFORCE_JOB_LEVEL_RANGE = false;//Caps the player level on the minimum required to advance their current jobs.
     public static final boolean USE_ENFORCE_OWL_SUGGESTIONS = false;//Forces the Owl of Minerva to always display the defined item array on GameConstants.OWL_DATA instead of those featured by the players.
+    public static final boolean USE_ENFORCE_UNMERCHABLE_CASH = true;//Forces players to not sell CASH items via merchants.
     public static final boolean USE_ENFORCE_UNMERCHABLE_PET = true; //Forces players to not sell pets via merchants. (since non-named pets gets dirty name and other possible DB-related issues)
     public static final boolean USE_ENFORCE_MDOOR_POSITION = false; //Forces mystic door to be spawned near spawnpoints.
     public static final boolean USE_ERASE_PERMIT_ON_OPENSHOP = true;//Forces "shop permit" item to be consumed when player deploy his/her player shop.

src/dropspider/DataTool.java

@@ -1,129 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package dropspider;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import provider.MapleData;
-import provider.MapleDataDirectoryEntry;
-import provider.MapleDataFileEntry;
-import provider.MapleDataProvider;
-import provider.MapleDataProviderFactory;
-import provider.MapleDataTool;
-import server.MapleItemInformationProvider;
-import tools.Pair;
-
-/**
- *
- * @author Simon
- */
-public class DataTool {
-    private static Map<String, Integer> hardcodedMobs = new HashMap<>();
-    
-    private static ArrayList<Pair<Integer, String>> npc_list = null;
-    private static LinkedList<Pair<Integer, String>> mob_pairs = null;
-    private static MapleDataProvider data = MapleDataProviderFactory.getDataProvider(MapleDataProviderFactory.fileInWZPath("Mob.wz"));
-    private static HashSet<Integer> bosses = null;
-
-    public static void setHardcodedMobNames() {
-        hardcodedMobs.put("Red Slime [2]", 7120103);
-        hardcodedMobs.put("Gold Slime", 7120105);
-        hardcodedMobs.put("Nibelung [3]", 8220015);
-    }
-    
-    public static void addMonsterIdsFromHardcodedName(List<Integer> monster_ids, String monster_name) {
-        Integer id = hardcodedMobs.get(monster_name);
-        if(id != null) {
-            monster_ids.add(id);
-        }
-    }
-    
-    public static ArrayList<Integer> monsterIdsFromName(String name) {
-        MapleData data = null;
-        MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "String.wz"));
-        ArrayList<Integer> ret = new ArrayList<>();
-        data = dataProvider.getData("Mob.img");
-        if (mob_pairs == null) {
-            mob_pairs = new LinkedList<>();
-            for (MapleData mobIdData : data.getChildren()) {
-                int mobIdFromData = Integer.parseInt(mobIdData.getName());
-                String mobNameFromData = MapleDataTool.getString(mobIdData.getChildByPath("name"), "NO-NAME");
-                mob_pairs.add(new Pair<>(mobIdFromData, mobNameFromData));
-            }
-        }
-        for (Pair<Integer, String> mobPair : mob_pairs) {
-            if (mobPair.getRight().toLowerCase().equals(name.toLowerCase())) {
-                ret.add(mobPair.getLeft());
-            }
-        }
-        return ret;
-    }
-
-    private static void populateBossList() {
-        bosses = new HashSet<>();
-        MapleDataDirectoryEntry mob_data = data.getRoot();
-        for (MapleDataFileEntry mdfe : mob_data.getFiles()) {
-            MapleData boss_candidate = data.getData(mdfe.getName());
-            MapleData monsterInfoData = boss_candidate.getChildByPath("info");
-            int mid = Integer.valueOf(boss_candidate.getName().replaceAll("[^0-9]", ""));
-            boolean boss = MapleDataTool.getIntConvert("boss", monsterInfoData, 0) > 0 || mid == 8810018 || mid == 9410066;
-            if (boss) {
-                bosses.add(mid);
-            }
-        }
-    }
-
-    public static boolean isBoss(int mid) {
-        if (bosses == null) {
-            populateBossList();
-        }
-        return bosses.contains(mid);
-    }
-
-    public static ArrayList<Integer> itemIdsFromName(String name) {
-
-        ArrayList<Integer> ret = new ArrayList<>();
-        for (Pair<Integer, String> itemPair : MapleItemInformationProvider.getInstance().getAllItems()) {
-            String item_name = itemPair.getRight().toLowerCase().replaceAll("\\&quot;", "");
-            item_name = item_name.replaceAll("'", "");
-            item_name = item_name.replaceAll("\\'", "");
-
-            name = name.toLowerCase().replaceAll("\\&quot;", "");
-            name = name.replaceAll("'", "");
-            name = name.replaceAll("\\'", "");
-
-            if (item_name.equals(name)) {
-                ret.add(itemPair.getLeft());
-                return ret;
-            }
-        }
-        return ret;
-    }
-
-    public static ArrayList<Integer> npcIdsFromName(String name) {
-        MapleDataProvider dataProvider = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/" + "String.wz"));
-        ArrayList<Integer> ret = new ArrayList<>();
-        if (npc_list == null) {
-            ArrayList<Pair<Integer, String>> searchList = new ArrayList<>();
-            for (MapleData searchData : dataProvider.getData("Npc.img").getChildren()) {
-                int searchFromData = Integer.parseInt(searchData.getName());
-                String infoFromData = MapleDataTool.getString(searchData.getChildByPath("name"), "NO-NAME");
-                searchList.add(new Pair<>(searchFromData, infoFromData));
-            }
-            npc_list = searchList;
-        }
-        for (Pair<Integer, String> searched : npc_list) {
-            if (searched.getRight().toLowerCase().contains(name.toLowerCase())) {
-                ret.add(searched.getLeft());
-            }
-        }
-        return ret;
-    }
-}

src/dropspider/DropEntry.java

@@ -1,177 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package dropspider;
-
-import client.inventory.MapleInventoryType;
-import constants.ItemConstants;
-
-/**
- *
- * @author Simon
- */
-public class DropEntry {
-    private int version;
-    private int item_id;
-    private int monster_id;
-    private int chance;
-    private int mindrop;
-    private int maxdrop;
-
-    public DropEntry(int item_id, int monster_id, int version) {
-        this.item_id = item_id;
-        this.monster_id = monster_id;
-        mindrop = 1;
-        maxdrop = 1;
-        chance = calculateChance(item_id);
-        this.version = version;
-    }
-
-    private int calculateChance(int item_id) {
-        MapleInventoryType mit = ItemConstants.getInventoryType(item_id);
-        boolean boss = DataTool.isBoss(monster_id);
-        int number = (item_id / 1000) % 1000;
-        switch (mit) {
-            case EQUIP:
-                if (boss) {
-                    return 40000;
-                }
-                return 700;
-            case USE:
-                if (boss) {
-                    mindrop = 1;
-                    maxdrop = 4;
-                }
-                switch (number) {
-                    case 0: // normal potions
-                        mindrop = 1;
-                        if (version > 98) {
-                            maxdrop = 5;
-                        }
-                        return 40000;
-                    case 1: // watermelons, pills, speed potions, etc
-                    case 2: // same thing
-                        return 10000;
-                    case 3: // advanced potions from crafting (should not drop)
-                    case 4: // same thing
-                    case 11: // poison mushroom
-                    case 28: // cool items
-                    case 30: // return scrolls
-                    case 46: // gallant scrolls
-                        return 0;
-                    case 10: // strange potions like apples, eggs
-                    case 12: // drakes blood, sap of ancient tree (rare use)
-                    case 20: // salad, fried chicken, dews
-                    case 22: // air bubbles and stuff. ALSO nependeath honey but oh well
-                    case 50: // antidotes and stuff
-                        return 3000;
-                    case 290: // mastery books
-                        if(boss)
-                            return 40000;
-                        else
-                            return 1000;
-                    case 40: // Scrolls
-                    case 41: // Scrolls
-                    case 43: // Scrolls
-                    case 44: // Scrolls
-                    case 48: // pet scrolls
-                        if(boss)
-                            return 10000;
-                        else
-                            return 750;
-                    case 100: // summon bags
-                    case 101: // summon bags
-                    case 102: // summon bags
-                    case 109: // summon bags
-                    case 120: // pet food
-                    case 211: // cliffs special potion
-                    case 240: // rings
-                    case 270: // pheromone, additional weird stuff
-                    case 310: // teleport rock
-                    case 320: // weird drops
-                    case 390: // weird
-                    case 430: // Scripted items
-                    case 440: // jukebox
-                    case 460: // magnifying glass
-                    case 470: // golden hammer
-                    case 490: // crystanol
-                    case 500: // sp reset
-                        return 0;
-                    case 47: // tablets from dragon rider
-                        return 220000;
-                    case 49: // clean slats, potential scroll, ees
-                    case 70: // throwing stars
-                    case 210: // rare monster piece drops
-                    case 330: // bullets
-                        if(boss)
-                            return 2500;
-                        else
-                            return 400;
-                    case 60: // bow arrows
-                    case 61: // crossbow arrows
-                        mindrop = 10;
-                        maxdrop = 50;
-                        return 10000;
-                    case 213: // boss transfrom
-                        return 100000;
-                    case 280: // skill books
-                        if(boss)
-                            return 20000;
-                        else
-                            return 1000;
-                    case 381: // monster book things
-                    case 382:
-                    case 383:
-                    case 384:
-                    case 385:
-                    case 386:
-                    case 387:
-                    case 388:
-                        return 20000;
-                    case 510: // recipes
-                    case 511:
-                    case 512:
-                        return 10000;
-                    default:
-                        return 0;
-
-                }
-            case ETC:
-                switch (number) {
-                    case 0: // monster pieces
-                        return 200000;
-                    case 4: // crystal ores
-                    case 130: // simulators
-                    case 131: // manuals
-                        return 3000;
-                    case 30: // game pieces
-                        return 10000;
-                    case 32: // misc items
-                        return 10000;
-                    default:
-                        return 7000;
-                }
-            default:
-                return 7000;
-        }
-    }
-
-    public String getQuerySegment() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("(");
-        sb.append(monster_id);
-        sb.append(", ");
-        sb.append(item_id);
-        sb.append(", ");
-        sb.append(mindrop);//min
-        sb.append(", ");
-        sb.append(maxdrop);//max
-        sb.append(", ");
-        sb.append(0);//quest
-        sb.append(", ");
-        sb.append(chance);
-        sb.append(")");
-        return sb.toString();
-    }
-}

src/dropspider/Errors.java

@@ -1,19 +0,0 @@
-package dropspider;
-
-import java.util.LinkedList;
-
-public class Errors {
-    
-    public String mobName;
-    public LinkedList<String> wrong = new LinkedList<>();
-    
-    public String createErrorLog() {
-        StringBuilder sb = new StringBuilder();
-        
-        for (String w : wrong) {
-            sb.append(mobName).append(" : ").append(w).append("\r\n");
-        }
-        
-        return sb.toString();
-    }
-}

src/dropspider/Main.java

@@ -1,329 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package dropspider;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Scanner;
-
-/**
- *
- * @author Simon
- */
-public class Main {
-
-    private static ArrayList<DropEntry> drop_entries = new ArrayList<>();
-    private static HashMap<String, Errors> problems = new HashMap<>();
-//    private static final String TEST_STRING = " <a href=\"/items/leftover/ligator-skin\" alt=\"/tip.php?nid=2138\">Ligator Skin</a>, <a href=\"/items/leftover/the-magic-rock\" alt=\"/tip.php?nid=3954\">The Magic Rock</a>, <a href=\"/items/quest/witch-grass-leaves\" alt=\"/tip.php?nid=6129\">Witch Grass Leaves</a>    </td> ";
-    private static final String BASE_URL = "http://bbb.hidden-street.net";
-    private static final int VERSION = 83;
-    private static String[] pages = {"1-10", "11-20", "21-30", "31-40", "41-50", "51-60", "61-70", "71-80", "81-90", "91-100"};
-    private static String[] additionalPages88 = {"101-150", "151-200"};
-    private static String[] additionalPagesBB = {"101-120,", "121-140", "141-160", "161-180", "181-200"};
-
-    public static void main(String[] args) {
-        System.setProperty("wzpath", "wz");
-        
-        //DataTool.setHardcodedMobNames();
-        //parsePage("http://bbb.hidden-street.net/monster/nibelung-3");
-        
-        crawlProgram();
-        
-        dumpQuery();
-        dumpErrors();
-    }
-    
-    private static void crawlProgram() {
-        //parseMonsterSection(TEST_STRING);
-        for (String s : pages) {
-            crawlPage("http://bbb.hidden-street.net/monster/" + s);
-        }
-        if (VERSION > 92) { // big bang
-            for (String s : additionalPagesBB) {
-                crawlPage("http://bbb.hidden-street.net/monster/" + s);
-            }
-            crawlPage("http://bbb.hidden-street.net/monster/101-120?page=1"); //page 1's bugged
-        } else {
-            for (String s : additionalPages88) {
-                crawlPage("http://bbb.hidden-street.net/monster/" + s);
-            }
-        }
-    }
-
-    private static void crawlPage(String url) { //recursive method
-        try {
-            URL page = new URL(url);
-            InputStream is = page.openStream();
-            Scanner s = new Scanner(is);
-            String temp_data = "";
-            while (s.hasNext()) {
-                temp_data += s.nextLine() + "\n";
-            }
-            s.close();
-            is.close();
-            while (temp_data.contains("class=\"monster\">")) {
-                String monster_section = getStringBetween(temp_data, "class=\"monster\">", "</table>");
-                parseMonsterSection(monster_section);
-                temp_data = trimUntil(temp_data, "</table>");
-            }
-            if (temp_data.contains("Go to next page")) {
-                String next_url_segment = getStringBetween(temp_data, "<li class=\"pager-next\"><a href=\"", "\" title=\"Go to next page");
-                String next_url = BASE_URL + next_url_segment;
-                crawlPage(next_url);
-            } else {
-                System.out.println("Finished crawling section.");
-            }
-        } catch (MalformedURLException mue) {
-            mue.printStackTrace();
-            System.out.println("Error parsing URL: " + url);
-            return;
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-            System.out.println("Error reading from URL: " + ioe.getLocalizedMessage());
-            return;
-        }
-    }
-    
-    private static void parsePage(String url) { //unit method
-        try {
-            URL page = new URL(url);
-            InputStream is = page.openStream();
-            Scanner s = new Scanner(is);
-            String temp_data = "";
-            while (s.hasNext()) {
-                temp_data += s.nextLine() + "\n";
-            }
-            s.close();
-            is.close();
-            while (temp_data.contains("class=\"monster\">")) {
-                String monster_section = getStringBetween(temp_data, "class=\"monster\">", "</table>");
-                parseMonsterSection(monster_section);
-                temp_data = trimUntil(temp_data, "</table>");
-            }
-            if (temp_data.contains("Go to next page")) {
-                String next_url_segment = getStringBetween(temp_data, "<li class=\"pager-next\"><a href=\"", "\" title=\"Go to next page");
-                String next_url = BASE_URL + next_url_segment;
-                //crawlPage(next_url);
-            } else {
-                System.out.println("Finished parsing section.");
-            }
-        } catch (MalformedURLException mue) {
-            mue.printStackTrace();
-            System.out.println("Error parsing URL: " + url);
-            return;
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-            System.out.println("Error reading from URL: " + ioe.getLocalizedMessage());
-            return;
-        }
-    }
-
-    private static void parseMonsterSection(String html_data) {
-        String monster_name = getStringBetween(html_data, "alt=\"", "\" title=");
-        System.out.println(monster_name);
-        //  System.out.println(html_data);
-        //parse etc drop
-        parseItemSection(getStringBetween(html_data, "Etc. drop:</strong>", "</td>"), monster_name);
-
-        //parse useable drop
-        parseItemSection(getStringBetween(html_data, "Useable drop:</strong>", "</td>"), monster_name);
-
-        //parse ore drop
-        parseItemSection(getStringBetween(html_data, "Ore drop:</strong>", "</td>"), monster_name);
-
-        //parse equips
-        parseItemSection(getStringBetween(html_data, "Common equipment:</strong>", "</div>"), monster_name);
-        parseItemSection(getStringBetween(html_data, "Warrior equipment:</strong>", "</div>"), monster_name);
-        parseItemSection(getStringBetween(html_data, "Magician equipment:</strong>", "</div>"), monster_name);
-        parseItemSection(getStringBetween(html_data, "Bowman equipment:</strong>", "</div>"), monster_name);
-        parseItemSection(getStringBetween(html_data, "Thief equipment:</strong>", "</div>"), monster_name);
-        parseItemSection(getStringBetween(html_data, "Pirate equipment:</strong>", "</div>"), monster_name);
-
-        //System.out.println(monster_name);
-    }
-
-    private static void parseItemSection(String html_data, String monster_name) {
-        String temp_data = html_data;
-        while (temp_data.contains("<a href")) {
-            //  System.out.println("Temp_data: " + temp_data);
-            String s1 = trimUntil(temp_data, ">");
-            String item_name = getStringBetween(s1, "", "</a>");
-            temp_data = trimUntil(temp_data, "</a>");
-
-            boolean gender_equip = false;
-            if (item_name.contains("(M)") || item_name.contains("(F)")) {
-                item_name = item_name.replaceAll("(\\(M\\))|(\\(F\\))", "");
-                gender_equip = true;
-            }
-            item_name = item_name.replaceAll("Throwing-Star", "Throwing-Stars").trim();
-            item_name = item_name.replaceAll("for Magic Attack", "for Magic Att.").trim();
-            item_name = item_name.replaceAll("\\(50%\\)", "").trim();
-            item_name = item_name.replaceAll("\\(70%\\)", "").trim();
-            item_name = item_name.replaceAll("\\'s", "").trim();
-            
-            
-            monster_name = monster_name.replaceAll("Horntail\\'s Head B", "Horntail");
-            // Process scrolls, nexon doesn't have the % on most of the scrolls. So we need to remove it
-            // Unfortunately they do for some, so we have to handle that too.
-            boolean scroll = false;
-            int scrollType = 0;
-            
-            if(item_name.contains("100%")) {
-                scroll = true;
-                item_name = item_name.replaceAll("100%", "").trim();
-                item_name = item_name.replaceAll("\\(\\)", "").trim(); // Hidden Street has a few scroll %'s with ()s around them.. sigh
-            } else if(item_name.contains("60%")) {
-                scroll = true;
-                scrollType = 1;
-                item_name = item_name.replaceAll("60%", "").trim();
-                item_name = item_name.replaceAll("\\(\\)", "").trim();
-            } else if(item_name.contains("10%")) {
-                scroll = true;
-                scrollType = 2;
-                item_name = item_name.replaceAll("10%", "").trim();
-                item_name = item_name.replaceAll("\\(\\)", "").trim();
-                //f(item_name.contains(" ()")) item_name = item_name.substring(0, item_name.lastIndexOf(" ("));
-            } else if(item_name.contains("70%")) {
-                scroll = true;
-                scrollType = 4;
-                item_name = item_name.replaceAll("70%", "").trim();
-                item_name = item_name.replaceAll("\\(\\)", "").trim();
-            } else if(item_name.contains("30%")) {
-                scroll = true;
-                scrollType = 5;
-                item_name = item_name.replaceAll("30%", "").trim();
-                item_name = item_name.replaceAll("\\(\\)", "").trim();
-            }
-                
-            
-//            System.out.println("Item name: " + item_name);
-
-            //drop entry
-            ArrayList<Integer> monster_ids = DataTool.monsterIdsFromName(monster_name);
-            //DataTool.addMonsterIdsFromHardcodedName(monster_ids, monster_name);
-            
-            ArrayList<Integer> item_ids = DataTool.itemIdsFromName(item_name);
-            
-            if(scroll && item_ids.isEmpty()) {
-                // Try adding on the % again. Thanks nexon...
-                if(scrollType == 0) item_name += " 100%";
-                if(scrollType == 1) item_name += " 60%";
-                if(scrollType == 2) item_name += " 10%";
-                if(scrollType == 4) item_name += " 70%";
-                if(scrollType == 5) item_name += " 30%";
-                
-                item_ids = DataTool.itemIdsFromName(item_name);
-            }
-
-            if (!monster_ids.isEmpty() && !item_ids.isEmpty()) {
-                int item_id = item_ids.get(0);
-                if(scroll) {
-                    item_id += scrollType;
-                }
-                int item_id_2 = -1;
-                for (Integer mob_id : monster_ids) {
-                    System.out.println("Monster ID: " + mob_id + ", Item ID: " + item_id);
-                    drop_entries.add(new DropEntry(item_id, mob_id, VERSION));
-                    if (gender_equip && item_ids.size() > 1) {
-                        item_id_2 = item_ids.get(1);
-                        drop_entries.add(new DropEntry(item_id_2, mob_id, VERSION));
-
-                    }
-                }
-            } else {
-                System.out.println("Error parsing item " + item_name + " dropped by " + monster_name + ".");
-
-                if (!monster_ids.isEmpty()) {
-                    if (!problems.containsKey(monster_name)) {
-                        Errors e = new Errors();
-                        e.mobName = monster_name;
-
-                        problems.put(monster_name, e);
-                    }
-
-                    problems.get(monster_name).wrong.add(item_name);
-                }
-                //System.out.println("Monster ids size: " + monster_ids.size() + ", Item IDs size: " + item_ids.size());
-            }
-
-        }
-    }
-
-    /**
-     * Returns the string lying between the two specified strings.
-     *
-     * @param line The string to parse
-     * @param start The first string
-     * @param end The last string
-     * @return The string between the two specified strings
-     */
-    public static String getStringBetween(String line, String start, String end) {
-        int start_offset = line.indexOf(start) + start.length();
-        return line.substring(start_offset, line.substring(start_offset).indexOf(end) + start_offset);
-    }
-
-    public static String trimUntil(String line, String until) {
-        int until_pos = line.indexOf(until);
-        if (until_pos == -1) {
-            return null;
-        } else {
-            return line.substring(until_pos + until.length());
-        }
-    }
-
-    public static void dumpErrors() {
-        String file = "errors.txt";
-        try {
-            File f = new File(file);
-            BufferedWriter bw = new BufferedWriter(new FileWriter(f));
-            PrintWriter pw = new PrintWriter(bw);
-
-            for (Errors err : problems.values()) {
-                pw.write(err.createErrorLog());
-            }
-
-            pw.flush();
-
-            pw.close();
-            bw.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void dumpQuery() {
-        String filename = "drops.sql";
-        try {
-            File output = new File(filename);
-            BufferedWriter bw = new BufferedWriter(new FileWriter(output));
-            PrintWriter pw = new PrintWriter(bw);
-            StringBuilder sb = new StringBuilder();
-            pw.write("TRUNCATE TABLE `drop_data`;\r\n");
-            pw.write("INSERT INTO `drop_data` (`dropperid`, `itemid`, `minimum_quantity`, `maximum_quantity`, `questid`, `chance`) VALUES ");
-            for (Iterator<DropEntry> i = drop_entries.iterator(); i.hasNext();) {
-                DropEntry de = i.next();
-                pw.write(de.getQuerySegment());
-                if (i.hasNext()) {
-                    pw.write(", \r\n");
-                }
-            }
-            pw.write(sb.toString());
-            pw.close();
-            bw.close();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-            System.out.println("Error writing to file: " + ioe.getLocalizedMessage());
-        }
-    }
-}

src/net/AbstractMaplePacketHandler.java

@@ -22,10 +22,15 @@
 package net;
 
 import client.MapleClient;
+import net.server.Server;
 
 public abstract class AbstractMaplePacketHandler implements MaplePacketHandler {
     @Override
     public boolean validateState(MapleClient c) {
         return c.isLoggedIn();
     }
+    
+    protected static long currentServerTime() {
+        return Server.getInstance().getCurrentTime();
+    }
 }

src/net/server/Server.java

@@ -114,6 +114,7 @@ public class Server {
     private final List<MapleClient> registeredDiseaseAnnouncePlayers = new LinkedList<>();
     
     private final AtomicLong currentTime = new AtomicLong(0);
+    private long serverCurrentTime = 0;
     
     private boolean availableDeveloperRoom = false;
     private boolean online = false;
@@ -126,20 +127,22 @@ public class Server {
         return instance;
     }
 
+    public long getCurrentTime() {  // returns a slightly delayed time value, under frequency of UPDATE_INTERVAL
+        return serverCurrentTime;
+    }
+    
     public void updateCurrentTime() {
-        currentTime.addAndGet(ServerConstants.UPDATE_INTERVAL);
+        serverCurrentTime = currentTime.addAndGet(ServerConstants.UPDATE_INTERVAL);
     }
     
     public long forceUpdateCurrentTime() {
         long timeNow = System.currentTimeMillis();
+        serverCurrentTime = timeNow;
         currentTime.set(timeNow);
+        
         return timeNow;
     }
     
-    public long getCurrentTime() {  // returns a slightly delayed time value
-        return currentTime.get();
-    }
-    
     public boolean isOnline() {
         return online;
     }
@@ -953,6 +956,34 @@ public class Server {
     }
     */
     
+    public Pair<Pair<Integer, List<MapleCharacter>>, List<Pair<Integer, List<MapleCharacter>>>> loadAccountCharlist(Integer accountId) {
+        List<World> wlist = worlds;
+        List<Pair<Integer, List<MapleCharacter>>> accChars = new ArrayList<>(wlist.size() + 1);
+        int chrTotal = 0;
+        List<MapleCharacter> lastwchars = null;
+        
+        lgnRLock.lock();
+        try {
+            for(World w : wlist) {
+                List<MapleCharacter> wchars = w.getAccountCharactersView(accountId);
+                if(wchars == null) {
+                    if(!accountChars.containsKey(accountId)) {
+                        accountChars.put(accountId, new HashSet<Integer>());    // not advisable at all to write on the map on a read-protected environment
+                    }                                                           // yet it's known there's no problem since no other point in the source does
+                } else if(!wchars.isEmpty()) {                                  // this action.
+                    lastwchars = wchars;
+
+                    accChars.add(new Pair<>(w.getId(), wchars));
+                    chrTotal += wchars.size();
+                }
+            }
+        } finally {
+            lgnRLock.unlock();
+        }
+        
+        return new Pair<>(new Pair<>(chrTotal, lastwchars), accChars);
+    }
+    
     private static List<List<MapleCharacter>> loadAccountCharactersViewFromDb(MapleClient c, int wlen) {
         List<List<MapleCharacter>> wchars = new ArrayList<>(wlen);
         for(int i = 0; i < wlen; i++) wchars.add(i, new LinkedList<MapleCharacter>());
@@ -1003,8 +1034,8 @@ public class Server {
         return wchars;
     }
     
-    public void loadAccountCharactersView(MapleClient c) {
-        int accId = c.getAccID();
+    public void loadAccountCharacters(MapleClient c) {
+        Integer accId = c.getAccID();
         int gmLevel = 0;
         boolean firstAccountLogin;
         

src/net/server/channel/Channel.java

@@ -89,6 +89,7 @@ public final class Channel {
     private EventScriptManager eventSM;
     private MobStatusScheduler mobStatusSchedulers[] = new MobStatusScheduler[4];
     private MobAnimationScheduler mobAnimationSchedulers[] = new MobAnimationScheduler[4];
+    private FaceExpressionScheduler faceExpressionSchedulers[] = new FaceExpressionScheduler[4];
     private OverallScheduler channelSchedulers[] = new OverallScheduler[4];
     private Map<Integer, MapleHiredMerchant> hiredMerchants = new HashMap<>();
     private final Map<Integer, Integer> storedVars = new HashMap<>();
@@ -120,6 +121,8 @@ public final class Channel {
     private ReadLock merchRlock = merchantLock.readLock();
     private WriteLock merchWlock = merchantLock.writeLock();
     
+    private Lock faceLock[] = new MonitoredReentrantLock[4];
+    
     private Lock lock = new MonitoredReentrantLock(MonitoredLockType.CHANNEL, true);
     
     public Channel(final int world, final int channel, long startTime) {
@@ -157,8 +160,11 @@ public final class Channel {
             }
             
             for(int i = 0; i < 4; i++) {
+                faceLock[i] = new MonitoredReentrantLock(MonitoredLockType.CHANNEL_FACEEXPRS, true);
+                
                 mobStatusSchedulers[i] = new MobStatusScheduler();
                 mobAnimationSchedulers[i] = new MobAnimationScheduler();
+                faceExpressionSchedulers[i] = new FaceExpressionScheduler(faceLock[i]);
                 channelSchedulers[i] = new OverallScheduler();
             }
             
@@ -870,6 +876,40 @@ public final class Channel {
         channelSchedulers[getChannelSchedulerIndex(mapid)].forceRunDelayedAction(runAction);
     }
     
+    public void registerFaceExpression(final MapleMap map, final MapleCharacter chr, int emote) {
+        int lockid = getChannelSchedulerIndex(map.getId());
+        
+        Runnable cancelAction = new Runnable() {
+            @Override
+            public void run() {
+                if(chr.isLoggedinWorld()) {
+                    map.broadcastMessage(chr, MaplePacketCreator.facialExpression(chr, 0), false);
+                }
+            }
+        };
+        
+        faceLock[lockid].lock();
+        try {
+            if(chr.isLoggedinWorld()) {
+                faceExpressionSchedulers[lockid].registerFaceExpression(chr.getId(), cancelAction);
+                map.broadcastMessage(chr, MaplePacketCreator.facialExpression(chr, emote), false);
+            }
+        } finally {
+            faceLock[lockid].unlock();
+        }
+    }
+    
+    public void unregisterFaceExpression(int mapid, MapleCharacter chr) {
+        int lockid = getChannelSchedulerIndex(mapid);
+        
+        faceLock[lockid].lock();
+        try {
+            faceExpressionSchedulers[lockid].unregisterFaceExpression(chr.getId());
+        } finally {
+            faceLock[lockid].unlock();
+        }
+    }
+    
     public void debugMarriageStatus() {
         System.out.println(" ----- WORLD DATA -----");
         Server.getInstance().getWorld(world).debugMarriageStatus();

src/net/server/channel/handlers/AranComboHandler.java

@@ -36,7 +36,7 @@ public class AranComboHandler extends AbstractMaplePacketHandler {
         final MapleCharacter player = c.getPlayer();
         int skillLevel = player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_ABILITY));
         if (GameConstants.isAran(player.getJob().getId()) && (skillLevel > 0 || player.getJob().getId() == 2000)) {
-            final long currentTime = System.currentTimeMillis();
+            final long currentTime = currentServerTime();
             short combo = player.getCombo();
             if ((currentTime - player.getLastCombo()) > 3000 && combo > 0) {
                 combo = 0;                

src/net/server/channel/handlers/BBSOperationHandler.java

@@ -133,7 +133,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
             ps = con.prepareStatement("INSERT INTO bbs_replies " + "(`threadid`, `postercid`, `timestamp`, `content`) VALUES " + "(?, ?, ?, ?)");
             ps.setInt(1, threadid);
             ps.setInt(2, c.getPlayer().getId());
-            ps.setLong(3, System.currentTimeMillis());
+            ps.setLong(3, currentServerTime());
             ps.setString(4, text);
             ps.execute();
             ps.close();
@@ -157,7 +157,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
             Connection con = DatabaseConnection.getConnection();
             try (PreparedStatement ps = con.prepareStatement("UPDATE bbs_threads SET `name` = ?, `timestamp` = ?, " + "`icon` = ?, " + "`startpost` = ? WHERE guildid = ? AND localthreadid = ? AND (postercid = ? OR ?)")) {
                 ps.setString(1, title);
-                ps.setLong(2, System.currentTimeMillis());
+                ps.setLong(2, currentServerTime());
                 ps.setInt(3, icon);
                 ps.setString(4, text);
                 ps.setInt(5, c.getGuildId());
@@ -194,7 +194,7 @@ public final class BBSOperationHandler extends AbstractMaplePacketHandler {
             ps = con.prepareStatement("INSERT INTO bbs_threads " + "(`postercid`, `name`, `timestamp`, `icon`, `startpost`, " + "`guildid`, `localthreadid`) " + "VALUES(?, ?, ?, ?, ?, ?, ?)");
             ps.setInt(1, c.getId());
             ps.setString(2, title);
-            ps.setLong(3, System.currentTimeMillis());
+            ps.setLong(3, currentServerTime());
             ps.setInt(4, icon);
             ps.setString(5, text);
             ps.setInt(6, c.getGuildId());

src/net/server/channel/handlers/ChangeMapSpecialHandler.java

@@ -35,7 +35,7 @@ public final class ChangeMapSpecialHandler extends AbstractMaplePacketHandler {
             String startwp = slea.readMapleAsciiString();
             slea.readShort();
             MaplePortal portal = c.getPlayer().getMap().getPortal(startwp);
-            if (portal == null || c.getPlayer().portalDelay() > System.currentTimeMillis() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) {
+            if (portal == null || c.getPlayer().portalDelay() > currentServerTime() || c.getPlayer().getBlockedPortals().contains(portal.getScriptName())) {
                     c.announce(MaplePacketCreator.enableActions());
                     return;
             }

src/net/server/channel/handlers/CloseRangeDamageHandler.java

@@ -50,9 +50,9 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter chr = c.getPlayer();
-        chr.setPetLootCd(System.currentTimeMillis());
+        chr.setPetLootCd(currentServerTime());
         
-        /*long timeElapsed = System.currentTimeMillis() - chr.getAutobanManager().getLastSpam(8);
+        /*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
         if(timeElapsed < 300) {
                 AutobanFactory.FAST_ATTACK.alert(chr, "Time: " + timeElapsed);
         }
@@ -115,7 +115,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
                         int duration = combo.getEffect(olv).getDuration();
                         List<Pair<MapleBuffStat, Integer>> stat = Collections.singletonList(new Pair<>(MapleBuffStat.COMBO, neworbcount));
                         chr.setBuffedValue(MapleBuffStat.COMBO, neworbcount);                 
-                        duration -= (int) (System.currentTimeMillis() - chr.getBuffedStarttime(MapleBuffStat.COMBO));
+                        duration -= (int) (currentServerTime() - chr.getBuffedStarttime(MapleBuffStat.COMBO));
                         c.announce(MaplePacketCreator.giveBuff(oid, duration, stat));
                         chr.getMap().broadcastMessage(chr, MaplePacketCreator.giveForeignBuff(chr.getId(), stat), false);
                     }
@@ -174,7 +174,7 @@ public final class CloseRangeDamageHandler extends AbstractDealDamageHandler {
                     return;
                 } else {
                     c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
-                    chr.addCooldown(attack.skill, System.currentTimeMillis(), effect_.getCooldown() * 1000);
+                    chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
                 }
             }
         }

src/net/server/channel/handlers/CoconutHandler.java

@@ -50,7 +50,7 @@ public final class CoconutHandler extends AbstractMaplePacketHandler {
 		if (event == null){
 			return;
 		}
-		if (System.currentTimeMillis() < nut.getHitTime()){
+		if (currentServerTime() < nut.getHitTime()){
 			return;
 		}
 		if (nut.getHits() > 2 && Math.random() < 0.4) {

src/net/server/channel/handlers/FaceExpressionHandler.java

@@ -22,21 +22,32 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
+import client.MapleCharacter;
 import constants.ItemConstants;
 import net.AbstractMaplePacketHandler;
-import tools.MaplePacketCreator;
 import tools.data.input.SeekableLittleEndianAccessor;
 
 public final class FaceExpressionHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
+        MapleCharacter chr = c.getPlayer();
         int emote = slea.readInt();
+        
         if (emote > 7) {
             int emoteid = 5159992 + emote;
-            if (c.getPlayer().getInventory(ItemConstants.getInventoryType(emoteid)).findById(emoteid) == null) {
+            if (chr.getInventory(ItemConstants.getInventoryType(emoteid)).findById(emoteid) == null) {
                 return;
             }
         }
-        c.getPlayer().getMap().broadcastMessage(c.getPlayer(), MaplePacketCreator.facialExpression(c.getPlayer(), emote), false);
+        
+        if(c.trylockClient()) {
+            try {   // expecting players never intends to wear the emote 0 (default face, that changes back after 5sec timeout)
+                if (emote != 0 && chr.isLoggedinWorld()) {
+                    chr.changeFaceExpression(emote);
+                }
+            } finally {
+                c.unlockClient();
+            }
+        }
     }
 }

src/net/server/channel/handlers/GeneralChatHandler.java

@@ -45,7 +45,7 @@ public final class GeneralChatHandler extends AbstractMaplePacketHandler {
         public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
                 String s = slea.readMapleAsciiString();
                 MapleCharacter chr = c.getPlayer();
-                if(chr.getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
+                if(chr.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
                         c.announce(MaplePacketCreator.enableActions());
                         return;
                 }

src/net/server/channel/handlers/GuildOperationHandler.java

@@ -60,7 +60,7 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
         public Invited(String n, int id) {
             name = n.toLowerCase();
             gid = id;
-            expiration = System.currentTimeMillis() + 60 * 60 * 1000;
+            expiration = currentServerTime() + 60 * 60 * 1000;
         }
 
         @Override
@@ -81,20 +81,20 @@ public final class GuildOperationHandler extends AbstractMaplePacketHandler {
         }
     }
     private java.util.List<Invited> invited = new java.util.LinkedList<Invited>();
-    private long nextPruneTime = System.currentTimeMillis() + 20 * 60 * 1000;
+    private long nextPruneTime = currentServerTime() + 20 * 60 * 1000;
 
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
-        if (System.currentTimeMillis() >= nextPruneTime) {
+        if (currentServerTime() >= nextPruneTime) {
             Iterator<Invited> itr = invited.iterator();
             Invited inv;
             while (itr.hasNext()) {
                 inv = itr.next();
-                if (System.currentTimeMillis() >= inv.expiration) {
+                if (currentServerTime() >= inv.expiration) {
                     itr.remove();
                 }
             }
-            nextPruneTime = System.currentTimeMillis() + 20 * 60 * 1000;
+            nextPruneTime = currentServerTime() + 20 * 60 * 1000;
         }
         MapleCharacter mc = c.getPlayer();
         byte type = slea.readByte();

src/net/server/channel/handlers/InventoryMergeHandler.java

@@ -47,52 +47,57 @@ public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
 	}
 		
 	MapleInventory inventory = c.getPlayer().getInventory(inventoryType);
+        inventory.lockInventory();
+        try {
+            //------------------- RonanLana's SLOT MERGER -----------------
         
-        //------------------- RonanLana's SLOT MERGER -----------------
-        
-        MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
-        Item srcItem, dstItem;
+            MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+            Item srcItem, dstItem;
 
-        for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
-            dstItem = inventory.getItem(dst);
-            if(dstItem == null) continue;
+            for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
+                dstItem = inventory.getItem(dst);
+                if(dstItem == null) continue;
 
-            for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
-                srcItem = inventory.getItem(src);
-                if(srcItem == null) continue;
+                for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
+                    srcItem = inventory.getItem(src);
+                    if(srcItem == null) continue;
 
-                if(dstItem.getItemId() != srcItem.getItemId()) continue;
-                if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
+                    if(dstItem.getItemId() != srcItem.getItemId()) continue;
+                    if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
 
-                MapleInventoryManipulator.move(c, inventoryType, src, dst);
-            }
-        }
-        
-        //------------------------------------------------------------
-                
-        inventory = c.getPlayer().getInventory(inventoryType);
-        boolean sorted = false;
-
-        while (!sorted) {
-            short freeSlot = inventory.getNextFreeSlot();
-
-            if (freeSlot != -1) {
-                short itemSlot = -1;
-                for (short i = (short) (freeSlot + 1); i <= inventory.getSlotLimit(); i = (short) (i + 1)) {
-                    if (inventory.getItem(i) != null) {
-                        itemSlot = i;
-                        break;
-                    }
+                    MapleInventoryManipulator.move(c, inventoryType, src, dst);
                 }
-                if (itemSlot > 0) {
-                    MapleInventoryManipulator.move(c, inventoryType, itemSlot, freeSlot);
+            }
+
+            //------------------------------------------------------------
+
+            inventory = c.getPlayer().getInventory(inventoryType);
+            boolean sorted = false;
+
+            while (!sorted) {
+                short freeSlot = inventory.getNextFreeSlot();
+
+                if (freeSlot != -1) {
+                    short itemSlot = -1;
+                    for (short i = (short) (freeSlot + 1); i <= inventory.getSlotLimit(); i = (short) (i + 1)) {
+                        if (inventory.getItem(i) != null) {
+                            itemSlot = i;
+                            break;
+                        }
+                    }
+                    if (itemSlot > 0) {
+                        MapleInventoryManipulator.move(c, inventoryType, itemSlot, freeSlot);
+                    } else {
+                        sorted = true;
+                    }
                 } else {
                     sorted = true;
                 }
-            } else {
-                sorted = true;
             }
+        } finally {
+            inventory.unlockInventory();
         }
+        
         c.announce(MaplePacketCreator.finishedSort(inventoryType.getType()));
         c.announce(MaplePacketCreator.enableActions());
     }

src/net/server/channel/handlers/InventorySortHandler.java

@@ -199,33 +199,38 @@ public final class InventorySortHandler extends AbstractMaplePacketHandler {
             c.disconnect(false, false);
             return;
         }
-		
-        MapleInventory inventory = chr.getInventory(MapleInventoryType.getByType(inventoryType));
-        
+	
         ArrayList<Item> itemarray = new ArrayList<>();
         List<ModifyInventory> mods = new ArrayList<>();
         
-        for (short i = 1; i <= inventory.getSlotLimit(); i++) {
-            Item item = inventory.getItem(i);
-            if (item != null) {
-            	itemarray.add((Item) item.copy());
+        MapleInventory inventory = chr.getInventory(MapleInventoryType.getByType(inventoryType));
+        inventory.lockInventory();
+        try {
+            for (short i = 1; i <= inventory.getSlotLimit(); i++) {
+                Item item = inventory.getItem(i);
+                if (item != null) {
+                    itemarray.add((Item) item.copy());
+                }
             }
+
+            for (Item item : itemarray) {
+                    inventory.removeSlot(item.getPosition());
+                    mods.add(new ModifyInventory(3, item));
+            }
+
+            int invTypeCriteria = (MapleInventoryType.getByType(inventoryType) == MapleInventoryType.EQUIP) ? 3 : 1;
+            int sortCriteria = (ServerConstants.USE_ITEM_SORT_BY_NAME == true) ? 2 : 0;
+            PairedQuicksort pq = new PairedQuicksort(itemarray, sortCriteria, invTypeCriteria);
+
+            for (Item item : itemarray) {
+                inventory.addItem(item);
+                mods.add(new ModifyInventory(0, item.copy()));//to prevent crashes
+            }
+            itemarray.clear();
+        } finally {
+            inventory.unlockInventory();
         }
         
-        for (Item item : itemarray) {
-                inventory.removeSlot(item.getPosition());
-                mods.add(new ModifyInventory(3, item));
-        }
-        
-        int invTypeCriteria = (MapleInventoryType.getByType(inventoryType) == MapleInventoryType.EQUIP) ? 3 : 1;
-        int sortCriteria = (ServerConstants.USE_ITEM_SORT_BY_NAME == true) ? 2 : 0;
-        PairedQuicksort pq = new PairedQuicksort(itemarray, sortCriteria, invTypeCriteria);
-        
-        for (Item item : itemarray) {
-            inventory.addItem(item);
-	    mods.add(new ModifyInventory(0, item.copy()));//to prevent crashes
-        }
-        itemarray.clear();
         c.announce(MaplePacketCreator.modifyInventory(true, mods));
         c.announce(MaplePacketCreator.finishedSort2(inventoryType));
         c.announce(MaplePacketCreator.enableActions());

src/net/server/channel/handlers/ItemMoveHandler.java

@@ -36,7 +36,7 @@ public final class ItemMoveHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         slea.skip(4);
-        if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > System.currentTimeMillis()) {
+        if(c.getPlayer().getAutobanManager().getLastSpam(6) + 300 > currentServerTime()) {
             c.announce(MaplePacketCreator.enableActions());
             return;
         }

src/net/server/channel/handlers/ItemRewardHandler.java

@@ -56,7 +56,7 @@ public final class ItemRewardHandler extends AbstractMaplePacketHandler {
             	if (ItemConstants.getInventoryType(reward.itemid) == MapleInventoryType.EQUIP) {
                     final Item item = ii.getEquipById(reward.itemid);
                     if (reward.period != -1) {
-                    	item.setExpiration(System.currentTimeMillis() + (reward.period * 60 * 60 * 10));
+                    	item.setExpiration(currentServerTime() + (reward.period * 60 * 60 * 10));
                     }
                     MapleInventoryManipulator.addFromDrop(c, item, false);
                 } else {

src/net/server/channel/handlers/MagicDamageHandler.java

@@ -39,9 +39,9 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
 	@Override
 	public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
 		MapleCharacter chr = c.getPlayer();
-                chr.setPetLootCd(System.currentTimeMillis());
+                chr.setPetLootCd(currentServerTime());
 
-		/*long timeElapsed = System.currentTimeMillis() - chr.getAutobanManager().getLastSpam(8);
+		/*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
 		if(timeElapsed < 300) {
 			AutobanFactory.FAST_ATTACK.alert(chr, "Time: " + timeElapsed);
 		}
@@ -74,7 +74,7 @@ public final class MagicDamageHandler extends AbstractDealDamageHandler {
 				return;
 			} else {
 				c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
-				chr.addCooldown(attack.skill, System.currentTimeMillis(), effect_.getCooldown() * 1000);
+				chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
 			}
 		}
 		applyAttack(attack, chr, effect.getAttackCount());

src/net/server/channel/handlers/MoveLifeHandler.java

@@ -26,7 +26,6 @@ import client.MapleClient;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.List;
-import net.server.Server;
 import server.life.MapleMonster;
 import server.life.MapleMonsterInformationProvider;
 //import server.life.MobAttackInfo;
@@ -102,7 +101,7 @@ public final class MoveLifeHandler extends AbstractMovementPacketHandler {
                                 toUse = MobSkillFactory.getMobSkill(nextCastSkill, nextCastSkillLevel);
                                 
                                 if (!isSkill && !isAttack) {
-                                        long curtime = Server.getInstance().getCurrentTime();
+                                        long curtime = currentServerTime();
                                         if(curtime >= monster.getNextBasicSkillTime()) {  // dont use the special attack too often, chase the player f3
                                                 //MobAttackInfo mobAttack = MobAttackInfoFactory.getMobAttackInfo(monster, attackId);
                                                 monster.setNextBasicSkillTime(curtime);

src/net/server/channel/handlers/MultiChatHandler.java

@@ -35,7 +35,7 @@ public final class MultiChatHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter player = c.getPlayer();
-        if(player.getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
+        if(player.getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
                 return;
         }
         

src/net/server/channel/handlers/NPCTalkHandler.java

@@ -41,7 +41,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler {
             return;
         }
         
-        if(System.currentTimeMillis() - c.getPlayer().getNpcCooldown() < ServerConstants.BLOCK_NPC_RACE_CONDT) {
+        if(currentServerTime() - c.getPlayer().getNpcCooldown() < ServerConstants.BLOCK_NPC_RACE_CONDT) {
             c.announce(MaplePacketCreator.enableActions());
             return;
         }
@@ -53,7 +53,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler {
             if(ServerConstants.USE_DEBUG == true) c.getPlayer().dropMessage(5, "Talking to NPC " + npc.getId());
             
             if (npc.getId() == 9010009) {   //is duey
-                c.getPlayer().setNpcCooldown(System.currentTimeMillis());
+                c.getPlayer().setNpcCooldown(currentServerTime());
                 DueyProcessor.dueySendTalk(c);
             } else {
                 if (c.getCM() != null || c.getQM() != null) {

src/net/server/channel/handlers/PetFoodHandler.java

@@ -38,7 +38,7 @@ public final class PetFoodHandler extends AbstractMaplePacketHandler {
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter chr = c.getPlayer();
         AutobanManager abm = chr.getAutobanManager();
-        if (abm.getLastSpam(2) + 500 > System.currentTimeMillis()) {
+        if (abm.getLastSpam(2) + 500 > currentServerTime()) {
             c.announce(MaplePacketCreator.enableActions());
             return;
         }

src/net/server/channel/handlers/PetLootHandler.java

@@ -42,7 +42,7 @@ public final class PetLootHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter chr = c.getPlayer();
-        if(System.currentTimeMillis() - chr.getPetLootCd() < ServerConstants.PET_LOOT_UPON_ATTACK) {
+        if(currentServerTime() - chr.getPetLootCd() < ServerConstants.PET_LOOT_UPON_ATTACK) {
             c.announce(MaplePacketCreator.enableActions());
             return;
         }

src/net/server/channel/handlers/PlayerInteractionHandler.java

@@ -201,22 +201,20 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     chr.getClient().announce(MaplePacketCreator.getMiniRoomError(6));
                     return;
                 }
-
-                if (itemId > 5030000 && itemId < 5030012 || itemId > 5140000 && itemId < 5140006) {
-                    if (createType == 4) {
-                        MaplePlayerShop shop = new MaplePlayerShop(chr, desc);
-                        chr.setPlayerShop(shop);
-                        chr.getMap().addMapObject(shop);
-                        shop.sendShop(c);
-                        c.getWorldServer().registerPlayerShop(shop);
-                        //c.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(1));
-                    } else {
-                        MapleHiredMerchant merchant = new MapleHiredMerchant(chr, itemId, desc);
-                        chr.setHiredMerchant(merchant);
-                        c.getWorldServer().registerHiredMerchant(merchant);
-                        chr.getClient().getChannelServer().addHiredMerchant(chr.getId(), merchant);
-                        chr.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, true));
-                    }
+                
+                if (ItemConstants.isPlayerShop(itemId)) {
+                    MaplePlayerShop shop = new MaplePlayerShop(chr, desc);
+                    chr.setPlayerShop(shop);
+                    chr.getMap().addMapObject(shop);
+                    shop.sendShop(c);
+                    c.getWorldServer().registerPlayerShop(shop);
+                    //c.announce(MaplePacketCreator.getPlayerShopRemoveVisitor(1));
+                } else if (ItemConstants.isHiredMerchant(itemId)) {
+                    MapleHiredMerchant merchant = new MapleHiredMerchant(chr, itemId, desc);
+                    chr.setHiredMerchant(merchant);
+                    c.getWorldServer().registerHiredMerchant(merchant);
+                    chr.getClient().getChannelServer().addHiredMerchant(chr.getId(), merchant);
+                    chr.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, true));
                 }
             }
         } else if (mode == Action.INVITE.getCode()) {
@@ -473,12 +471,18 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             	FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " might of possibly packet edited Hired Merchants\nperBundle: " + perBundle + "\nperBundle * bundles (This multiplied cannot be greater than 2000): " + perBundle * bundles + "\nbundles: " + bundles + "\nprice: " + price);
                 return;
             }
-            Item sellItem = ivItem.copy();
-            if (ServerConstants.USE_ENFORCE_UNMERCHABLE_PET && ItemConstants.isPet(ivItem.getItemId())) {
-                c.announce(MaplePacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Shop."));
+            
+            if(ServerConstants.USE_ENFORCE_UNMERCHABLE_CASH && MapleItemInformationProvider.getInstance().isCash(ivItem.getItemId())) {
+                c.announce(MaplePacketCreator.serverNotice(1, "Cash items are not allowed to be sold on the Player Store."));
                 return;
             }
             
+            if (ServerConstants.USE_ENFORCE_UNMERCHABLE_PET && ItemConstants.isPet(ivItem.getItemId())) {
+                c.announce(MaplePacketCreator.serverNotice(1, "Pets are not allowed to be sold on the Player Store."));
+                return;
+            }
+            
+            Item sellItem = ivItem.copy();
             if(!ItemConstants.isRechargeable(ivItem.getItemId())) {
                 sellItem.setQuantity(perBundle);
             }

src/net/server/channel/handlers/PlayerLoggedinHandler.java

@@ -343,7 +343,7 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
     
     private static List<Pair<Long, PlayerBuffValueHolder>> getLocalStartTimes(List<PlayerBuffValueHolder> lpbvl) {
         List<Pair<Long, PlayerBuffValueHolder>> timedBuffs = new ArrayList<>();
-        long curtime = System.currentTimeMillis();
+        long curtime = currentServerTime();
         
         for(PlayerBuffValueHolder pb : lpbvl) {
             timedBuffs.add(new Pair<>(curtime - pb.usedTime, pb));

src/net/server/channel/handlers/RangedAttackHandler.java

@@ -51,9 +51,9 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter chr = c.getPlayer();
-        chr.setPetLootCd(System.currentTimeMillis());
+        chr.setPetLootCd(currentServerTime());
 		
-        /*long timeElapsed = System.currentTimeMillis() - chr.getAutobanManager().getLastSpam(8);
+        /*long timeElapsed = currentServerTime() - chr.getAutobanManager().getLastSpam(8);
         if(timeElapsed < 300) {
             AutobanFactory.FAST_ATTACK.alert(chr, "Time: " + timeElapsed);
         }
@@ -218,7 +218,7 @@ public final class RangedAttackHandler extends AbstractDealDamageHandler {
                             return;
                         } else {
                             c.announce(MaplePacketCreator.skillCooldown(attack.skill, effect_.getCooldown()));
-                            chr.addCooldown(attack.skill, System.currentTimeMillis(), effect_.getCooldown() * 1000);
+                            chr.addCooldown(attack.skill, currentServerTime(), effect_.getCooldown() * 1000);
                         }
                     }
                 }

src/net/server/channel/handlers/SnowballHandler.java

@@ -44,10 +44,10 @@ public final class SnowballHandler extends AbstractMaplePacketHandler{
         //slea.skip(4);
 
         if (snowball == null || othersnowball == null || snowball.getSnowmanHP() == 0) return;
-        if ((System.currentTimeMillis() - chr.getLastSnowballAttack()) < 500) return;
+        if ((currentServerTime() - chr.getLastSnowballAttack()) < 500) return;
         if (chr.getTeam() != (what % 2)) return;
 
-        chr.setLastSnowballAttack(System.currentTimeMillis());
+        chr.setLastSnowballAttack(currentServerTime());
         int damage = 0;
         if (what < 2 && othersnowball.getSnowmanHP() > 0)
             damage = 10;

src/net/server/channel/handlers/SpecialMoveHandler.java

@@ -89,7 +89,7 @@ public final class SpecialMoveHandler extends AbstractMaplePacketHandler {
                 }
                 
                 c.announce(MaplePacketCreator.skillCooldown(skillid, cooldownTime));
-                chr.addCooldown(skillid, System.currentTimeMillis(), cooldownTime * 1000);
+                chr.addCooldown(skillid, currentServerTime(), cooldownTime * 1000);
             }
         }
         if (skillid == Hero.MONSTER_MAGNET || skillid == Paladin.MONSTER_MAGNET || skillid == DarkKnight.MONSTER_MAGNET) { // Monster Magnet

src/net/server/channel/handlers/UseCashItemHandler.java

@@ -67,7 +67,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         final MapleCharacter player = c.getPlayer();
         
-        long timeNow = System.currentTimeMillis();
+        long timeNow = currentServerTime();
         if (timeNow - player.getLastUsedCashItem() < 3000) {
             player.dropMessage(1, "You have used a cash item recently. Wait a moment, then try again.");
             c.announce(MaplePacketCreator.enableActions());
@@ -310,7 +310,7 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
                 }
 
                 if (period > 0) {
-                    eq.setExpiration(System.currentTimeMillis() + (period * 60 * 60 * 24 * 1000));
+                    eq.setExpiration(currentServerTime() + (period * 60 * 60 * 24 * 1000));
                 }
 
                 remove(c, itemId);
@@ -335,12 +335,13 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
             }
         } else if (itemType == 507) {
             boolean whisper;
-            switch (itemId / 1000 % 10) {
+            switch ((itemId / 1000) % 10) {
                 case 1: // Megaphone
                     if (player.getLevel() > 9) {
                         player.getClient().getChannelServer().broadcastPacket(MaplePacketCreator.serverNotice(2, medal + player.getName() + " : " + slea.readMapleAsciiString()));
                     } else {
                         player.dropMessage(1, "You may not use this until you're level 10.");
+                        return;
                     }
                     break;
                 case 2: // Super megaphone
@@ -375,15 +376,16 @@ public final class UseCashItemHandler extends AbstractMaplePacketHandler {
                         messages.add(message);
                     }
                     slea.readInt();
-                    if (megassenger) {
-                        Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + builder.toString(), ear));
-                    }
-                    if (!MapleTVEffect.isActive()) {
-                        new MapleTVEffect(player, victim, messages, tvType);
-                    } else {
+                    
+                    if (!MapleTVEffect.broadcastMapleTVIfNotActive(player, victim, messages, tvType)) {
                         player.dropMessage(1, "MapleTV is already in use.");
                         return;
                     }
+                    
+                    if (megassenger) {
+                        Server.getInstance().broadcastMessage(c.getWorld(), MaplePacketCreator.serverNotice(3, c.getChannel(), medal + player.getName() + " : " + builder.toString(), ear));
+                    }
+                    
                     break;
                 case 6: //item megaphone
                     String msg = medal + c.getPlayer().getName() + " : " + slea.readMapleAsciiString();

src/net/server/channel/handlers/UseCatchItemHandler.java

@@ -65,7 +65,7 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
                 break;
             case 2270001:
                 if (mob.getId() == 9500197) {
-                    if ((abm.getLastSpam(10) + 1000) < System.currentTimeMillis()) {
+                    if ((abm.getLastSpam(10) + 1000) < currentServerTime()) {
                         if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
                             chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
                             mob.getMap().killMonster(mob, null, false);
@@ -81,7 +81,7 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
                 break;
             case 2270002:
                 if (mob.getId() == 9300157) {
-                    if ((abm.getLastSpam(10) + 800) < System.currentTimeMillis()) {
+                    if ((abm.getLastSpam(10) + 800) < currentServerTime()) {
                         if (mob.getHp() < ((mob.getMaxHp() / 10) * 4)) {
                             if (Math.random() < 0.5) { // 50% chance
                                 chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
@@ -166,7 +166,7 @@ public final class UseCatchItemHandler extends AbstractMaplePacketHandler {
                 break;
             case 2270008:
                 if (mob.getId() == 9500336) {
-                    if ((abm.getLastSpam(10) + 3000) < System.currentTimeMillis()) {
+                    if ((abm.getLastSpam(10) + 3000) < currentServerTime()) {
                         abm.spam(10);
                         chr.getMap().broadcastMessage(MaplePacketCreator.catchMonster(monsterid, itemId, (byte) 1));
                         mob.getMap().killMonster(mob, null, false);

src/net/server/channel/handlers/UseItemHandler.java

@@ -74,7 +74,7 @@ public final class UseItemHandler extends AbstractMaplePacketHandler {
             } else if (ItemConstants.isTownScroll(itemId)) {
                 int banMap = chr.getMapId();
                 int banSp = chr.getMap().findClosestPlayerSpawnpoint(chr.getPosition()).getId();
-                long banTime = System.currentTimeMillis();
+                long banTime = currentServerTime();
                 
                 if (ii.getItemEffect(toUse.getItemId()).applyTo(chr)) {
                     if(ServerConstants.USE_BANISHABLE_TOWN_SCROLL) {

src/net/server/channel/handlers/UseMapleLifeHandler.java

@@ -33,7 +33,7 @@ public class UseMapleLifeHandler extends AbstractMaplePacketHandler {
     @Override
     public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter player = c.getPlayer();
-        long timeNow = System.currentTimeMillis();
+        long timeNow = currentServerTime();
         
         if(timeNow - player.getLastUsedCashItem() < 3000) {
             player.dropMessage(5, "Please wait a moment before trying again.");

src/net/server/channel/handlers/WhisperHandler.java

@@ -49,7 +49,7 @@ public final class WhisperHandler extends AbstractMaplePacketHandler {
             String recipient = slea.readMapleAsciiString();
             String text = slea.readMapleAsciiString();
             MapleCharacter player = c.getChannelServer().getPlayerStorage().getCharacterByName(recipient);
-			if(c.getPlayer().getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
+			if(c.getPlayer().getAutobanManager().getLastSpam(7) + 200 > currentServerTime()) {
 				return;
 			}
             if (text.length() > Byte.MAX_VALUE && !player.isGM()) {

src/net/server/channel/worker/BaseScheduler.java

@@ -40,6 +40,7 @@ import tools.locks.MonitoredReentrantLock;
 public abstract class BaseScheduler {
     private int idleProcs = 0;
     private List<SchedulerListener> listeners = new LinkedList<>();
+    private final List<Lock> externalLocks;
     private Map<Object, Pair<Runnable, Long>> registeredEntries = new HashMap<>();
     
     private ScheduledFuture<?> schedulerTask = null;
@@ -53,16 +54,43 @@ public abstract class BaseScheduler {
     
     protected BaseScheduler(MonitoredLockType lockType) {
         schedulerLock = new MonitoredReentrantLock(lockType, true);
+        externalLocks = new LinkedList<>();
+    }
+    
+    // NOTE: practice EXTREME caution when adding external locks to the scheduler system, if you don't know what you're doing DON'T USE THIS.
+    protected BaseScheduler(MonitoredLockType lockType, List<Lock> extLocks) {
+        schedulerLock = new MonitoredReentrantLock(lockType, true);
+        externalLocks = extLocks;
     }
     
     protected void addListener(SchedulerListener listener) {
         listeners.add(listener);
     }
     
+    private void lockScheduler() {
+        if(!externalLocks.isEmpty()) {
+            for(Lock l : externalLocks) {
+                l.lock();
+            }
+        }
+        
+        schedulerLock.lock();
+    }
+    
+    private void unlockScheduler() {
+        if(!externalLocks.isEmpty()) {
+            for(Lock l : externalLocks) {
+                l.unlock();
+            }
+        }
+        
+        schedulerLock.unlock();
+    }
+    
     private void runBaseSchedule() {
         List<Object> toRemove;
         
-        schedulerLock.lock();
+        lockScheduler();
         try {
             if(registeredEntries.isEmpty()) {
                 idleProcs++;
@@ -93,14 +121,14 @@ public abstract class BaseScheduler {
                 registeredEntries.remove(mse);
             }
         } finally {
-            schedulerLock.unlock();
+            unlockScheduler();
         }
         
         dispatchRemovedEntries(toRemove, true);
     }
     
     protected void registerEntry(Object key, Runnable removalAction, long duration) {
-        schedulerLock.lock();
+        lockScheduler();
         try {
             idleProcs = 0;
             if(schedulerTask == null) {
@@ -109,17 +137,17 @@ public abstract class BaseScheduler {
             
             registeredEntries.put(key, new Pair<>(removalAction, System.currentTimeMillis() + duration));
         } finally {
-            schedulerLock.unlock();
+            unlockScheduler();
         }
     }
     
     protected void interruptEntry(Object key) {
-        schedulerLock.lock();
+        lockScheduler();
         try {
             Pair<Runnable, Long> rm = registeredEntries.remove(key);
             if(rm != null) rm.getLeft().run();
         } finally {
-            schedulerLock.unlock();
+            unlockScheduler();
         }
         
         dispatchRemovedEntries(Collections.singletonList(key), false);

src/net/server/channel/worker/FaceExpressionScheduler.java

@@ -0,0 +1,42 @@
+/*
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft 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 net.server.channel.worker;
+
+import java.util.Collections;
+import java.util.concurrent.locks.Lock;
+import tools.locks.MonitoredLockType;
+
+/**
+ *
+ * @author Ronan
+ */
+public class FaceExpressionScheduler extends BaseScheduler {
+    public FaceExpressionScheduler(final Lock channelFaceLock) {
+        super(MonitoredLockType.CHANNEL_FACESCHDL, Collections.singletonList(channelFaceLock));
+    }
+    
+    public void registerFaceExpression(Integer characterId, Runnable runAction) {
+        registerEntry(characterId, runAction, 5000);
+    }
+    
+    public void unregisterFaceExpression(Integer characterId) {
+        interruptEntry(characterId);
+    }
+}

src/net/server/handlers/login/CreateCharHandler.java

@@ -78,7 +78,7 @@ public final class CreateCharHandler extends AbstractMaplePacketHandler {
                 int status;
                 if (job == 0) { // Knights of Cygnus
 			status = NoblesseCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);
-		} else if (job == 1) { // Adventurer   
+		} else if (job == 1) { // Adventurer
 			status = BeginnerCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);
 		} else if (job == 2) { // Aran
 			status = LegendCreator.createCharacter(c, name, face, hair + haircolor, skincolor, top, bottom, shoes, weapon, gender);

src/net/server/handlers/login/DeleteCharHandler.java

@@ -35,7 +35,7 @@ public final class DeleteCharHandler extends AbstractMaplePacketHandler {
         int cid = slea.readInt();
         if (c.checkPic(pic)) {
             if(c.deleteCharacter(cid, c.getAccID())) {
-                FilePrinter.printError(FilePrinter.DELETED_CHARACTERS + c.getAccountName() + ".txt", c.getAccountName() + " deleted CID: " + cid + "\r\n");			
+                FilePrinter.print(FilePrinter.DELETED_CHARACTERS + c.getAccountName() + ".txt", c.getAccountName() + " deleted CID: " + cid + "\r\n");			
                 c.announce(MaplePacketCreator.deleteCharResponse(cid, 0));
             } else {
                 c.announce(MaplePacketCreator.deleteCharResponse(cid, 0x14));

src/net/server/handlers/login/LoginPasswordHandler.java

@@ -34,6 +34,8 @@ import tools.DatabaseConnection;
 import tools.MaplePacketCreator;
 import tools.data.input.SeekableLittleEndianAccessor;
 import client.MapleClient;
+import java.sql.ResultSet;
+import java.sql.Statement;
 
 public final class LoginPasswordHandler implements MaplePacketHandler {
 
@@ -58,12 +60,17 @@ public final class LoginPasswordHandler implements MaplePacketHandler {
         if (ServerConstants.AUTOMATIC_REGISTER && loginok == 5) {
             try {
                 con = DatabaseConnection.getConnection();
-                ps = con.prepareStatement("INSERT INTO accounts (name, password, birthday, tempban) VALUES (?, ?, ?, ?);"); //Jayd: Added birthday, tempban
+                ps = con.prepareStatement("INSERT INTO accounts (name, password, birthday, tempban) VALUES (?, ?, ?, ?);", Statement.RETURN_GENERATED_KEYS); //Jayd: Added birthday, tempban
                 ps.setString(1, login);
                 ps.setString(2, BCrypt.hashpw(pwd, BCrypt.gensalt(12)));
                 ps.setString(3, "2018-06-20"); //Jayd: was added to solve the MySQL 5.7 strict checking (birthday)
                 ps.setString(4, "2018-06-20"); //Jayd: was added to solve the MySQL 5.7 strict checking (tempban)
                 ps.executeUpdate();
+                
+                ResultSet rs = ps.getGeneratedKeys();
+                rs.next();
+                c.setAccID(rs.getInt(1));
+                rs.close();
             } catch (SQLException e) {
                 e.printStackTrace();
             } finally {
@@ -113,9 +120,7 @@ public final class LoginPasswordHandler implements MaplePacketHandler {
     }
 
     private static void login(MapleClient c){
-        Server.getInstance().loadAccountCharactersView(c);    // locks the login session until data is recovered from the cache or the DB.
         c.announce(MaplePacketCreator.getAuthSuccess(c));//why the fk did I do c.getAccountName()?
-
         Server.getInstance().registerLoginState(c);
     }
 

src/net/server/handlers/login/ServerlistRequestHandler.java

@@ -34,6 +34,9 @@ public final class ServerlistRequestHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
     	Server server = Server.getInstance();
+        server.loadAccountCharacters(c);    // locks the login session until data is recovered from the cache or the DB.
+        c.setClickedNPC();
+        
         for (World world : server.getWorlds()) {
             c.announce(MaplePacketCreator.getServerList(world.getId(), GameConstants.WORLD_NAMES[world.getId()], world.getFlag(), world.getEventMessage(), world.getChannels()));
         }

src/net/server/handlers/login/ViewAllCharHandler.java

@@ -24,11 +24,9 @@ package net.server.handlers.login;
 import client.MapleCharacter;
 import client.MapleClient;
 import constants.ServerConstants;
-import java.util.ArrayList;
 import java.util.List;
 import net.AbstractMaplePacketHandler;
 import net.server.Server;
-import net.server.world.World;
 import tools.MaplePacketCreator;
 import tools.data.input.SeekableLittleEndianAccessor;
 import tools.Pair;
@@ -37,23 +35,18 @@ public final class ViewAllCharHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         try {
-            List<World> wlist = Server.getInstance().getWorlds();
-            List<Pair<Integer, List<MapleCharacter>>> worldChars = new ArrayList<>(wlist.size() + 1);
-            
-            int chrTotal = 0;
-            int accountId = c.getAccID();
-            List<MapleCharacter> lastwchars = null;
-            for(World w : wlist) {
-                List<MapleCharacter> wchars = w.getAccountCharactersView(accountId);
-                
-                if(!wchars.isEmpty()) {
-                    lastwchars = wchars;
-                    
-                    worldChars.add(new Pair<>(w.getId(), wchars));
-                    chrTotal += wchars.size();
-                }
+            if(!c.canRequestCharlist()) {
+                c.announce(MaplePacketCreator.showAllCharacter(0, 0));
+                return;
             }
             
+            int accountId = c.getAccID();
+            Pair<Pair<Integer, List<MapleCharacter>>, List<Pair<Integer, List<MapleCharacter>>>> loginBlob = Server.getInstance().loadAccountCharlist(accountId);
+            
+            List<Pair<Integer, List<MapleCharacter>>> worldChars = loginBlob.getRight();
+            int chrTotal = loginBlob.getLeft().getLeft();
+            List<MapleCharacter> lastwchars = loginBlob.getLeft().getRight();
+            
             if (chrTotal > 9) {
                 int padRight = chrTotal % 3;
                 if (padRight > 0 && lastwchars != null) {

src/net/server/world/World.java

@@ -322,7 +322,14 @@ public class World {
                 
         accountCharsLock.lock();
         try {
-            chrList = new LinkedList<>(accountChars.get(accountId).values());
+            SortedMap<Integer, MapleCharacter> accChars = accountChars.get(accountId);
+            
+            if(accChars != null) {
+                chrList = new LinkedList<>(accChars.values());
+            } else {
+                accountChars.put(accountId, new TreeMap<Integer, MapleCharacter>());
+                chrList = null;
+            }
         } finally {
             accountCharsLock.unlock();
         }

src/server/MapleItemInformationProvider.java

@@ -1489,7 +1489,12 @@ public class MapleItemInformationProvider {
     }
 
     public boolean isCash(int itemId) {
-        return itemId / 1000000 == 5 || getEquipStats(itemId).get("cash") == 1;
+        int itemType = itemId / 1000000;
+        if (itemType == 5) return true;
+        if (itemType != 1) return false;
+        
+        Map<String, Integer> eqpStats = getEquipStats(itemId);
+        return eqpStats != null && eqpStats.get("cash") == 1;
     }
     
     public boolean isUpgradeable(int itemId) {

src/server/maps/MapleMap.java

@@ -1066,14 +1066,14 @@ public class MapleMap {
         return character;
     }
     
-    public List<MapleCharacter> getPlayersInRange(Rectangle box, List<MapleCharacter> chr) {
+    public List<MapleCharacter> getPlayersInRange(Rectangle box, List<MapleCharacter> chrList) {
         List<MapleCharacter> character = new LinkedList<>();
         chrRLock.lock();
         try {
-            for (MapleCharacter a : characters) {
-                if (chr.contains(a.getClient().getPlayer())) {
-                    if (box.contains(a.getPosition())) {
-                        character.add(a);
+            for (MapleCharacter chr : chrList) {
+                if (characters.contains(chr)) {
+                    if (box.contains(chr.getPosition())) {
+                        character.add(chr);
                     }
                 }
             }
@@ -2529,6 +2529,9 @@ public class MapleMap {
     */
 
     public void removePlayer(MapleCharacter chr) {
+        Channel cserv = chr.getClient().getChannelServer();
+        
+        cserv.unregisterFaceExpression(mapid, chr);
         chr.unregisterChairBuff();
         
         chrWLock.lock();
@@ -2540,10 +2543,10 @@ public class MapleMap {
         }
         
         if (MapleMiniDungeonInfo.isDungeonMap(mapid)) {
-            MapleMiniDungeon mmd = chr.getClient().getChannelServer().getMiniDungeon(mapid);
+            MapleMiniDungeon mmd = cserv.getMiniDungeon(mapid);
             if(mmd != null) {
                 if(!mmd.unregisterPlayer(chr)) {
-                    chr.getClient().getChannelServer().removeMiniDungeon(mapid);
+                    cserv.removeMiniDungeon(mapid);
                 }
             }
         }

src/server/maps/MapleTVEffect.java

@@ -22,7 +22,6 @@
 package server.maps;
 
 import client.MapleCharacter;
-import java.util.ArrayList;
 import java.util.List;
 import net.server.Server;
 import server.TimerManager;
@@ -31,34 +30,28 @@ import tools.MaplePacketCreator;
 /*
  * MapleTVEffect
  * @author MrXotic
+ * @author Ronan (made MapleTV mechanics synchronous)
  */
 public class MapleTVEffect {
 	
-	private static boolean ACTIVE;
+	private final static boolean ACTIVE[] = new boolean[Server.getInstance().getWorlds().size()];
 	
-	private List<String> message = new ArrayList<>(5);
-	private MapleCharacter user;
-	private int type;
-	private MapleCharacter partner;
-
-	public MapleTVEffect(MapleCharacter u, MapleCharacter p, List<String> msg, int t) {
-		this.message = msg;
-		this.user = u;
-		this.type = t;
-		this.partner = p;
-		broadcastTV(true);
+	public static synchronized boolean broadcastMapleTVIfNotActive(MapleCharacter player, MapleCharacter victim, List<String> messages, int tvType){
+                int w = player.getWorld();
+                if(!ACTIVE[w]) {
+                        broadcastTV(true, w, messages, player, tvType, victim);
+                        return true;
+                }
+            
+		return false;
 	}
 
-	public static boolean isActive(){
-		return ACTIVE;
-	}
-
-	private void broadcastTV(boolean activity) {
+	private static synchronized void broadcastTV(boolean activity, final int userWorld, List<String> message, MapleCharacter user, int type, MapleCharacter partner) {
 		Server server = Server.getInstance();
-		ACTIVE = activity;
-		if (ACTIVE) {
-			server.broadcastMessage(user.getWorld(), MaplePacketCreator.enableTV());
-			server.broadcastMessage(user.getWorld(), MaplePacketCreator.sendTV(user, message, type <= 2 ? type : type - 3, partner));
+		ACTIVE[userWorld] = activity;
+		if (activity) {
+			server.broadcastMessage(userWorld, MaplePacketCreator.enableTV());
+			server.broadcastMessage(userWorld, MaplePacketCreator.sendTV(user, message, type <= 2 ? type : type - 3, partner));
 			int delay = 15000;
 			if (type == 4) {
 				delay = 30000;
@@ -68,11 +61,11 @@ public class MapleTVEffect {
 			TimerManager.getInstance().schedule(new Runnable() {
 				@Override
 				public void run() {
-					broadcastTV(false);
+					broadcastTV(false, userWorld, null, null, -1, null);
 				}
 			}, delay);
 		} else {
-			server.broadcastMessage(user.getWorld(), MaplePacketCreator.removeTV());
+			server.broadcastMessage(userWorld, MaplePacketCreator.removeTV());
 		}
 	}
 }

src/tools/MaplePacketCreator.java

@@ -684,8 +684,9 @@ public class MaplePacketCreator {
                 mplew.writeInt(c.getAccID());
                 mplew.write(c.getGender());
                 
-                mplew.writeBool(c.getGMLevel() > 1);    // thanks Steve(kaito1410) for pointing this out
-                mplew.write((c.getGMLevel() > 1 && Server.getInstance().canFly(c.getAccID())) ? 0x80 : 0); // Admin Byte. 0x80,0x40,0x20.. Rubbish.
+                boolean canFly = Server.getInstance().canFly(c.getAccID());
+                mplew.writeBool((ServerConstants.USE_ENFORCE_ADMIN_ACCOUNT || canFly) ? c.getGMLevel() > 1 : false);    // thanks Steve(kaito1410) for pointing the GM account boolean here
+                mplew.write((c.getGMLevel() > 1 && canFly) ? 0x80 : 0); // Admin Byte. 0x80,0x40,0x20.. Rubbish.
                 mplew.write(0); // Country Code.
                 
                 mplew.writeMapleAsciiString(c.getAccountName());

src/tools/locks/MonitoredLockType.java

@@ -45,6 +45,8 @@ public enum MonitoredLockType {
     SERVER_DISEASES,
     MERCHANT,
     CHANNEL,
+    CHANNEL_FACEEXPRS,
+    CHANNEL_FACESCHDL,
     CHANNEL_MOBACTION,
     CHANNEL_MOBANIMAT,
     CHANNEL_MOBSTATUS,

tools/MapleArrowFetcher/nbproject/private/private.xml

@@ -3,7 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/tools/MapleArrowFetcher/src/maplearrowfetcher/MapleArrowFetcher.java</file>
+            <file>file:/C:/Nexon/MapleSolaxia/HeavenMS/tools/MapleArrowFetcher/src/maplearrowfetcher/MapleArrowFetcher.java</file>
         </group>
     </open-files>
 </project-private>

tools/MapleIdRetriever/dist/README.TXT

@@ -1,32 +0,0 @@
-========================
-BUILD OUTPUT DESCRIPTION
-========================
-
-When you build an Java application project that has a main class, the IDE
-automatically copies all of the JAR
-files on the projects classpath to your projects dist/lib folder. The IDE
-also adds each of the JAR files to the Class-Path element in the application
-JAR files manifest file (MANIFEST.MF).
-
-To run the project from the command line, go to the dist folder and
-type the following:
-
-java -jar "MapleIdRetriever.jar" 
-
-To distribute this project, zip up the dist folder (including the lib folder)
-and distribute the ZIP file.
-
-Notes:
-
-* If two JAR files on the project classpath have the same name, only the first
-JAR file is copied to the lib folder.
-* Only JAR files are copied to the lib folder.
-If the classpath contains other types of files or folders, these files (folders)
-are not copied.
-* If a library on the projects classpath also has a Class-Path element
-specified in the manifest,the content of the Class-Path element has to be on
-the projects runtime path.
-* To set a main class in a standard Java project, right-click the project node
-in the Projects window and choose Properties. Then click Run and enter the
-class name in the Main Class field. Alternatively, you can manually type the
-class name in the manifest Main-Class element.

tools/MapleIdRetriever/src/mapleidretriever/MapleIdRetriever.java

@@ -147,7 +147,7 @@ public class MapleIdRetriever {
         }
     }
     
-    public static void fetchDataOnMapleHandbook() throws SQLException {
+    private static void fetchDataOnMapleHandbook() throws SQLException {
         String line;
         
         try {

tools/MapleInvalidItemWithNoNameFetcher/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="MapleInvalidItemWithNoNameFetcher" default="default" basedir=".">
+    <description>Builds, tests, and runs the project MapleInvalidItemWithNoNameFetcher.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="MapleInvalidItemWithNoNameFetcher-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

tools/MapleInvalidItemWithNoNameFetcher/lib/output.txt

@@ -0,0 +1,803 @@
+ # XML File autogenerated from the MapleInvalidItemWithNoNameFetcher feature by Ronan Lana.
+ # Generated data takes into account several data info from the server-side WZ.xmls.
+
+Cash.img:
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<imgdir name="Cash.img">
+  <imgdir name="5120033">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5121011">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5121012">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5121013">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5121022">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5152049">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5152050">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5190007">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5190008">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5280000">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5500005">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5500006">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530001">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530002">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530003">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530004">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530005">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530006">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530007">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="5530008">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+</imgdir>
+
+Consume.img:
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<imgdir name="Consume.img">
+  <imgdir name="2022303">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100141">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100142">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100143">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100144">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100145">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100146">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100147">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100148">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100149">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100150">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100151">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100166">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100901">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100902">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100903">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2100904">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2101149">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2101150">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2280020">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2280021">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2280022">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2280023">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2280024">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="2280025">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+</imgdir>
+
+Eqp.img:
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<imgdir name="Eqp.img">
+  <imgdir name="Eqp">
+    <imgdir name="Accessory">
+      <imgdir name="1012133">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142143">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142144">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142145">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142149">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142150">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142151">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1142165">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="Glove">
+      <imgdir name="1082262">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="Hair">
+      <imgdir name="30105">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="30106">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="30107">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="30928">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="30929">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31660">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31661">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31662">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31663">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31664">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31665">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31666">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="31667">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="33101">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="Longcoat">
+      <imgdir name="1050148">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1051130">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1051176">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1052186">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1052217">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1052224">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1052228">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="PetEquip">
+      <imgdir name="1802039">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1802056">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="Shield">
+      <imgdir name="1092067">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="Taming">
+      <imgdir name="1902040">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1902041">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1902042">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1912033">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1912034">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1912035">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932000">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932001">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932002">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932003">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932004">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932005">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932010">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1932012">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+    <imgdir name="Weapon">
+      <imgdir name="1302048">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1302124">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1302125">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1302126">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1312035">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1312046">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1322074">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1332093">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1332094">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1332095">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1372026">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1372056">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1382074">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1382075">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1382076">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1392000">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1402043">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1402068">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1412043">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1412044">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1422035">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1422046">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1422047">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1432029">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1432058">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1432059">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1442059">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1442083">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1442084">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1452037">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1452058">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1452077">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1452078">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1452079">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1462069">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1462070">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1462071">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1472044">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1472093">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1472094">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1472095">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1482041">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1482042">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1482043">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1492042">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1492043">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+      <imgdir name="1492044">
+        <string name="name" value="MISSING NAME"/>
+        <string name="desc" value="MISSING INFO"/>
+      </imgdir>
+    </imgdir>
+  </imgdir>
+</imgdir>
+
+Etc.img:
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<imgdir name="Etc.img">
+  <imgdir name="4161049">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="4161050">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="4161051">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="4161999">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+</imgdir>
+
+Ins.img:
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<imgdir name="Ins.img">
+  <imgdir name="3010022">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3010023">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3010024">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3010026">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3010028">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994119">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994142">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994143">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994144">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994145">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994146">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994147">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994148">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994149">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994150">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994151">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994152">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994153">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994154">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994155">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994156">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994157">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994158">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994159">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994160">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994161">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994162">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994163">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994164">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994165">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994166">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994167">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994168">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994169">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994170">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994171">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994172">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994173">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994174">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994175">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994176">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994177">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994178">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994179">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+  <imgdir name="3994180">
+    <string name="name" value="MISSING NAME"/>
+    <string name="desc" value="MISSING INFO"/>
+  </imgdir>
+</imgdir>
+

tools/MapleInvalidItemWithNoNameFetcher/lib/result.txt

@@ -0,0 +1,446 @@
+ # Report File autogenerated from the MapleInvalidItemWithNoNameFetcher feature by Ronan Lana.
+ # Generated data takes into account several data info from the server-side WZ.xmls.
+
+Itemids with missing 'name' property: 
+  30105 Character.wz/Hair/00030105.img
+  30106 Character.wz/Hair/00030106.img
+  30107 Character.wz/Hair/00030107.img
+  30928 Character.wz/Hair/00030928.img
+  30929 Character.wz/Hair/00030929.img
+  31660 Character.wz/Hair/00031660.img
+  31661 Character.wz/Hair/00031661.img
+  31662 Character.wz/Hair/00031662.img
+  31663 Character.wz/Hair/00031663.img
+  31664 Character.wz/Hair/00031664.img
+  31665 Character.wz/Hair/00031665.img
+  31666 Character.wz/Hair/00031666.img
+  31667 Character.wz/Hair/00031667.img
+  33101 Character.wz/Hair/00033101.img
+  1012133 Character.wz/Accessory/01012133.img
+  1050148 Character.wz/Longcoat/01050148.img
+  1051130 Character.wz/Longcoat/01051130.img
+  1051176 Character.wz/Longcoat/01051176.img
+  1052186 Character.wz/Longcoat/01052186.img
+  1052217 Character.wz/Longcoat/01052217.img
+  1052224 Character.wz/Longcoat/01052224.img
+  1052228 Character.wz/Longcoat/01052228.img
+  1082262 Character.wz/Glove/01082262.img
+  1092067 Character.wz/Shield/01092067.img
+  1142143 Character.wz/Accessory/01142143.img
+  1142144 Character.wz/Accessory/01142144.img
+  1142145 Character.wz/Accessory/01142145.img
+  1142149 Character.wz/Accessory/01142149.img
+  1142150 Character.wz/Accessory/01142150.img
+  1142151 Character.wz/Accessory/01142151.img
+  1142165 Character.wz/Accessory/01142165.img
+  1302048 Character.wz/Weapon/01302048.img
+  1302124 Character.wz/Weapon/01302124.img
+  1302125 Character.wz/Weapon/01302125.img
+  1302126 Character.wz/Weapon/01302126.img
+  1312035 Character.wz/Weapon/01312035.img
+  1312046 Character.wz/Weapon/01312046.img
+  1322074 Character.wz/Weapon/01322074.img
+  1332093 Character.wz/Weapon/01332093.img
+  1332094 Character.wz/Weapon/01332094.img
+  1332095 Character.wz/Weapon/01332095.img
+  1372026 Character.wz/Weapon/01372026.img
+  1372056 Character.wz/Weapon/01372056.img
+  1382074 Character.wz/Weapon/01382074.img
+  1382075 Character.wz/Weapon/01382075.img
+  1382076 Character.wz/Weapon/01382076.img
+  1392000 Character.wz/Weapon/01392000.img
+  1402043 Character.wz/Weapon/01402043.img
+  1402068 Character.wz/Weapon/01402068.img
+  1412043 Character.wz/Weapon/01412043.img
+  1412044 Character.wz/Weapon/01412044.img
+  1422035 Character.wz/Weapon/01422035.img
+  1422046 Character.wz/Weapon/01422046.img
+  1422047 Character.wz/Weapon/01422047.img
+  1432029 Character.wz/Weapon/01432029.img
+  1432058 Character.wz/Weapon/01432058.img
+  1432059 Character.wz/Weapon/01432059.img
+  1442059 Character.wz/Weapon/01442059.img
+  1442083 Character.wz/Weapon/01442083.img
+  1442084 Character.wz/Weapon/01442084.img
+  1452037 Character.wz/Weapon/01452037.img
+  1452058 Character.wz/Weapon/01452058.img
+  1452077 Character.wz/Weapon/01452077.img
+  1452078 Character.wz/Weapon/01452078.img
+  1452079 Character.wz/Weapon/01452079.img
+  1462069 Character.wz/Weapon/01462069.img
+  1462070 Character.wz/Weapon/01462070.img
+  1462071 Character.wz/Weapon/01462071.img
+  1472044 Character.wz/Weapon/01472044.img
+  1472093 Character.wz/Weapon/01472093.img
+  1472094 Character.wz/Weapon/01472094.img
+  1472095 Character.wz/Weapon/01472095.img
+  1482041 Character.wz/Weapon/01482041.img
+  1482042 Character.wz/Weapon/01482042.img
+  1482043 Character.wz/Weapon/01482043.img
+  1492042 Character.wz/Weapon/01492042.img
+  1492043 Character.wz/Weapon/01492043.img
+  1492044 Character.wz/Weapon/01492044.img
+  1802039 Character.wz/PetEquip/01802039.img
+  1802056 Character.wz/PetEquip/01802056.img
+  1902040 Character.wz/TamingMob/01902040.img
+  1902041 Character.wz/TamingMob/01902041.img
+  1902042 Character.wz/TamingMob/01902042.img
+  1912033 Character.wz/TamingMob/01912033.img
+  1912034 Character.wz/TamingMob/01912034.img
+  1912035 Character.wz/TamingMob/01912035.img
+  1932000 Character.wz/TamingMob/01932000.img
+  1932001 Character.wz/TamingMob/01932001.img
+  1932002 Character.wz/TamingMob/01932002.img
+  1932003 Character.wz/TamingMob/01932003.img
+  1932004 Character.wz/TamingMob/01932004.img
+  1932005 Character.wz/TamingMob/01932005.img
+  1932010 Character.wz/TamingMob/01932010.img
+  1932012 Character.wz/TamingMob/01932012.img
+  2022303 Item.wz/Consume/0202.img
+  2100141 Item.wz/Consume/0210.img
+  2100142 Item.wz/Consume/0210.img
+  2100143 Item.wz/Consume/0210.img
+  2100144 Item.wz/Consume/0210.img
+  2100145 Item.wz/Consume/0210.img
+  2100146 Item.wz/Consume/0210.img
+  2100147 Item.wz/Consume/0210.img
+  2100148 Item.wz/Consume/0210.img
+  2100149 Item.wz/Consume/0210.img
+  2100150 Item.wz/Consume/0210.img
+  2100151 Item.wz/Consume/0210.img
+  2100166 Item.wz/Consume/0210.img
+  2100901 Item.wz/Consume/0210.img
+  2100902 Item.wz/Consume/0210.img
+  2100903 Item.wz/Consume/0210.img
+  2100904 Item.wz/Consume/0210.img
+  2101149 Item.wz/Consume/0210.img
+  2101150 Item.wz/Consume/0210.img
+  2280020 Item.wz/Consume/0228.img
+  2280021 Item.wz/Consume/0228.img
+  2280022 Item.wz/Consume/0228.img
+  2280023 Item.wz/Consume/0228.img
+  2280024 Item.wz/Consume/0228.img
+  2280025 Item.wz/Consume/0228.img
+  3010022 Item.wz/Install/0301.img
+  3010023 Item.wz/Install/0301.img
+  3010024 Item.wz/Install/0301.img
+  3010026 Item.wz/Install/0301.img
+  3010028 Item.wz/Install/0301.img
+  3994119 Item.wz/Install/0399.img
+  3994142 Item.wz/Install/0399.img
+  3994143 Item.wz/Install/0399.img
+  3994144 Item.wz/Install/0399.img
+  3994145 Item.wz/Install/0399.img
+  3994146 Item.wz/Install/0399.img
+  3994147 Item.wz/Install/0399.img
+  3994148 Item.wz/Install/0399.img
+  3994149 Item.wz/Install/0399.img
+  3994150 Item.wz/Install/0399.img
+  3994151 Item.wz/Install/0399.img
+  3994152 Item.wz/Install/0399.img
+  3994153 Item.wz/Install/0399.img
+  3994154 Item.wz/Install/0399.img
+  3994155 Item.wz/Install/0399.img
+  3994156 Item.wz/Install/0399.img
+  3994157 Item.wz/Install/0399.img
+  3994158 Item.wz/Install/0399.img
+  3994159 Item.wz/Install/0399.img
+  3994160 Item.wz/Install/0399.img
+  3994161 Item.wz/Install/0399.img
+  3994162 Item.wz/Install/0399.img
+  3994163 Item.wz/Install/0399.img
+  3994164 Item.wz/Install/0399.img
+  3994165 Item.wz/Install/0399.img
+  3994166 Item.wz/Install/0399.img
+  3994167 Item.wz/Install/0399.img
+  3994168 Item.wz/Install/0399.img
+  3994169 Item.wz/Install/0399.img
+  3994170 Item.wz/Install/0399.img
+  3994171 Item.wz/Install/0399.img
+  3994172 Item.wz/Install/0399.img
+  3994173 Item.wz/Install/0399.img
+  3994174 Item.wz/Install/0399.img
+  3994175 Item.wz/Install/0399.img
+  3994176 Item.wz/Install/0399.img
+  3994177 Item.wz/Install/0399.img
+  3994178 Item.wz/Install/0399.img
+  3994179 Item.wz/Install/0399.img
+  3994180 Item.wz/Install/0399.img
+  4161049 Item.wz/Etc/0416.img
+  4161050 Item.wz/Etc/0416.img
+  4161051 Item.wz/Etc/0416.img
+  4161999 Item.wz/Etc/0416.img
+  5120033 Item.wz/Cash/0512.img
+  5121011 Item.wz/Cash/0512.img
+  5121012 Item.wz/Cash/0512.img
+  5121013 Item.wz/Cash/0512.img
+  5121022 Item.wz/Cash/0512.img
+  5152049 Item.wz/Cash/0515.img
+  5152050 Item.wz/Cash/0515.img
+  5190007 Item.wz/Cash/0519.img
+  5190008 Item.wz/Cash/0519.img
+  5280000 Item.wz/Cash/0528.img
+  5500005 Item.wz/Cash/0550.img
+  5500006 Item.wz/Cash/0550.img
+  5530001 Item.wz/Cash/0553.img
+  5530002 Item.wz/Cash/0553.img
+  5530003 Item.wz/Cash/0553.img
+  5530004 Item.wz/Cash/0553.img
+  5530005 Item.wz/Cash/0553.img
+  5530006 Item.wz/Cash/0553.img
+  5530007 Item.wz/Cash/0553.img
+  5530008 Item.wz/Cash/0553.img
+
+Equipids with missing 'cash' property: 
+  30010 Character.wz/Hair/00030010.img
+  30020 Character.wz/Hair/00030020.img
+  30021 Character.wz/Hair/00030021.img
+  30022 Character.wz/Hair/00030022.img
+  30023 Character.wz/Hair/00030023.img
+  30024 Character.wz/Hair/00030024.img
+  30025 Character.wz/Hair/00030025.img
+  30026 Character.wz/Hair/00030026.img
+  30027 Character.wz/Hair/00030027.img
+  30030 Character.wz/Hair/00030030.img
+  30031 Character.wz/Hair/00030031.img
+  30032 Character.wz/Hair/00030032.img
+  30100 Character.wz/Hair/00030100.img
+  30101 Character.wz/Hair/00030101.img
+  30102 Character.wz/Hair/00030102.img
+  30103 Character.wz/Hair/00030103.img
+  30104 Character.wz/Hair/00030104.img
+  30105 Character.wz/Hair/00030105.img
+  30106 Character.wz/Hair/00030106.img
+  30107 Character.wz/Hair/00030107.img
+  30150 Character.wz/Hair/00030150.img
+  30151 Character.wz/Hair/00030151.img
+  30152 Character.wz/Hair/00030152.img
+  30153 Character.wz/Hair/00030153.img
+  30154 Character.wz/Hair/00030154.img
+  30155 Character.wz/Hair/00030155.img
+  30156 Character.wz/Hair/00030156.img
+  30157 Character.wz/Hair/00030157.img
+  30160 Character.wz/Hair/00030160.img
+  30161 Character.wz/Hair/00030161.img
+  30162 Character.wz/Hair/00030162.img
+  30163 Character.wz/Hair/00030163.img
+  30164 Character.wz/Hair/00030164.img
+  30165 Character.wz/Hair/00030165.img
+  30166 Character.wz/Hair/00030166.img
+  30167 Character.wz/Hair/00030167.img
+  30170 Character.wz/Hair/00030170.img
+  30171 Character.wz/Hair/00030171.img
+  30172 Character.wz/Hair/00030172.img
+  30173 Character.wz/Hair/00030173.img
+  30174 Character.wz/Hair/00030174.img
+  30175 Character.wz/Hair/00030175.img
+  30176 Character.wz/Hair/00030176.img
+  30177 Character.wz/Hair/00030177.img
+  30440 Character.wz/Hair/00030440.img
+  30441 Character.wz/Hair/00030441.img
+  30442 Character.wz/Hair/00030442.img
+  30443 Character.wz/Hair/00030443.img
+  30444 Character.wz/Hair/00030444.img
+  30445 Character.wz/Hair/00030445.img
+  30446 Character.wz/Hair/00030446.img
+  30447 Character.wz/Hair/00030447.img
+  30610 Character.wz/Hair/00030610.img
+  30611 Character.wz/Hair/00030611.img
+  30612 Character.wz/Hair/00030612.img
+  30613 Character.wz/Hair/00030613.img
+  30614 Character.wz/Hair/00030614.img
+  30615 Character.wz/Hair/00030615.img
+  30616 Character.wz/Hair/00030616.img
+  30617 Character.wz/Hair/00030617.img
+  30740 Character.wz/Hair/00030740.img
+  30741 Character.wz/Hair/00030741.img
+  30742 Character.wz/Hair/00030742.img
+  30743 Character.wz/Hair/00030743.img
+  30744 Character.wz/Hair/00030744.img
+  30745 Character.wz/Hair/00030745.img
+  30746 Character.wz/Hair/00030746.img
+  30747 Character.wz/Hair/00030747.img
+  30750 Character.wz/Hair/00030750.img
+  30751 Character.wz/Hair/00030751.img
+  30752 Character.wz/Hair/00030752.img
+  30753 Character.wz/Hair/00030753.img
+  30754 Character.wz/Hair/00030754.img
+  30755 Character.wz/Hair/00030755.img
+  30756 Character.wz/Hair/00030756.img
+  30757 Character.wz/Hair/00030757.img
+  30920 Character.wz/Hair/00030920.img
+  30921 Character.wz/Hair/00030921.img
+  30922 Character.wz/Hair/00030922.img
+  30923 Character.wz/Hair/00030923.img
+  30924 Character.wz/Hair/00030924.img
+  30925 Character.wz/Hair/00030925.img
+  30926 Character.wz/Hair/00030926.img
+  30927 Character.wz/Hair/00030927.img
+  31020 Character.wz/Hair/00031020.img
+  31021 Character.wz/Hair/00031021.img
+  31022 Character.wz/Hair/00031022.img
+  31023 Character.wz/Hair/00031023.img
+  31024 Character.wz/Hair/00031024.img
+  31025 Character.wz/Hair/00031025.img
+  31026 Character.wz/Hair/00031026.img
+  31027 Character.wz/Hair/00031027.img
+  31030 Character.wz/Hair/00031030.img
+  31031 Character.wz/Hair/00031031.img
+  31032 Character.wz/Hair/00031032.img
+  31033 Character.wz/Hair/00031033.img
+  31034 Character.wz/Hair/00031034.img
+  31035 Character.wz/Hair/00031035.img
+  31036 Character.wz/Hair/00031036.img
+  31037 Character.wz/Hair/00031037.img
+  31040 Character.wz/Hair/00031040.img
+  31041 Character.wz/Hair/00031041.img
+  31042 Character.wz/Hair/00031042.img
+  31043 Character.wz/Hair/00031043.img
+  31044 Character.wz/Hair/00031044.img
+  31045 Character.wz/Hair/00031045.img
+  31046 Character.wz/Hair/00031046.img
+  31047 Character.wz/Hair/00031047.img
+  31050 Character.wz/Hair/00031050.img
+  31051 Character.wz/Hair/00031051.img
+  31052 Character.wz/Hair/00031052.img
+  31053 Character.wz/Hair/00031053.img
+  31054 Character.wz/Hair/00031054.img
+  31055 Character.wz/Hair/00031055.img
+  31056 Character.wz/Hair/00031056.img
+  31057 Character.wz/Hair/00031057.img
+  31060 Character.wz/Hair/00031060.img
+  31061 Character.wz/Hair/00031061.img
+  31062 Character.wz/Hair/00031062.img
+  31063 Character.wz/Hair/00031063.img
+  31064 Character.wz/Hair/00031064.img
+  31065 Character.wz/Hair/00031065.img
+  31066 Character.wz/Hair/00031066.img
+  31067 Character.wz/Hair/00031067.img
+  31070 Character.wz/Hair/00031070.img
+  31071 Character.wz/Hair/00031071.img
+  31072 Character.wz/Hair/00031072.img
+  31073 Character.wz/Hair/00031073.img
+  31074 Character.wz/Hair/00031074.img
+  31075 Character.wz/Hair/00031075.img
+  31076 Character.wz/Hair/00031076.img
+  31077 Character.wz/Hair/00031077.img
+  31080 Character.wz/Hair/00031080.img
+  31081 Character.wz/Hair/00031081.img
+  31082 Character.wz/Hair/00031082.img
+  31083 Character.wz/Hair/00031083.img
+  31084 Character.wz/Hair/00031084.img
+  31085 Character.wz/Hair/00031085.img
+  31086 Character.wz/Hair/00031086.img
+  31087 Character.wz/Hair/00031087.img
+  31100 Character.wz/Hair/00031100.img
+  31101 Character.wz/Hair/00031101.img
+  31102 Character.wz/Hair/00031102.img
+  31103 Character.wz/Hair/00031103.img
+  31104 Character.wz/Hair/00031104.img
+  31105 Character.wz/Hair/00031105.img
+  31106 Character.wz/Hair/00031106.img
+  31107 Character.wz/Hair/00031107.img
+  31130 Character.wz/Hair/00031130.img
+  31131 Character.wz/Hair/00031131.img
+  31132 Character.wz/Hair/00031132.img
+  31133 Character.wz/Hair/00031133.img
+  31134 Character.wz/Hair/00031134.img
+  31135 Character.wz/Hair/00031135.img
+  31136 Character.wz/Hair/00031136.img
+  31137 Character.wz/Hair/00031137.img
+  31140 Character.wz/Hair/00031140.img
+  31141 Character.wz/Hair/00031141.img
+  31142 Character.wz/Hair/00031142.img
+  31143 Character.wz/Hair/00031143.img
+  31144 Character.wz/Hair/00031144.img
+  31145 Character.wz/Hair/00031145.img
+  31146 Character.wz/Hair/00031146.img
+  31147 Character.wz/Hair/00031147.img
+  31230 Character.wz/Hair/00031230.img
+  31231 Character.wz/Hair/00031231.img
+  31232 Character.wz/Hair/00031232.img
+  31233 Character.wz/Hair/00031233.img
+  31234 Character.wz/Hair/00031234.img
+  31235 Character.wz/Hair/00031235.img
+  31236 Character.wz/Hair/00031236.img
+  31237 Character.wz/Hair/00031237.img
+  31240 Character.wz/Hair/00031240.img
+  31241 Character.wz/Hair/00031241.img
+  31242 Character.wz/Hair/00031242.img
+  31243 Character.wz/Hair/00031243.img
+  31244 Character.wz/Hair/00031244.img
+  31245 Character.wz/Hair/00031245.img
+  31246 Character.wz/Hair/00031246.img
+  31247 Character.wz/Hair/00031247.img
+  31260 Character.wz/Hair/00031260.img
+  31261 Character.wz/Hair/00031261.img
+  31262 Character.wz/Hair/00031262.img
+  31263 Character.wz/Hair/00031263.img
+  31264 Character.wz/Hair/00031264.img
+  31265 Character.wz/Hair/00031265.img
+  31266 Character.wz/Hair/00031266.img
+  31267 Character.wz/Hair/00031267.img
+  31310 Character.wz/Hair/00031310.img
+  31311 Character.wz/Hair/00031311.img
+  31312 Character.wz/Hair/00031312.img
+  31313 Character.wz/Hair/00031313.img
+  31314 Character.wz/Hair/00031314.img
+  31315 Character.wz/Hair/00031315.img
+  31316 Character.wz/Hair/00031316.img
+  31317 Character.wz/Hair/00031317.img
+  31350 Character.wz/Hair/00031350.img
+  31351 Character.wz/Hair/00031351.img
+  31352 Character.wz/Hair/00031352.img
+  31353 Character.wz/Hair/00031353.img
+  31354 Character.wz/Hair/00031354.img
+  31355 Character.wz/Hair/00031355.img
+  31356 Character.wz/Hair/00031356.img
+  31357 Character.wz/Hair/00031357.img
+  31400 Character.wz/Hair/00031400.img
+  31401 Character.wz/Hair/00031401.img
+  31402 Character.wz/Hair/00031402.img
+  31403 Character.wz/Hair/00031403.img
+  31404 Character.wz/Hair/00031404.img
+  31405 Character.wz/Hair/00031405.img
+  31406 Character.wz/Hair/00031406.img
+  31407 Character.wz/Hair/00031407.img
+  31440 Character.wz/Hair/00031440.img
+  31441 Character.wz/Hair/00031441.img
+  31442 Character.wz/Hair/00031442.img
+  31443 Character.wz/Hair/00031443.img
+  31444 Character.wz/Hair/00031444.img
+  31445 Character.wz/Hair/00031445.img
+  31446 Character.wz/Hair/00031446.img
+  31447 Character.wz/Hair/00031447.img
+  31450 Character.wz/Hair/00031450.img
+  31451 Character.wz/Hair/00031451.img
+  31452 Character.wz/Hair/00031452.img
+  31453 Character.wz/Hair/00031453.img
+  31454 Character.wz/Hair/00031454.img
+  31455 Character.wz/Hair/00031455.img
+  31456 Character.wz/Hair/00031456.img
+  31457 Character.wz/Hair/00031457.img
+  31490 Character.wz/Hair/00031490.img
+  31491 Character.wz/Hair/00031491.img
+  31492 Character.wz/Hair/00031492.img
+  31493 Character.wz/Hair/00031493.img
+  31494 Character.wz/Hair/00031494.img
+  31495 Character.wz/Hair/00031495.img
+  31496 Character.wz/Hair/00031496.img
+  31497 Character.wz/Hair/00031497.img
+  31660 Character.wz/Hair/00031660.img
+  31661 Character.wz/Hair/00031661.img
+  31662 Character.wz/Hair/00031662.img
+  31663 Character.wz/Hair/00031663.img
+  31664 Character.wz/Hair/00031664.img
+  31665 Character.wz/Hair/00031665.img
+  31666 Character.wz/Hair/00031666.img
+  31667 Character.wz/Hair/00031667.img
+  1932000 Character.wz/TamingMob/01932000.img
+  1932001 Character.wz/TamingMob/01932001.img
+  1932002 Character.wz/TamingMob/01932002.img
+  1932003 Character.wz/TamingMob/01932003.img
+  1932004 Character.wz/TamingMob/01932004.img
+  1932005 Character.wz/TamingMob/01932005.img
+  1932010 Character.wz/TamingMob/01932010.img
+  1932012 Character.wz/TamingMob/01932012.img

tools/MapleInvalidItemWithNoNameFetcher/manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

tools/MapleInvalidItemWithNoNameFetcher/src/maplenoitemnamefetcher/MapleNoItemNameFetcher.java

@@ -0,0 +1,563 @@
+/*
+    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 maplenoitemnamefetcher;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import provider.MapleData;
+import provider.MapleDataDirectoryEntry;
+import provider.MapleDataFileEntry;
+import provider.MapleDataProvider;
+import provider.MapleDataProviderFactory;
+
+/**
+ *
+ * @author RonanLana
+ * 
+ * This application finds inexistent itemids within the drop data from
+ * the Maplestory database specified by the URL below. This program
+ * assumes all itemids have at most 7 digits.
+ * 
+ * A file is generated listing all the inexistent ids.
+ * 
+ * Estimated parse time: 2 minutes
+ */
+public class MapleNoItemNameFetcher {
+    static String wzPath = "../../wz";
+    static String newFile = "lib/result.txt";
+    static String xmlFile = "lib/output.txt";
+
+    static PrintWriter printWriter = null;
+    static InputStreamReader fileReader = null;
+    static BufferedReader bufferedReader = null;
+    
+    static Map<Integer, String> itemsWzPath = new HashMap<>();
+    static Map<Integer, ItemType> itemTypes = new HashMap<>();
+    static Map<Integer, EquipType> equipTypes = new HashMap<>();
+    
+    static Map<Integer, ItemType> itemsWithNoNameProperty = new HashMap<>();
+    static Set<Integer> equipsWithNoCashProperty = new HashSet<>();
+
+    static ItemType curType = ItemType.UNDEF;
+    
+    private enum ItemType {
+        UNDEF, CASH, CONSUME, EQP, ETC, INS, PET
+    }
+    
+    private enum EquipType {
+        UNDEF, ACCESSORY, CAP, CAPE, COAT, FACE, GLOVE, HAIR, LONGCOAT, PANTS, PETEQUIP, RING, SHIELD, SHOES, TAMING, WEAPON
+    }
+    
+    private static void processStringSubdirectoryData(MapleData subdirData, String subdirPath) {
+        for(MapleData md : subdirData.getChildren()) {
+            try {
+                if(md.getChildByPath("name") != null) {
+                    int itemId = Integer.parseInt(md.getName());
+                    itemsWithNoNameProperty.remove(itemId);
+                } else {
+                    System.out.println("Found itemid on String.wz with no name property: " + subdirPath + subdirData.getName() + "/" + md.getName());
+                }
+            } catch (NumberFormatException nfe) {
+                System.out.println("Error reading string image: " + subdirPath + subdirData.getName() + "/" + md.getName());
+            }
+        }
+    }
+    
+    private static void readStringSubdirectoryData(MapleData subdirData, int depth, String subdirPath) {
+        if(depth > 0) {
+            for (MapleData mDir : subdirData.getChildren()) {
+                readStringSubdirectoryData(mDir, depth - 1, subdirPath + mDir.getName() + "/");
+            }
+        } else {
+            processStringSubdirectoryData(subdirData, subdirPath);
+        }
+    }
+    
+    private static void readStringSubdirectoryData(MapleData subdirData, int depth) {
+        readStringSubdirectoryData(subdirData, depth, "");
+    }
+    
+    private static void readStringWZData() {
+        System.out.println("Parsing String.wz...");
+        MapleDataProvider stringData = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/String.wz"));
+        
+        MapleData cashStringData = stringData.getData("Cash.img");
+        readStringSubdirectoryData(cashStringData, 0);
+        
+        MapleData consumeStringData = stringData.getData("Consume.img");
+        readStringSubdirectoryData(consumeStringData, 0);
+        
+        MapleData eqpStringData = stringData.getData("Eqp.img");
+        readStringSubdirectoryData(eqpStringData, 2);
+        
+        MapleData etcStringData = stringData.getData("Etc.img");
+        readStringSubdirectoryData(etcStringData, 1);
+        
+        MapleData insStringData = stringData.getData("Ins.img");
+        readStringSubdirectoryData(insStringData, 0);
+        
+        MapleData petStringData = stringData.getData("Pet.img");
+        readStringSubdirectoryData(petStringData, 0);
+    }
+    
+    private static boolean isTamingMob(int itemId) {
+        int itemType = itemId / 1000;
+        return itemType == 1902 || itemType == 1912;
+    }
+    
+    private static boolean isAccessory(int itemId) {
+        return itemId >= 1110000 && itemId < 1140000;
+    }
+    
+    private static ItemType getItemTypeFromDirectoryName(String dirName) {
+        switch(dirName) {
+            case "Cash":
+                return ItemType.CASH;
+                
+            case "Consume":
+                return ItemType.CONSUME;
+                
+            case "Etc":
+                return ItemType.ETC;
+                
+            case "Install":
+                return ItemType.INS;
+                
+            case "Pet":
+                return ItemType.PET;
+                
+            default:
+                return ItemType.UNDEF;
+        }
+    }
+    
+    private static EquipType getEquipTypeFromDirectoryName(String dirName) {
+        switch(dirName) {
+            case "Accessory":
+                return EquipType.ACCESSORY;
+            
+            case "Cap":
+                return EquipType.CAP;
+            
+            case "Cape":
+                return EquipType.CAPE;
+                    
+            case "Coat":
+                return EquipType.COAT;
+                        
+            case "Face":
+                return EquipType.FACE;
+                            
+            case "Glove":
+                return EquipType.GLOVE;
+                                
+            case "Hair":
+                return EquipType.HAIR;
+                                    
+            case "Longcoat":
+                return EquipType.LONGCOAT;
+                                        
+            case "Pants":
+                return EquipType.PANTS;
+                                            
+            case "PetEquip":
+                return EquipType.PETEQUIP;
+                
+            case "Ring":
+                return EquipType.RING;
+                    
+            case "Shield":
+                return EquipType.SHIELD;
+                        
+            case "Shoes":
+                return EquipType.SHOES;
+                            
+            case "TamingMob":
+                return EquipType.TAMING;
+                                
+            case "Weapon":
+                return EquipType.WEAPON;
+                
+            default:
+                return EquipType.UNDEF;
+        }
+    }
+    
+    private static String getStringDirectoryNameFromEquipType(EquipType eType) {
+        switch(eType) {
+            case ACCESSORY:
+                return "Accessory";
+            
+            case CAP:
+                return "Cap";
+            
+            case CAPE:
+                return "Cape";
+                    
+            case COAT:
+                return "Coat";
+                        
+            case FACE:
+                return "Face";
+                            
+            case GLOVE:
+                return "Glove";
+                                
+            case HAIR:
+                return "Hair";
+                                    
+            case LONGCOAT:
+                return "Longcoat";
+                                        
+            case PANTS:
+                return "Pants";
+                                            
+            case PETEQUIP:
+                return "PetEquip";
+                
+            case RING:
+                return "Ring";
+                    
+            case SHIELD:
+                return "Shield";
+                        
+            case SHOES:
+                return "Shoes";
+                            
+            case TAMING:
+                return "Taming";
+                                
+            case WEAPON:
+                return "Weapon";
+                
+            default:
+                return "Undefined";
+        }
+    }
+    
+    private static void readEquipNodeData(MapleDataProvider data, MapleDataDirectoryEntry mDir, String wzFileName, String dirName) {
+        EquipType eqType = getEquipTypeFromDirectoryName(dirName);
+        
+        for(MapleDataFileEntry mFile : mDir.getFiles()) {
+            String fileName = mFile.getName();
+
+            try {
+                int itemId = Integer.parseInt(fileName.substring(0, 8));        
+                itemsWithNoNameProperty.put(itemId, curType);
+                equipTypes.put(itemId, eqType);
+                
+                itemsWzPath.put(itemId, wzFileName + "/" + dirName + "/" + fileName);
+
+                if(!isAccessory(itemId) && !isTamingMob(itemId)) {
+                    try {
+                        MapleData fileData = data.getData(dirName + "/" + fileName);
+                        MapleData mdinfo = fileData.getChildByPath("info");
+                        if( mdinfo.getChildByPath("cash") == null) {
+                            equipsWithNoCashProperty.add(itemId);
+                        }
+                    } catch(NullPointerException npe) {
+                        System.out.println("[SEVERE] " + mFile.getName() + " failed to load. Issue: " + npe.getMessage() + "\n\n");
+                    }
+                }
+            } catch (Exception e) {}
+        }
+    }
+    
+    private static void readEquipWZData() {
+        String wzFileName = "Character.wz";
+        
+        MapleDataProvider data = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/Character.wz"));
+        MapleDataDirectoryEntry root = data.getRoot();
+        
+        System.out.println("Parsing " + wzFileName + "...");
+        for (MapleDataDirectoryEntry mDir : root.getSubdirectories()) {
+            String dirName = mDir.getName();
+            if(dirName.contentEquals("Dragon")) continue;
+            
+            readEquipNodeData(data, mDir, wzFileName, dirName);
+        }
+    }
+    
+    private static void readItemWZData() {
+        String wzFileName = "Item.wz";
+        
+        MapleDataProvider data = MapleDataProviderFactory.getDataProvider(new File(System.getProperty("wzpath") + "/Item.wz"));
+        MapleDataDirectoryEntry root = data.getRoot();
+        
+        System.out.println("Parsing " + wzFileName + "...");
+        for (MapleDataDirectoryEntry mDir : root.getSubdirectories()) {
+            String dirName = mDir.getName();
+            if(dirName.contentEquals("Special")) continue;
+            
+            curType = getItemTypeFromDirectoryName(dirName);
+            if(!dirName.contentEquals("Pet")) {
+                for(MapleDataFileEntry mFile : mDir.getFiles()) {
+                    String fileName = mFile.getName();
+
+                    MapleData fileData = data.getData(dirName + "/" + fileName);
+                    for(MapleData mData : fileData.getChildren()) {
+                        try {
+                            int itemId = Integer.parseInt(mData.getName());
+                            itemsWithNoNameProperty.put(itemId, curType);
+                            itemsWzPath.put(itemId, wzFileName + "/" + dirName + "/" + fileName);
+                        } catch (Exception e) {
+                            System.out.println("EXCEPTION on '" + mData.getName() + "' " + wzFileName + "/" + dirName + "/" + fileName);
+                        }
+                    }
+                }
+            } else {
+                readEquipNodeData(data, mDir, wzFileName, dirName);
+            }
+        }
+    }
+    
+    private static void printReportFileHeader() {
+        printWriter.println(" # Report File autogenerated from the MapleInvalidItemWithNoNameFetcher feature by Ronan Lana.");
+        printWriter.println(" # Generated data takes into account several data info from the server-side WZ.xmls.");
+        printWriter.println();
+    }
+    
+    private static void printReportFileResults() {
+        if(!itemsWithNoNameProperty.isEmpty()) {
+            printWriter.println("Itemids with missing 'name' property: ");
+            
+            List<Integer> itemids = new ArrayList<>(itemsWithNoNameProperty.keySet());
+            Collections.sort(itemids);
+            
+            for(Integer itemid : itemids) {
+                printWriter.println("  " + itemid + " " + itemsWzPath.get(itemid));
+            }
+            printWriter.println();
+        }
+        
+        if(!equipsWithNoCashProperty.isEmpty()) {
+            printWriter.println("Equipids with missing 'cash' property: ");
+            
+            List<Integer> itemids = new ArrayList<>(equipsWithNoCashProperty);
+            Collections.sort(itemids);
+            
+            for(Integer itemid : itemids) {
+                printWriter.println("  " + itemid + " " + itemsWzPath.get(itemid));
+            }
+        }
+    }
+    
+    private static Map<String, List<Integer>> filterMissingItemNames() {
+        List<Integer> cashList = new ArrayList<>(20);
+        List<Integer> consList = new ArrayList<>(20);
+        List<Integer> eqpList = new ArrayList<>(20);
+        List<Integer> etcList = new ArrayList<>(20);
+        List<Integer> insList = new ArrayList<>(20);
+        List<Integer> petList = new ArrayList<>(20);
+        
+        for(Entry<Integer, ItemType> ids : itemsWithNoNameProperty.entrySet()) {
+            switch(ids.getValue()) {
+                case CASH:
+                    cashList.add(ids.getKey());
+                    break;
+                
+                case CONSUME:
+                    consList.add(ids.getKey());
+                    break;
+                    
+                case EQP:
+                    eqpList.add(ids.getKey());
+                    break;
+                    
+                case ETC:
+                    etcList.add(ids.getKey());
+                    break;
+                    
+                case INS:
+                    insList.add(ids.getKey());
+                    break;
+                    
+                case PET:
+                    petList.add(ids.getKey());
+                    break;
+            }
+        }
+        
+        Map<String, List<Integer>> nameTags = new HashMap<>();
+        nameTags.put("Cash.img", cashList);
+        nameTags.put("Consume.img", consList);
+        nameTags.put("Eqp.img", eqpList);
+        nameTags.put("Etc.img", etcList);
+        nameTags.put("Ins.img", insList);
+        nameTags.put("Pet.img", petList);
+        
+        return nameTags;
+    }
+    
+    private static void printOutputFileHeader() {
+        printWriter.println(" # XML File autogenerated from the MapleInvalidItemWithNoNameFetcher feature by Ronan Lana.");
+        printWriter.println(" # Generated data takes into account several data info from the server-side WZ.xmls.");
+        printWriter.println();
+    }
+    
+    private static void writeMissingEquipInfo(Integer itemid) {
+        printWriter.println("      <imgdir name=\"" + itemid + "\">");
+        printWriter.println("        <string name=\"name\" value=\"MISSING NAME\"/>");
+        printWriter.println("        <string name=\"desc\" value=\"MISSING INFO\"/>");
+        printWriter.println("      </imgdir>");
+    }
+    
+    private static void writeEquipSubdirectoryHeader(EquipType eType) {
+        printWriter.println("    <imgdir name=\"" + getStringDirectoryNameFromEquipType(eType) + "\">");
+    }
+    
+    private static void writeEquipSubdirectoryFooter() {
+        printWriter.println("    </imgdir>");
+    }
+    
+    private static void writeEquipXMLHeader() {
+        printWriter.println("  <imgdir name=\"Eqp\">");
+    }
+    
+    private static void writeEquipXMLFooter() {
+        printWriter.println("  </imgdir>");
+    }
+    
+    private static void writeMissingItemInfo(Integer itemid) {
+        printWriter.println("  <imgdir name=\"" + itemid + "\">");
+        printWriter.println("    <string name=\"name\" value=\"MISSING NAME\"/>");
+        printWriter.println("    <string name=\"desc\" value=\"MISSING INFO\"/>");
+        printWriter.println("  </imgdir>");
+    }
+    
+    private static void writeXMLHeader(String fileName) {
+        printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>");
+        printWriter.println("<imgdir name=\"" + fileName + "\">");
+    }
+    
+    private static void writeXMLFooter() {
+        printWriter.println("</imgdir>");
+    }
+    
+    private static void writeMissingEquipWZNode(EquipType eType, List<Integer> missingNames) {
+        if(!missingNames.isEmpty()) {
+            Collections.sort(missingNames);
+            writeEquipSubdirectoryHeader(eType);
+            
+            for(Integer equipid : missingNames) {
+                writeMissingEquipInfo(equipid);
+            }
+            
+            writeEquipSubdirectoryFooter();
+        }
+    }
+    
+    private static void writeMissingStringWZNode(String nodePath, List<Integer> missingNames, boolean isEquip) {
+        if(!missingNames.isEmpty()) {
+            if(!isEquip) {
+                Collections.sort(missingNames);
+
+                printWriter.println(nodePath + ":");
+                printWriter.println();
+
+                writeXMLHeader(nodePath);
+
+                for(Integer i : missingNames) {
+                    writeMissingItemInfo(i);
+                }
+
+                writeXMLFooter();
+
+                printWriter.println();
+            } else {
+                int arraySize = EquipType.values().length;
+                
+                List<Integer> equips[] = new List[arraySize];
+                for(int i = 0; i < arraySize; i++) {
+                    equips[i] = new ArrayList<>(42);
+                }
+                
+                for(Integer itemid : missingNames) {
+                    equips[equipTypes.get(itemid).ordinal()].add(itemid);
+                }
+                
+                printWriter.println(nodePath + ":");
+                printWriter.println();
+
+                writeXMLHeader(nodePath);
+                writeEquipXMLHeader();
+
+                for(EquipType eType : EquipType.values()) {
+                    writeMissingEquipWZNode(eType, equips[eType.ordinal()]);
+                }
+
+                writeEquipXMLFooter();
+                writeXMLFooter();
+
+                printWriter.println();
+            }
+        }
+    }
+    
+    private static void writeMissingStringWZNames(Map<String, List<Integer>> missingNames) throws Exception {
+        System.out.println("Writing remaining 'String.wz' names...");
+        
+        printWriter = new PrintWriter(xmlFile, "UTF-8");    
+        printOutputFileHeader();
+        
+        String nodePaths[] = {"Cash.img", "Consume.img", "Eqp.img", "Etc.img", "Ins.img", "Pet.img"};
+        for(int i = 0; i < nodePaths.length; i++) {
+            writeMissingStringWZNode(nodePaths[i], missingNames.get(nodePaths[i]), i == 2);
+        }
+        
+        printWriter.close();
+    }
+    
+    public static void main(String[] args) {
+        try {
+            System.setProperty("wzpath", wzPath);
+            
+            curType = ItemType.EQP;
+            readEquipWZData();
+            
+            curType = ItemType.UNDEF;
+            readItemWZData();
+            readStringWZData();             // calculates the diff and effectively holds all items with no name property on the WZ
+            
+            System.out.println("Reporting results...");
+            printWriter = new PrintWriter(newFile, "UTF-8");
+            printReportFileHeader();
+            printReportFileResults();
+            printWriter.close();
+            
+            Map<String, List<Integer>> missingNames = filterMissingItemNames();
+            writeMissingStringWZNames(missingNames);
+            
+            System.out.println("Done!");
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

tools/MapleInvalidItemWithNoNameFetcher/src/maplenoitemnamefetcher/Pair.java

@@ -0,0 +1,121 @@
+/*
+This file is part of the OdinMS Maple Story Server
+Copyright (C) 2008 ~ 2010 Patrick Huy <patrick.huy@frz.cc> 
+Matthias Butz <matze@odinms.de>
+Jan Christian Meyer <vimes@odinms.de>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License 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 maplenoitemnamefetcher;
+
+/**
+ * Represents a pair of values.
+ * 
+ * @author Frz
+ * @since Revision 333
+ * @version 1.0
+ * 
+ * @param <E> The type of the left value.
+ * @param <F> The type of the right value.
+ */
+public class Pair<E, F> {
+
+    public E left;
+    public F right;
+
+    /**
+     * Class constructor - pairs two objects together.
+     *
+     * @param left The left object.
+     * @param right The right object.
+     */
+    public Pair(E left, F right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    /**
+     * Gets the left value.
+     *
+     * @return The left value.
+     */
+    public E getLeft() {
+        return left;
+    }
+
+    /**
+     * Gets the right value.
+     *
+     * @return The right value.
+     */
+    public F getRight() {
+        return right;
+    }
+
+    /**
+     * Turns the pair into a string.
+     *
+     * @return Each value of the pair as a string joined by a colon.
+     */
+    @Override
+    public String toString() {
+        return left.toString() + ":" + right.toString();
+    }
+
+    /**
+     * Gets the hash code of this pair.
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((left == null) ? 0 : left.hashCode());
+        result = prime * result + ((right == null) ? 0 : right.hashCode());
+        return result;
+    }
+
+    /**
+     * Checks to see if two pairs are equal.
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final Pair other = (Pair) obj;
+        if (left == null) {
+            if (other.left != null) {
+                return false;
+            }
+        } else if (!left.equals(other.left)) {
+            return false;
+        }
+        if (right == null) {
+            if (other.right != null) {
+                return false;
+            }
+        } else if (!right.equals(other.right)) {
+            return false;
+        }
+        return true;
+    }
+}

tools/MapleInvalidItemWithNoNameFetcher/src/provider/MapleCanvas.java

@@ -0,0 +1,30 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    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 provider;
+
+import java.awt.image.BufferedImage;
+
+public interface MapleCanvas {
+    int getHeight();
+    int getWidth();
+    BufferedImage getImage();
+}

tools/MapleInvalidItemWithNoNameFetcher/src/provider/MapleData.java

@@ -0,0 +1,34 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    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 provider;
+
+import java.util.List;
+import provider.wz.MapleDataType;
+
+public interface MapleData extends MapleDataEntity, Iterable<MapleData> {
+    @Override
+    public String getName();
+    public MapleDataType getType();
+    public List<MapleData> getChildren();
+    public MapleData getChildByPath(String path);
+    public Object getData();
+}

tools/MapleInvalidItemWithNoNameFetcher/src/provider/MapleDataDirectoryEntry.java

@@ -0,0 +1,34 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    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 provider;
+
+import java.util.List;
+
+/**
+ *
+ * @author Matze
+ */
+public interface MapleDataDirectoryEntry extends MapleDataEntry {
+    public List<MapleDataDirectoryEntry> getSubdirectories();
+    public List<MapleDataFileEntry> getFiles();
+    public MapleDataEntry getEntry(String name);
+}

tools/MapleInvalidItemWithNoNameFetcher/src/provider/MapleDataEntity.java

@@ -0,0 +1,31 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    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 provider;
+
+/**
+ *
+ * @author Matze
+ */
+public interface MapleDataEntity {
+    public String getName();
+    public MapleDataEntity getParent();
+}

tools/MapleInvalidItemWithNoNameFetcher/src/provider/MapleDataEntry.java

@@ -0,0 +1,33 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    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 provider;
+
+/**
+ *
+ * @author Matze
+ */
+public interface MapleDataEntry extends MapleDataEntity {
+    public String getName();
+    public int getSize();
+    public int getChecksum();
+    public int getOffset();
+}