Player/NPC Shop patch + Fredrick/Duey patch + Loot w. time GMS-like

Reading approximated unitPrice value from WZ in such a fashion that the new double value can be represented in float point without losing too much data.
Fixed rechargeables with quantity 0 set on the playershop/hiredmerchant being handed back to the owner with quantity 1.
Solved many concurrecy issues related with items on the field and playershop/hiredmerchant.
Fixed anomalies with waiting time before picking up other players items, now acting GMS-like.
Added/patched copyleft claims in files that are from my own authorship. Please see backtrack_licenses/readme.txt for more info about this move.
Fixed issues with item retrieval when using bundles on playershop/hiredmerchant.
Fixed some exploits with playershop/hiredmerchant.
Fixed a glitch with npcshop when trying to recharge/buy items without having enough mesos.
Added portal sound effect for some scripted portals that still lacked it.
Fixed some exploits with NPCs Fredrick and Duey.
Fixed Body Pressure not displaying damage to other players.
Added a flag that permits town scrolls to act like a "banish" for players. This renders the antibanish scroll effect available.

src/client/MapleCharacter.java

@@ -22,6 +22,7 @@
 package client;
 
 import java.awt.Point;
+import java.lang.ref.WeakReference;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -45,7 +46,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.Comparator;
-import tools.locks.MonitoredReentrantLock;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -106,6 +106,7 @@ import tools.FilePrinter;
 import tools.MaplePacketCreator;
 import tools.Pair;
 import tools.Randomizer;
+import tools.locks.MonitoredReentrantLock;
 import client.autoban.AutobanManager;
 import client.inventory.Equip;
 import client.inventory.Item;
@@ -242,6 +243,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
     private SavedLocation savedLocations[];
     private SkillMacro[] skillMacros = new SkillMacro[5];
     private List<Integer> lastmonthfameids;
+    private List<WeakReference<MapleMap>> lastVisitedMaps = new LinkedList<>();
     private final Map<Short, MapleQuestStatus> quests;
     private Set<MapleMonster> controlled = new LinkedHashSet<>();
     private Map<Integer, String> entered = new LinkedHashMap<>();
@@ -1176,7 +1178,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
         this.banishTime = 0;
     }
     
-    private void setBanishPlayerData(int banishMap, int banishSp, long banishTime) {
+    public void setBanishPlayerData(int banishMap, int banishSp, long banishTime) {
         this.banishMap = banishMap;
         this.banishSp = banishSp;
         this.banishTime = banishTime;
@@ -1319,6 +1321,74 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
         return false;
     }
     
+    public void updateMapDropsUponPartyOperation(List<MapleCharacter> exPartyMembers) {
+        List<WeakReference<MapleMap>> mapids;
+        
+        petLock.lock();
+        try {
+            mapids = new LinkedList<>(lastVisitedMaps);
+        } finally {
+            petLock.unlock();
+        }
+        
+        List<MapleCharacter> partyMembers = new LinkedList<>();
+        for(MapleCharacter mc : (exPartyMembers != null) ? exPartyMembers : this.getPartyMembers()) {
+            if(mc.isLoggedinWorld()) {
+                partyMembers.add(mc);
+            }
+        }
+        
+        MapleCharacter partyLeaver = null;
+        if(exPartyMembers != null) {
+            partyMembers.remove(this);
+            partyLeaver = this;
+        }
+        
+        int partyId = exPartyMembers != null ? 0 : this.getPartyId();
+        for(WeakReference<MapleMap> mapRef : mapids) {
+            MapleMap mapObj = mapRef.get();
+            
+            if(mapObj != null) {
+                mapObj.updatePlayerItemDrops(partyId, id, partyMembers, partyLeaver);
+            }
+        }
+    }
+    
+    private Integer getVisitedMapIndex(MapleMap map) {
+        int idx = 0;
+        
+        for(WeakReference<MapleMap> mapRef : lastVisitedMaps) {
+            if(map.equals(mapRef.get())) {
+                return idx;
+            }
+            
+            idx++;
+        }
+        
+        return -1;
+    }
+    
+    public void visitMap(MapleMap map) {
+        petLock.lock();
+        try {
+            int idx = getVisitedMapIndex(map);
+        
+            if(idx == -1) {
+                if(lastVisitedMaps.size() == ServerConstants.MAP_VISITED_SIZE) {
+                    lastVisitedMaps.remove(0);
+                }
+            } else {
+                WeakReference<MapleMap> mapRef = lastVisitedMaps.remove(idx);
+                lastVisitedMaps.add(mapRef);
+                return;
+            }
+
+            lastVisitedMaps.add(new WeakReference<>(map));
+        } finally {
+            petLock.unlock();
+        }
+    }
+    
     private void changeMapInternal(final MapleMap to, final Point pos, final byte[] warpPacket) {
         if(!canWarpMap) return;
         
@@ -1335,6 +1405,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
             map = to;
             setPosition(pos);
             map.addPlayer(this);
+            visitMap(map);
             
             prtLock.lock();
             try {
@@ -1522,50 +1593,55 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
                 return;
             }
             
-            boolean isPet = petIndex > -1;
-            final byte[] pickupPacket = MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex);
-            
-            boolean hasSpaceInventory = true;
-            if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866 || mapitem.getMeso() > 0 || ii.isConsumeOnPickup(mapitem.getItemId()) || (hasSpaceInventory = MapleInventoryManipulator.checkSpace(client, mapitem.getItemId(), mapitem.getItem().getQuantity(), mapitem.getItem().getOwner()))) {
-                if ((this.getMapId() > 209000000 && this.getMapId() < 209000016) || (this.getMapId() >= 990000500 && this.getMapId() <= 990000502)) {//happyville trees and guild PQ
-                    if (!mapitem.isPlayerDrop() || mapitem.getDropper().getObjectId() == client.getPlayer().getObjectId()) {
-                        if(mapitem.getMeso() > 0) {
-                            this.gainMeso(mapitem.getMeso(), true, true, false);
-                            this.getMap().pickItemDrop(pickupPacket, mapitem);
-                        } else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) {
-                            // Add NX to account, show effect and make item disappear
-                            int nxGain = mapitem.getItemId() == 4031865 ? 100 : 250;
-                            this.getCashShop().gainCash(1, nxGain);
-                            
-                            showHint("You have earned #e#b" + nxGain + " NX#k#n. (" + this.getCashShop().getCash(1) + " NX)", 300);
-                            
-                            this.getMap().pickItemDrop(pickupPacket, mapitem);
-                        } else if (MapleInventoryManipulator.addFromDrop(client, mapitem.getItem(), true)) {
-                            this.getMap().pickItemDrop(pickupPacket, mapitem);
-                        } else {
-                            client.announce(MaplePacketCreator.enableActions());
-                            return;
-                        }
-                    } else {
-                        client.announce(MaplePacketCreator.showItemUnavailable());
-                        client.announce(MaplePacketCreator.enableActions());
-                        return;
-                    }
+            mapitem.lockItem();
+            try {
+                if(mapitem.isPickedUp()) {
+                    client.announce(MaplePacketCreator.showItemUnavailable());
                     client.announce(MaplePacketCreator.enableActions());
                     return;
                 }
+                
+                boolean isPet = petIndex > -1;
+                final byte[] pickupPacket = MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), (isPet) ? 5 : 2, this.getId(), isPet, petIndex);
+
+                boolean hasSpaceInventory = true;
+                if (mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866 || mapitem.getMeso() > 0 || ii.isConsumeOnPickup(mapitem.getItemId()) || (hasSpaceInventory = MapleInventoryManipulator.checkSpace(client, mapitem.getItemId(), mapitem.getItem().getQuantity(), mapitem.getItem().getOwner()))) {
+                    int mapId = this.getMapId();
+                    
+                    if ((mapId > 209000000 && mapId < 209000016) || (mapId >= 990000500 && mapId <= 990000502)) {//happyville trees and guild PQ
+                        if (!mapitem.isPlayerDrop() || mapitem.getDropper().getObjectId() == client.getPlayer().getObjectId()) {
+                            if(mapitem.getMeso() > 0) {
+                                this.gainMeso(mapitem.getMeso(), true, true, false);
+                                this.getMap().pickItemDrop(pickupPacket, mapitem);
+                            } else if(mapitem.getItemId() == 4031865 || mapitem.getItemId() == 4031866) {
+                                // Add NX to account, show effect and make item disappear
+                                int nxGain = mapitem.getItemId() == 4031865 ? 100 : 250;
+                                this.getCashShop().gainCash(1, nxGain);
+
+                                showHint("You have earned #e#b" + nxGain + " NX#k#n. (" + this.getCashShop().getCash(1) + " NX)", 300);
+
+                                this.getMap().pickItemDrop(pickupPacket, mapitem);
+                            } else if (MapleInventoryManipulator.addFromDrop(client, mapitem.getItem(), true)) {
+                                this.getMap().pickItemDrop(pickupPacket, mapitem);
+                            } else {
+                                client.announce(MaplePacketCreator.enableActions());
+                                return;
+                            }
+                        } else {
+                            client.announce(MaplePacketCreator.showItemUnavailable());
+                            client.announce(MaplePacketCreator.enableActions());
+                            return;
+                        }
+                        client.announce(MaplePacketCreator.enableActions());
+                        return;
+                    }
             
-                synchronized (mapitem) {
                     if (mapitem.getQuest() > 0 && !this.needQuestItem(mapitem.getQuest(), mapitem.getItemId())) {
                         client.announce(MaplePacketCreator.showItemUnavailable());
                         client.announce(MaplePacketCreator.enableActions());
                         return;
                     }
-                    if (mapitem.isPickedUp()) {
-                        client.announce(MaplePacketCreator.showItemUnavailable());
-                        client.announce(MaplePacketCreator.enableActions());
-                        return;
-                    }
+                    
                     if (mapitem.getMeso() > 0) {
                         prtLock.lock();
                         try {
@@ -1628,10 +1704,12 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
                     }
                     
                     this.getMap().pickItemDrop(pickupPacket, mapitem);
+                } else if(!hasSpaceInventory) {
+                    client.announce(MaplePacketCreator.getInventoryFull());
+                    client.announce(MaplePacketCreator.getShowInventoryFull());
                 }
-            } else if(!hasSpaceInventory) {
-                client.announce(MaplePacketCreator.getInventoryFull());
-                client.announce(MaplePacketCreator.getShowInventoryFull());
+            } finally {
+                mapitem.unlockItem();
             }
         }
         client.announce(MaplePacketCreator.enableActions());
@@ -4746,7 +4824,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
             e.printStackTrace();
         }
     }
-
+    
     public void handleEnergyChargeGain() { // to get here energychargelevel has to be > 0
         Skill energycharge = isCygnus() ? SkillFactory.getSkill(ThunderBreaker.ENERGY_CHARGE) : SkillFactory.getSkill(Marauder.ENERGY_CHARGE);
         MapleStatEffect ceffect;
@@ -6111,8 +6189,10 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
         try {
             if (party != null) {
                 int channel = client.getChannel();
+                int mapId = getMapId();
+                
                 for (MaplePartyCharacter partychar : party.getMembers()) {
-                    if (partychar.getMapId() == getMapId() && partychar.getChannel() == channel) {
+                    if (partychar.getMapId() == mapId && partychar.getChannel() == channel) {
                         MapleCharacter other = Server.getInstance().getWorld(world).getChannel(channel).getPlayerStorage().getCharacterByName(partychar.getName());
                         if (other != null) {
                             client.announce(MaplePacketCreator.updatePartyMemberHP(other.getId(), other.getHp(), other.getCurrentMaxHp()));
@@ -6983,6 +7063,23 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
         }
         merchantmeso = set;
     }
+    
+    public synchronized void withdrawMerchantMesos() {
+        int merchantMeso = this.getMerchantMeso();
+        if (merchantMeso > 0) {
+            int possible = Integer.MAX_VALUE - merchantMeso;
+            
+            if (possible > 0) {
+                if (possible < merchantMeso) {
+                    this.gainMeso(possible, false);
+                    this.setMerchantMeso(merchantMeso - possible);
+                } else {
+                    this.gainMeso(merchantMeso, false);
+                    this.setMerchantMeso(0);
+                }
+            }
+        }
+    }
 
     public void setHiredMerchant(MapleHiredMerchant merchant) {
         this.hiredMerchant = merchant;
@@ -7264,7 +7361,7 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
         if (item == null){ //Basic check
             return(0);
         }
-        if (ItemConstants.isRechargable(item.getItemId())) {
+        if (ItemConstants.isRechargeable(item.getItemId())) {
             quantity = item.getQuantity();
         }
         if (quantity < 0) {
@@ -7540,8 +7637,10 @@ public class MapleCharacter extends AbstractAnimatedMapleMapObject {
     private void updatePartyMemberHPInternal() {
         if (party != null) {
             int channel = client.getChannel();
+            int mapId = getMapId();
+            
             for (MaplePartyCharacter partychar : party.getMembers()) {
-                if (partychar.getMapId() == getMapId() && partychar.getChannel() == channel) {
+                if (partychar.getMapId() == mapId && partychar.getChannel() == channel) {
                     MapleCharacter other = Server.getInstance().getWorld(world).getChannel(channel).getPlayerStorage().getCharacterByName(partychar.getName());
                     if (other != null) {
                         other.client.announce(MaplePacketCreator.updatePartyMemberHP(getId(), this.hp, maxhp));

src/client/MapleClient.java

@@ -106,6 +106,7 @@ public class MapleClient {
 	private byte gender = -1;
 	private boolean disconnecting = false;
 	private final Lock lock = new MonitoredReentrantLock(MonitoredLockType.CLIENT, true);
+        private static final Lock loginLock = new MonitoredReentrantLock(MonitoredLockType.CLIENT, true);
 	private int votePoints;
 	private int voteTime = -1;
 	private long lastNpcClick;
@@ -420,13 +421,17 @@ public class MapleClient {
 	}
 
 	public int finishLogin() {
-		synchronized (MapleClient.class) {
-			if (getLoginState() > LOGIN_NOTLOGGEDIN) { // 0 = LOGIN_NOTLOGGEDIN, 1= LOGIN_SERVER_TRANSITION, 2 = LOGIN_LOGGEDIN
-				loggedIn = false;
-				return 7;
-			}
-			updateLoginState(LOGIN_LOGGEDIN);
-		}
+                loginLock.lock();
+                try {
+                    if (getLoginState() > LOGIN_NOTLOGGEDIN) { // 0 = LOGIN_NOTLOGGEDIN, 1= LOGIN_SERVER_TRANSITION, 2 = LOGIN_LOGGEDIN
+                        loggedIn = false;
+                        return 7;
+                    }
+                    updateLoginState(LOGIN_LOGGEDIN);
+                } finally {
+                    loginLock.unlock();
+                }
+            
 		return 0;
 	}
 

src/client/command/Commands.java

@@ -1202,7 +1202,7 @@ public class Commands {
                 case "heal":
 			player.setHpMp(30000);
                     break;
-                    
+                
                 case "item":
                 case "drop":
                         if (sub.length < 2){
@@ -2533,23 +2533,31 @@ public class Commands {
                     case "forcevac":
                             List<MapleMapObject> items = player.getMap().getMapObjectsInRange(player.getPosition(), Double.POSITIVE_INFINITY, Arrays.asList(MapleMapObjectType.ITEM));
                             for (MapleMapObject item : items) {
-                                MapleMapItem mapItem = (MapleMapItem) item;
-                                if (mapItem.getMeso() > 0) {
-                                        player.gainMeso(mapItem.getMeso(), true);
-                                } else if(mapItem.getItemId() == 4031865 || mapItem.getItemId() == 4031866) {
-                                        // Add NX to account, show effect and make item disappear
-                                        player.getCashShop().gainCash(1, mapItem.getItemId() == 4031865 ? 100 : 250);
-                                } else if (mapItem.getItem().getItemId() >= 5000000 && mapItem.getItem().getItemId() <= 5000100) {
-                                        int petId = MaplePet.createPet(mapItem.getItem().getItemId());
-                                        if (petId == -1) {
-                                                continue;
-                                        }
-                                        MapleInventoryManipulator.addById(c, mapItem.getItem().getItemId(), mapItem.getItem().getQuantity(), null, petId);
-                                } else {
-                                        MapleInventoryManipulator.addFromDrop(c, mapItem.getItem(), true);
-                                }
-                                
-                                player.getMap().pickItemDrop(MaplePacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem);
+                                    MapleMapItem mapItem = (MapleMapItem) item;
+
+                                    mapItem.lockItem();
+                                    try {
+                                            if(mapItem.isPickedUp()) continue;
+
+                                            if (mapItem.getMeso() > 0) {
+                                                    player.gainMeso(mapItem.getMeso(), true);
+                                            } else if(mapItem.getItemId() == 4031865 || mapItem.getItemId() == 4031866) {
+                                                    // Add NX to account, show effect and make item disappear
+                                                    player.getCashShop().gainCash(1, mapItem.getItemId() == 4031865 ? 100 : 250);
+                                            } else if (mapItem.getItem().getItemId() >= 5000000 && mapItem.getItem().getItemId() <= 5000100) {
+                                                    int petId = MaplePet.createPet(mapItem.getItem().getItemId());
+                                                    if (petId == -1) {
+                                                            continue;
+                                                    }
+                                                    MapleInventoryManipulator.addById(c, mapItem.getItem().getItemId(), mapItem.getItem().getQuantity(), null, petId);
+                                            } else {
+                                                    MapleInventoryManipulator.addFromDrop(c, mapItem.getItem(), true);
+                                            }
+
+                                            player.getMap().pickItemDrop(MaplePacketCreator.removeItemFromMap(mapItem.getObjectId(), 2, player.getId()), mapItem);
+                                    } finally {
+                                            mapItem.unlockItem();
+                                    }
                             }
                         break;
                             

src/client/inventory/MapleInventory.java

@@ -146,7 +146,7 @@ public class MapleInventory implements Iterable<Item> {
         List<Item> itemList = listById(itemId);
         int openSlot = 0;
         
-        if(!ItemConstants.isRechargable(itemId)) {
+        if(!ItemConstants.isRechargeable(itemId)) {
             for (Item item : itemList) {
                 required -= item.getQuantity();
 
@@ -246,7 +246,7 @@ public class MapleInventory implements Iterable<Item> {
                 source.setPosition(dSlot);
                 inventory.put(dSlot, source);
                 inventory.remove(sSlot);
-            } else if (target.getItemId() == source.getItemId() && !ItemConstants.isRechargable(source.getItemId()) && isSameOwner(source, target)) {
+            } else if (target.getItemId() == source.getItemId() && !ItemConstants.isRechargeable(source.getItemId()) && isSameOwner(source, target)) {
                 if (type.getType() == MapleInventoryType.EQUIP.getType() || type.getType() == MapleInventoryType.CASH.getType()) {
                     swap(target, source);
                 } else if (source.getQuantity() + target.getQuantity() > slotMax) {

src/client/newyear/NewYearCardRecord.java

@@ -1,21 +1,22 @@
 /*
- * This file is part of the HeavenMS (MapleSolaxiaV2) Maple Story Server
- *
- * Copyright (C) 2017 RonanLana
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+    This file is part of the HeavenMS MapleStory Server
+    Copyleft (L) 2016 - 2018 RonanLana
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 package client.newyear;
 
 import client.MapleCharacter;

src/client/processor/DueyProcessor.java

@@ -0,0 +1,493 @@
+/*
+	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]>
+
+    Copyleft (L) 2016 - 2018 RonanLana (HeavenMS)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package client.processor;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.autoban.AutobanFactory;
+import client.inventory.Equip;
+import client.inventory.Item;
+import client.inventory.MapleInventoryType;
+import constants.ItemConstants;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
+import net.server.channel.Channel;
+import server.DueyPackages;
+import server.MapleInventoryManipulator;
+import server.MapleItemInformationProvider;
+import tools.DatabaseConnection;
+import tools.FilePrinter;
+import tools.MaplePacketCreator;
+
+/**
+ *
+ * @author RonanLana (synchronization of Duey modules)
+ */
+public class DueyProcessor {
+    
+    public enum Actions {
+        TOSERVER_SEND_ITEM(0x02),
+        TOSERVER_CLAIM_PACKAGE(0x04),
+        TOSERVER_REMOVE_PACKAGE(0x05),
+        TOSERVER_CLOSE_DUEY(0x07),
+        TOCLIENT_OPEN_DUEY(0x08),
+        TOCLIENT_SEND_ENABLE_ACTIONS(0x09),
+        TOCLIENT_SEND_NOT_ENOUGH_MESOS(0x0A),
+        TOCLIENT_SEND_INCORRECT_REQUEST(0x0B),
+        TOCLIENT_SEND_NAME_DOES_NOT_EXIST(0x0C),
+        TOCLIENT_SEND_SAMEACC_ERROR(0x0D),
+        TOCLIENT_SEND_RECEIVER_STORAGE_FULL(0x0E),
+        TOCLIENT_SEND_RECEIVER_UNABLE_TO_RECV(0x0F),
+        TOCLIENT_SEND_RECEIVER_STORAGE_WITH_UNIQUE(0x10),
+        TOCLIENT_SEND_MESO_LIMIT(0x11),
+        TOCLIENT_SEND_SUCCESSFULLY_SENT(0x12),
+        TOCLIENT_RECV_UNKNOWN_ERROR(0x13),
+        TOCLIENT_RECV_ENABLE_ACTIONS(0x14),
+        TOCLIENT_RECV_NO_FREE_SLOTS(0x15),
+        TOCLIENT_RECV_RECEIVER_WITH_UNIQUE(0x16),
+        TOCLIENT_RECV_SUCCESSFUL_MSG(0x17),
+        TOCLIENT_RECV_PACKAGE_MSG(0x1B);
+        final byte code;
+
+        private Actions(int code) {
+            this.code = (byte) code;
+        }
+
+        public byte getCode() {
+            return code;
+        }
+    }
+    
+    private static int getAccIdFromCNAME(String name, boolean accountid) {
+        try {
+            PreparedStatement ps;
+            String text = "SELECT id,accountid FROM characters WHERE name = ?";
+            Connection con = DatabaseConnection.getConnection();
+            ps = con.prepareStatement(text);
+            ps.setString(1, name);
+            int id_;
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) {
+                    rs.close();
+                    ps.close();
+                    return -1;
+                }
+                id_ = accountid ? rs.getInt("accountid") : rs.getInt("id");
+            }
+            ps.close();
+            con.close();
+            return id_;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return -1;
+    }
+    
+    private static String getCurrentDate() {
+        String date = "";
+        Calendar cal = Calendar.getInstance();
+        int day = cal.get(Calendar.DATE) - 1; // instant duey ?
+        int month = cal.get(Calendar.MONTH) + 1; // its an array of months.
+        int year = cal.get(Calendar.YEAR);
+        date += day < 9 ? "0" + day + "-" : "" + day + "-";
+        date += month < 9 ? "0" + month + "-" : "" + month + "-";
+        date += year;
+        
+        return date;
+    }
+
+    private static void removeItemFromDB(int packageid) {
+        Connection con = null;
+        try {
+            con = DatabaseConnection.getConnection();
+            
+            PreparedStatement ps = con.prepareStatement("DELETE FROM dueypackages WHERE PackageId = ?");
+            ps.setInt(1, packageid);
+            ps.executeUpdate();
+            ps.close();
+            ps = con.prepareStatement("DELETE FROM dueyitems WHERE PackageId = ?");
+            ps.setInt(1, packageid);
+            ps.executeUpdate();
+            ps.close();
+            con.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static DueyPackages getItemByPID(ResultSet rs) {
+        try {
+            DueyPackages dueypack;
+            if (rs.getInt("type") == 1) {
+                Equip eq = new Equip(rs.getInt("itemid"), (byte) 0, -1);
+                eq.setUpgradeSlots((byte) rs.getInt("upgradeslots"));
+                eq.setLevel((byte) rs.getInt("level"));
+                eq.setStr((short) rs.getInt("str"));
+                eq.setDex((short) rs.getInt("dex"));
+                eq.setInt((short) rs.getInt("int"));
+                eq.setLuk((short) rs.getInt("luk"));
+                eq.setHp((short) rs.getInt("hp"));
+                eq.setMp((short) rs.getInt("mp"));
+                eq.setWatk((short) rs.getInt("watk"));
+                eq.setMatk((short) rs.getInt("matk"));
+                eq.setWdef((short) rs.getInt("wdef"));
+                eq.setMdef((short) rs.getInt("mdef"));
+                eq.setAcc((short) rs.getInt("acc"));
+                eq.setAvoid((short) rs.getInt("avoid"));
+                eq.setHands((short) rs.getInt("hands"));
+                eq.setSpeed((short) rs.getInt("speed"));
+                eq.setJump((short) rs.getInt("jump"));
+                eq.setOwner(rs.getString("owner"));
+                dueypack = new DueyPackages(rs.getInt("PackageId"), eq);
+            } else if (rs.getInt("type") == 2) {
+                Item newItem = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity"));
+                newItem.setOwner(rs.getString("owner"));
+                dueypack = new DueyPackages(rs.getInt("PackageId"), newItem);
+            } else {
+                dueypack = new DueyPackages(rs.getInt("PackageId"));
+            }
+            return dueypack;
+        } catch (SQLException se) {
+            se.printStackTrace();
+            return null;
+        }
+    }
+    
+    private static void showDueyNotification(MapleClient c, MapleCharacter player) {
+        Connection con = null;
+        PreparedStatement ps = null;
+        PreparedStatement pss = null;
+        ResultSet rs = null;
+        try {
+            con = DatabaseConnection.getConnection();
+            ps = con.prepareStatement("SELECT Mesos FROM dueypackages WHERE RecieverId = ? and Checked = 1");
+            ps.setInt(1, player.getId());
+            rs = ps.executeQuery();
+            if (rs.next()) {
+                try {
+                    Connection con2 = DatabaseConnection.getConnection();
+                    pss = con2.prepareStatement("UPDATE dueypackages SET Checked = 0 where RecieverId = ?");
+                    pss.setInt(1, player.getId());
+                    pss.executeUpdate();
+                    pss.close();
+                    con2.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+
+                c.announce(MaplePacketCreator.sendDueyNotification(false));
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pss != null) {
+                    pss.close();
+                }
+                if (ps != null) {
+                    ps.close();
+                }
+                if (con != null) {
+                    con.close();
+                }
+            } catch (SQLException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+    
+    private static int getFee(int meso) {
+        int fee = 0;
+        if (meso >= 10000000) {
+            fee = meso / 25;
+        } else if (meso >= 5000000) {
+            fee = meso * 3 / 100;
+        } else if (meso >= 1000000) {
+            fee = meso / 50;
+        } else if (meso >= 100000) {
+            fee = meso / 100;
+        } else if (meso >= 50000) {
+            fee = meso / 200;
+        }
+        return fee;
+    }
+    
+    private static void addMesoToDB(int mesos, String sName, int recipientID) {
+        addItemToDB(null, 1, mesos, sName, recipientID);
+    }
+
+    private static void addItemToDB(Item item, int quantity, int mesos, String sName, int recipientID) {
+        Connection con = null;
+        try {
+            con = DatabaseConnection.getConnection();
+            try (PreparedStatement ps = con.prepareStatement("INSERT INTO dueypackages (RecieverId, SenderName, Mesos, TimeStamp, Checked, Type) VALUES (?, ?, ?, ?, ?, ?)")) {
+                ps.setInt(1, recipientID);
+                ps.setString(2, sName);
+                ps.setInt(3, mesos);
+                ps.setString(4, getCurrentDate());
+                ps.setInt(5, 1);
+                if (item == null) {
+                    ps.setInt(6, 3);
+                    ps.executeUpdate();
+                } else {
+                    ps.setInt(6, item.getItemType());
+                    
+                    ps.executeUpdate();
+                    try (ResultSet rs = ps.getGeneratedKeys()) {
+                        rs.next();
+                        PreparedStatement ps2;
+                        if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) {
+                            ps2 = con.prepareStatement("INSERT INTO dueyitems (PackageId, itemid, quantity, upgradeslots, level, str, dex, `int`, luk, hp, mp, watk, matk, wdef, mdef, acc, avoid, hands, speed, jump, owner) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+                            Equip eq = (Equip) item;
+                            ps2.setInt(2, eq.getItemId());
+                            ps2.setInt(3, 1);
+                            ps2.setInt(4, eq.getUpgradeSlots());
+                            ps2.setInt(5, eq.getLevel());
+                            ps2.setInt(6, eq.getStr());
+                            ps2.setInt(7, eq.getDex());
+                            ps2.setInt(8, eq.getInt());
+                            ps2.setInt(9, eq.getLuk());
+                            ps2.setInt(10, eq.getHp());
+                            ps2.setInt(11, eq.getMp());
+                            ps2.setInt(12, eq.getWatk());
+                            ps2.setInt(13, eq.getMatk());
+                            ps2.setInt(14, eq.getWdef());
+                            ps2.setInt(15, eq.getMdef());
+                            ps2.setInt(16, eq.getAcc());
+                            ps2.setInt(17, eq.getAvoid());
+                            ps2.setInt(18, eq.getHands());
+                            ps2.setInt(19, eq.getSpeed());
+                            ps2.setInt(20, eq.getJump());
+                            ps2.setString(21, eq.getOwner());
+                        } else {
+                            ps2 = con.prepareStatement("INSERT INTO dueyitems (PackageId, itemid, quantity, owner) VALUES (?, ?, ?, ?)");
+                            ps2.setInt(2, item.getItemId());
+                            ps2.setInt(3, quantity);
+                            ps2.setString(4, item.getOwner());
+                        }
+                        ps2.setInt(1, rs.getInt(1));
+                        ps2.executeUpdate();
+                        ps2.close();
+                    }
+                }
+            }
+            
+            con.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static List<DueyPackages> loadItems(MapleCharacter chr) {
+        List<DueyPackages> packages = new LinkedList<>();
+        Connection con = null;
+        try {
+            con = DatabaseConnection.getConnection();
+            try (PreparedStatement ps = con.prepareStatement("SELECT * FROM dueypackages dp LEFT JOIN dueyitems di ON dp.PackageId=di.PackageId WHERE RecieverId = ?")) {
+                ps.setInt(1, chr.getId());
+                try (ResultSet rs = ps.executeQuery()) {
+                    while (rs.next()) {
+                        DueyPackages dueypack = getItemByPID(rs);
+                        dueypack.setSender(rs.getString("SenderName"));
+                        dueypack.setMesos(rs.getInt("Mesos"));
+                        dueypack.setSentTime(rs.getString("TimeStamp"));
+                        packages.add(dueypack);
+                    }
+                }
+            }
+            
+            con.close();
+            return packages;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+    
+    public static void dueySendItem(MapleClient c, byte inventId, short itemPos, short amount, int mesos, String recipient) {
+        c.lockClient();
+        try {
+            final int fee = 5000;
+            if (mesos < 0 || ((long) mesos + fee + getFee(mesos)) > Integer.MAX_VALUE || (amount < 1 && mesos == 0)) {
+                AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with duey.");
+                FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to use duey with mesos " + mesos + " and amount " + amount + "\r\n");           	
+                c.disconnect(true, false);
+                return;
+            }
+            int finalcost = mesos + fee + getFee(mesos);
+            boolean send = false;
+            if (c.getPlayer().getMeso() >= finalcost) {
+                int accid = getAccIdFromCNAME(recipient, true);
+                if (accid != -1) {
+                    if (accid != c.getAccID()) {
+                        send = true;
+                    } else {
+                        c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SAMEACC_ERROR.getCode()));
+                    }
+                } else {
+                    c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode()));
+                }
+            } else {
+                c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_NOT_ENOUGH_MESOS.getCode()));
+            }
+
+            MapleClient rClient = null;
+            
+            int channel = c.getWorldServer().find(recipient);
+            if (channel > -1) {
+                Channel rcserv = c.getWorldServer().getChannel(channel);
+                rClient = rcserv.getPlayerStorage().getCharacterByName(recipient).getClient();
+            }
+            
+            if (send) {
+                if (inventId > 0) {
+                    MapleInventoryType inv = MapleInventoryType.getByType(inventId);
+                    Item item = c.getPlayer().getInventory(inv).getItem(itemPos);
+                    if (item != null && c.getPlayer().getItemQuantity(item.getItemId(), false) >= amount) {
+                        c.getPlayer().gainMeso(-finalcost, false);
+                        c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode()));
+
+                        if (ItemConstants.isRechargeable(item.getItemId())) {
+                            MapleInventoryManipulator.removeFromSlot(c, inv, itemPos, item.getQuantity(), true);
+                        } else {
+                            MapleInventoryManipulator.removeFromSlot(c, inv, itemPos, amount, true, false);
+                        }
+
+                        addItemToDB(item, amount, mesos, c.getPlayer().getName(), getAccIdFromCNAME(recipient, false));
+                    } else {
+                        if (item != null) {
+                            c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_INCORRECT_REQUEST.getCode()));
+                        }
+                        return;
+                    }
+                } else {
+                    c.getPlayer().gainMeso(-finalcost, false);
+                    c.announce(MaplePacketCreator.sendDueyMSG(DueyProcessor.Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode()));    
+
+                    addMesoToDB(mesos, c.getPlayer().getName(), getAccIdFromCNAME(recipient, false));
+                }
+
+                if (rClient != null && rClient.isLoggedIn() && !rClient.getPlayer().isAwayFromWorld()) {
+                    showDueyNotification(rClient, rClient.getPlayer());
+                }
+            }
+        } finally {
+            c.unlockClient();
+        }
+    }
+    
+    public static void dueyRemovePackage(MapleClient c, int packageid) {
+        c.lockClient();
+        try {
+            removeItemFromDB(packageid);
+            c.announce(MaplePacketCreator.removeItemFromDuey(true, packageid));
+        } finally {
+            c.unlockClient();
+        }
+    }
+    
+    public static void dueyClaimPackage(MapleClient c, int packageid) {
+        c.lockClient();
+        try {
+            List<DueyPackages> packages = new LinkedList<>();
+            DueyPackages dp = null;
+            Connection con = null;
+            try {
+                con = DatabaseConnection.getConnection();
+                DueyPackages dueypack;
+                try (PreparedStatement ps = con.prepareStatement("SELECT * FROM dueypackages LEFT JOIN dueyitems USING (PackageId) WHERE PackageId = ?")) {
+                    ps.setInt(1, packageid);
+                    try (ResultSet rs = ps.executeQuery()) {
+                        dueypack = null;
+                        if (rs.next()) {
+                            dueypack = getItemByPID(rs);
+                            dueypack.setSender(rs.getString("SenderName"));
+                            dueypack.setMesos(rs.getInt("Mesos"));
+                            dueypack.setSentTime(rs.getString("TimeStamp"));
+
+                            packages.add(dueypack);
+                        }
+                    }
+                }
+                dp = dueypack;
+                if(dp == null) {
+                    c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
+                    FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to receive package from duey with id " + packageid + "\r\n");
+                    return;
+                }
+
+                if (dp.getItem() != null) {
+                    if (!MapleInventoryManipulator.checkSpace(c, dp.getItem().getItemId(), dp.getItem().getQuantity(), dp.getItem().getOwner())) {
+                        int itemid = dp.getItem().getItemId();
+                        if(MapleItemInformationProvider.getInstance().isPickupRestricted(itemid) && c.getPlayer().getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) != null) {
+                            c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode()));
+                        } else {
+                            c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_NO_FREE_SLOTS.getCode()));
+                        }
+
+                        return;
+                    } else {
+                        MapleInventoryManipulator.addFromDrop(c, dp.getItem(), false);
+                    }
+                }
+
+                long gainmesos = 0;
+                long totalmesos = (long) dp.getMesos() + (long) c.getPlayer().getMeso();
+
+                if (totalmesos < 0 || dp.getMesos() < 0) gainmesos = 0;
+                else {
+                    totalmesos = Math.min(totalmesos, Integer.MAX_VALUE);
+                    gainmesos = totalmesos - c.getPlayer().getMeso();
+                }
+                c.getPlayer().gainMeso((int)gainmesos, false);
+
+                removeItemFromDB(packageid);
+                c.announce(MaplePacketCreator.removeItemFromDuey(false, packageid));
+
+                con.close();
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        } finally {
+            c.unlockClient();
+        }
+    }
+    
+    public static void dueySendTalk(MapleClient c) {
+        c.lockClient();
+        try {
+            c.announce(MaplePacketCreator.sendDuey((byte) 8, loadItems(c.getPlayer())));
+        } finally {
+            c.unlockClient();
+        }
+    }
+}

src/client/processor/FredrickProcessor.java

@@ -0,0 +1,111 @@
+/*
+	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]>
+
+    Copyleft (L) 2016 - 2018 RonanLana (HeavenMS)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package client.processor;
+
+import client.MapleCharacter;
+import client.MapleClient;
+import client.inventory.Item;
+import client.inventory.ItemFactory;
+import client.inventory.MapleInventory;
+import client.inventory.MapleInventoryType;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.List;
+import server.MapleInventoryManipulator;
+import server.MapleItemInformationProvider;
+import server.maps.MapleHiredMerchant;
+import tools.DatabaseConnection;
+import tools.FilePrinter;
+import tools.MaplePacketCreator;
+import tools.Pair;
+
+/**
+ *
+ * @author RonanLana (synchronization of Fredrick modules)
+ */
+public class FredrickProcessor {
+    private static boolean canRetrieveFromFredrick(MapleCharacter chr, List<Pair<Item, MapleInventoryType>> items) {
+        if (chr.getMeso() + chr.getMerchantMeso() < 0) {
+            return false;
+        }
+        return MapleInventory.checkSpotsAndOwnership(chr, items);
+    }
+
+    private static boolean deleteFredrickItems(int cid) {
+        try {
+            Connection con = DatabaseConnection.getConnection();
+            try (PreparedStatement ps = con.prepareStatement("DELETE FROM `inventoryitems` WHERE `type` = ? AND `characterid` = ?")) {
+                ps.setInt(1, ItemFactory.MERCHANT.getValue());
+                ps.setInt(2, cid);
+                ps.execute();
+            }
+            con.close();
+            return true;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+    
+    public static void fredrickRetrieveItems(MapleClient c) {     // thanks Gustav for pointing out the dupe on Fredrick handling
+        c.lockClient();
+        try {
+            MapleCharacter chr = c.getPlayer();
+            
+            List<Pair<Item, MapleInventoryType>> items;
+            try {
+                items = ItemFactory.MERCHANT.loadItems(chr.getId(), false);
+                if (!canRetrieveFromFredrick(chr, items)) {
+                    chr.announce(MaplePacketCreator.fredrickMessage((byte) 0x21));
+                    return;
+                }
+
+                chr.withdrawMerchantMesos();
+
+                if (deleteFredrickItems(chr.getId())) {
+                    MapleHiredMerchant merchant = chr.getHiredMerchant();
+
+                    if(merchant != null)
+                        merchant.clearItems();
+
+                    for (Pair<Item, MapleInventoryType> it : items) {
+                        Item item = it.getLeft();
+                        MapleInventoryManipulator.addFromDrop(chr.getClient(), item, false);
+                        String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId());
+                        FilePrinter.print(FilePrinter.FREDRICK + chr.getName() + ".txt", chr.getName() + " gained " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")\r\n");
+                    }
+
+                    chr.announce(MaplePacketCreator.fredrickMessage((byte) 0x1E));
+                } else {
+                    chr.message("An unknown error has occured.");
+                }
+            } catch (SQLException ex) {
+                ex.printStackTrace();
+            }
+        } finally {
+            c.unlockClient();
+        }
+    }
+}

src/constants/EquipType.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/constants/GameConstants.java

@@ -35,7 +35,7 @@ public class GameConstants {
     private static final int[] DEFAULT_TYPE = {4, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 4, 4, 5, 6, 6, 6, 6, 6, 6, 5, 4, 5, 4, 4, 4, 4, 4};
     private static final int[] DEFAULT_ACTION = {0, 106, 10, 1, 12, 13, 18, 24, 8, 5, 4, 19, 14, 15, 2, 17, 11, 3, 20, 16, 9, 50, 51, 6, 7, 53, 100, 101, 102, 103, 104, 105, 54, 22, 52, 21, 25, 26, 23, 27};
     
-    // MapleSolaxiaV2 custom keyset
+    // HeavenMS custom keyset
     private static final int[] CUSTOM_KEY = {2, 3, 4, 5, 31, 56, 59, 32, 42, 6, 17, 29, 30, 41, 50, 60, 61, 62, 63, 64, 65, 16, 7, 9, 13, 8};
     private static final int[] CUSTOM_TYPE = {4, 4, 4, 4, 5, 5, 6, 5, 5, 4, 4, 4, 5, 4, 4, 6, 6, 6, 6, 6, 6, 4, 4, 4, 4, 4};
     private static final int[] CUSTOM_ACTION = {1, 0, 3, 2, 53, 54, 100, 52, 51, 19, 5, 9, 50, 7, 22, 101, 102, 103, 104, 105, 106, 8, 17, 26, 20, 4};

src/constants/ItemConstants.java

@@ -73,7 +73,7 @@ public final class ItemConstants {
         return isPotion(itemId) || isFood(itemId);
     }
 
-    public static boolean isRechargable(int itemId) {
+    public static boolean isRechargeable(int itemId) {
         return isThrowingStar(itemId) || isBullet(itemId);
     }
 
@@ -110,7 +110,7 @@ public final class ItemConstants {
     }
     
     public static boolean isTownScroll(int itemId) {
-        return itemId >= 2030000 && itemId < 2030021;
+        return itemId >= 2030000 && itemId < 2030100;
     }
     
     public static boolean isAntibanishScroll(int itemId) {
@@ -184,4 +184,8 @@ public final class ItemConstants {
     public static boolean isEquipment(int itemId) {
         return itemId < 2000000 && itemId != 0;
     }
+    
+    public static boolean isMedal(int itemId) {
+        return itemId >= 1140000 && itemId < 1143000;
+    }
 }

src/constants/ServerConstants.java

@@ -15,7 +15,6 @@ public class ServerConstants {
     
     //World And Version
     public static short VERSION = 83;
-    public static String TIMEZONE = "-GMT3";
     public static String[] WORLD_NAMES = {"Scania", "Bera", "Broa", "Windia", "Khaini", "Bellocan", "Mardia", "Kradia", "Yellonde", "Demethos", "Galicia", "El Nido", "Zenith", "Arcenia", "Kastia", "Judis", "Plana", "Kalluna", "Stius", "Croa", "Medere"};
 
     //Login Configuration
@@ -72,6 +71,7 @@ public class ServerConstants {
     public static final boolean USE_MAKER_FEE_HEURISTICS = true;    //Apply compiled values for stimulants and reagents into the Maker fee calculations (max error revolves around 50k mesos). Set false to use basic constant values instead (results are never higher than requested by the client-side).
     public static final boolean USE_QUEST_RATE = false;             //Exp/Meso gained by quests uses fixed server exp/meso rate times quest rate as multiplier, instead of player rates.
     public static final boolean USE_MULTIPLE_SAME_EQUIP_DROP = true;//Enables multiple drops by mobs of the same equipment, number of possible drops based on the quantities provided at the drop data.
+    public static final boolean USE_BANISHABLE_TOWN_SCROLL = true;  //Enables town scrolls to act as if it's a "player banish", rendering the antibanish scroll effect available.
     
     //Announcement Configuration
     public static final boolean USE_ANNOUNCE_SHOPITEMSOLD = false;  //Automatic message sent to owner when an item from the Player Shop or Hired Merchant is sold.
@@ -99,6 +99,8 @@ public class ServerConstants {
     public static final int MAX_EVENT_LEVELS = 8;                       //Event has different levels of rewarding system.
     public static final long BLOCK_NPC_RACE_CONDT = (long)(0.5 * 1000); //Time the player client must wait before reopening a conversation with an NPC.
     public static final long PET_LOOT_UPON_ATTACK = (long)(0.7 * 1000); //Time the pet must wait before trying to pick items up.
+    public static boolean USE_UNITPRICE_WITH_COMMA = true;         //Set this accordingly with the layout of the unitPrices on Item.wz XML's, whether it's using commas or dots to represent fractions.
+    public static String TIMEZONE = "-GMT3";
     
     //Dangling Items/Locks Configuration
     public static final int ITEM_EXPIRE_TIME  = 3 * 60 * 1000;  //Time before items start disappearing. Recommended to be set up to 3 minutes.
@@ -106,6 +108,7 @@ public class ServerConstants {
     public static final int LOCK_MONITOR_TIME = 30 * 1000;      //Waiting time for a lock to be released. If it reach timed out, a critical server deadlock has made present.
     public static final int ITEM_EXPIRE_CHECK = 10 * 1000;      //Interval between item expiring tasks on maps, which checks and makes disappear expired items.
     public static final int ITEM_LIMIT_ON_MAP = 200;            //Max number of items allowed on a map.
+    public static final int MAP_VISITED_SIZE = 5;               //Max length for last mapids visited by a player. This is used to recover and update drops on these maps accordingly with player actions.
     
     //Some Gameplay Enhancing Configurations
     //Scroll Configuration

src/net/MapleServerHandler.java

@@ -56,7 +56,7 @@ import server.TimerManager;
 import tools.locks.MonitoredLockType;
 
 public class MapleServerHandler extends IoHandlerAdapter {
-    private final static Set<Short> ignoredDebugRecvPackets = new HashSet<>(Arrays.asList((short) 167, (short) 197, (short) 89, (short) 91, (short) 41));
+    private final static Set<Short> ignoredDebugRecvPackets = new HashSet<>(Arrays.asList((short) 167, (short) 197, (short) 89, (short) 91, (short) 41, (short) 188, (short) 107));
     
     private PacketProcessor processor;
     private int world = -1, channel = -1;

src/net/PacketProcessor.java

@@ -165,7 +165,7 @@ public final class PacketProcessor {
             registerHandler(RecvOpcode.GIVE_FAME, new GiveFameHandler());
             registerHandler(RecvOpcode.PARTY_OPERATION, new PartyOperationHandler());
             registerHandler(RecvOpcode.DENY_PARTY_REQUEST, new DenyPartyRequestHandler());
-            registerHandler(RecvOpcode.PARTYCHAT, new PartyChatHandler());
+            registerHandler(RecvOpcode.MULTI_CHAT, new MultiChatHandler());
             registerHandler(RecvOpcode.USE_DOOR, new DoorHandler());
             registerHandler(RecvOpcode.ENTER_MTS, new EnterMTSHandler());
             registerHandler(RecvOpcode.ENTER_CASHSHOP, new EnterCashShopHandler());

src/net/RecvOpcode.java

@@ -120,7 +120,7 @@ public enum RecvOpcode {
     USE_REMOTE(0x74),
     WATER_OF_LIFE(0x75),
     ADMIN_CHAT(0x76),
-    PARTYCHAT(0x77),
+    MULTI_CHAT(0x77),
     WHISPER(0x78),
     MESSENGER(0x7A),
     PLAYER_INTERACTION(0x7B),

src/net/server/audit/ThreadTracker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

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

@@ -113,7 +113,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
 
         public int numAttacked, numDamage, numAttackedAndDamage, skill, skilllevel, stance, direction, rangedirection, charge, display;
         public Map<Integer, List<Integer>> allDamage;
-        public boolean isHH = false, isTempest = false, ranged, magic;
+        public boolean ranged, magic;
         public int speed = 4;
         public Point position = new Point();
         public MapleStatEffect getAttackEffect(MapleCharacter chr, Skill theSkill) {
@@ -205,17 +205,29 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
                             if (mapitem.getMeso() == 0) { //Maybe it is possible some how?
                                 return;
                             }
-                            synchronized (mapitem) {
+                            
+                            mapitem.lockItem();
+                            try {
                                 if (mapitem.isPickedUp()) {
                                     return;
                                 }
                                 TimerManager.getInstance().schedule(new Runnable() {
                                     @Override
                                     public void run() {
-                                        map.pickItemDrop(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 4, 0), mapitem);
+                                        mapitem.lockItem();
+                                        try {
+                                            if (mapitem.isPickedUp()) {
+                                                return;
+                                            }
+                                            map.pickItemDrop(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 4, 0), mapitem);
+                                        } finally {
+                                            mapitem.unlockItem();
+                                        }
                                     }
                                 }, delay);
                                 delay += 100;
+                            } finally {
+                                mapitem.unlockItem();
                             }
                     } else if (mapobject != null && mapobject.getType() != MapleMapObjectType.MONSTER) {
                         return;
@@ -464,34 +476,45 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
                         if (attackEffect.makeChanceResult()) {
                             monster.applyStatus(player, new MonsterStatusEffect(attackEffect.getMonsterStati(), theSkill, null, false), attackEffect.isPoison(), attackEffect.getDuration());
                         }
-                    }                 
-                    if (attack.isHH && !monster.isBoss()) {
-                        map.damageMonster(player, monster, monster.getHp() - 1);
-                    } else if (attack.isHH) {
-                        int HHDmg = (player.calculateMaxBaseDamage(player.getTotalWatk()) * (SkillFactory.getSkill(Paladin.HEAVENS_HAMMER).getEffect(player.getSkillLevel(SkillFactory.getSkill(Paladin.HEAVENS_HAMMER))).getDamage() / 100));
-                        map.damageMonster(player, monster, (int) (Math.floor(Math.random() * (HHDmg / 5) + HHDmg * .8)));
-                    } else if(attack.isTempest && !monster.isBoss()) {
-                        map.damageMonster(player, monster, monster.getHp());
-                    } else if(attack.isTempest) {
-                        int TmpDmg = (player.calculateMaxBaseDamage(player.getTotalWatk()) * (SkillFactory.getSkill(Aran.COMBO_TEMPEST).getEffect(player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_TEMPEST))).getDamage() / 100));
-                        map.damageMonster(player, monster, (int) (Math.floor(Math.random() * (TmpDmg / 5) + TmpDmg * .8)));
+                    }
+                    if (attack.skill == Paladin.HEAVENS_HAMMER) {
+                        if(!monster.isBoss()) {
+                            map.damageMonster(player, monster, monster.getHp() - 1);
+                        } else {
+                            int HHDmg = (player.calculateMaxBaseDamage(player.getTotalWatk()) * (SkillFactory.getSkill(Paladin.HEAVENS_HAMMER).getEffect(player.getSkillLevel(SkillFactory.getSkill(Paladin.HEAVENS_HAMMER))).getDamage() / 100));
+                            map.damageMonster(player, monster, (int) (Math.floor(Math.random() * (HHDmg / 5) + HHDmg * .8)));
+                        }
+                    } else if (attack.skill == Aran.COMBO_TEMPEST) {
+                        if(!monster.isBoss()) {
+                            map.damageMonster(player, monster, monster.getHp());
+                        } else {
+                            int TmpDmg = (player.calculateMaxBaseDamage(player.getTotalWatk()) * (SkillFactory.getSkill(Aran.COMBO_TEMPEST).getEffect(player.getSkillLevel(SkillFactory.getSkill(Aran.COMBO_TEMPEST))).getDamage() / 100));
+                            map.damageMonster(player, monster, (int) (Math.floor(Math.random() * (TmpDmg / 5) + TmpDmg * .8)));
+                        }
                     } else {
+                        if(attack.skill == Aran.BODY_PRESSURE) {
+                            map.broadcastMessage(MaplePacketCreator.damageMonster(monster.getObjectId(), totDamageToOneMonster));
+                        }
+                        
                         map.damageMonster(player, monster, totDamageToOneMonster);
-						
-                    }                                                                     
+                    }
                     if (monster.isBuffed(MonsterStatus.WEAPON_REFLECT)) {
-                        for (int i = 0; i < monster.getSkills().size(); i++) {
-                            if (monster.getSkills().get(i).left == 145) {
-                                MobSkill toUse = MobSkillFactory.getMobSkill(monster.getSkills().get(i).left, monster.getSkills().get(i).right);
+                        List<Pair<Integer, Integer>> mobSkills = monster.getSkills();
+                        
+                        for (Pair<Integer, Integer> ms : mobSkills) {
+                            if (ms.left == 145) {
+                                MobSkill toUse = MobSkillFactory.getMobSkill(ms.left, ms.right);
                                 player.addHP(-toUse.getX());
                                 map.broadcastMessage(player, MaplePacketCreator.damagePlayer(0, monster.getId(), player.getId(), toUse.getX(), 0, 0, false, 0, true, monster.getObjectId(), 0, 0), true);
                             }
                         }
                     }                
                     if (monster.isBuffed(MonsterStatus.MAGIC_REFLECT)) {
-                        for (int i = 0; i < monster.getSkills().size(); i++) {
-                            if (monster.getSkills().get(i).left == 145) {
-                                MobSkill toUse = MobSkillFactory.getMobSkill(monster.getSkills().get(i).left, monster.getSkills().get(i).right);
+                        List<Pair<Integer, Integer>> mobSkills = monster.getSkills();
+                        
+                        for (Pair<Integer, Integer> ms : mobSkills) {
+                            if (ms.left == 145) {
+                                MobSkill toUse = MobSkillFactory.getMobSkill(ms.left, ms.right);
                                 player.addMP(-toUse.getY());
                             }
                         }
@@ -525,11 +548,6 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
         } else {
             ret.charge = 0;
         }
-        if (ret.skill == Paladin.HEAVENS_HAMMER) {
-            ret.isHH = true;
-        } else if(ret.skill == Aran.COMBO_TEMPEST) {
-            ret.isTempest = true;
-        }
         lea.skip(8);
         ret.display = lea.readByte();
         ret.direction = lea.readByte();

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

@@ -21,92 +21,16 @@
 */
 package net.server.channel.handlers;
 
-import client.MapleCharacter;
 import client.MapleClient;
-import client.autoban.AutobanFactory;
-import client.inventory.Equip;
-import client.inventory.Item;
-import client.inventory.MapleInventoryType;
-import constants.ItemConstants;
+import client.processor.DueyProcessor;
 import constants.ServerConstants;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Calendar;
-import java.util.LinkedList;
-import java.util.List;
-
 import net.AbstractMaplePacketHandler;
-import net.server.channel.Channel;
-import server.DueyPackages;
-import server.MapleInventoryManipulator;
-import server.MapleItemInformationProvider;
-import tools.DatabaseConnection;
-import tools.FilePrinter;
 import tools.MaplePacketCreator;
 import tools.data.input.SeekableLittleEndianAccessor;
 
 public final class DueyHandler extends AbstractMaplePacketHandler {
-    private enum Actions {
-        TOSERVER_SEND_ITEM(0x02),
-        TOSERVER_CLAIM_PACKAGE(0x04),
-        TOSERVER_REMOVE_PACKAGE(0x05),
-        TOSERVER_CLOSE_DUEY(0x07),
-        TOCLIENT_OPEN_DUEY(0x08),
-        TOCLIENT_SEND_ENABLE_ACTIONS(0x09),
-        TOCLIENT_SEND_NOT_ENOUGH_MESOS(0x0A),
-        TOCLIENT_SEND_INCORRECT_REQUEST(0x0B),
-        TOCLIENT_SEND_NAME_DOES_NOT_EXIST(0x0C),
-        TOCLIENT_SEND_SAMEACC_ERROR(0x0D),
-        TOCLIENT_SEND_RECEIVER_STORAGE_FULL(0x0E),
-        TOCLIENT_SEND_RECEIVER_UNABLE_TO_RECV(0x0F),
-        TOCLIENT_SEND_RECEIVER_STORAGE_WITH_UNIQUE(0x10),
-        TOCLIENT_SEND_MESO_LIMIT(0x11),
-        TOCLIENT_SEND_SUCCESSFULLY_SENT(0x12),
-        TOCLIENT_RECV_UNKNOWN_ERROR(0x13),
-        TOCLIENT_RECV_ENABLE_ACTIONS(0x14),
-        TOCLIENT_RECV_NO_FREE_SLOTS(0x15),
-        TOCLIENT_RECV_RECEIVER_WITH_UNIQUE(0x16),
-        TOCLIENT_RECV_SUCCESSFUL_MSG(0x17),
-        TOCLIENT_RECV_PACKAGE_MSG(0x1B);
-        final byte code;
-
-        private Actions(int code) {
-            this.code = (byte) code;
-        }
-
-        public byte getCode() {
-            return code;
-        }
-    }
-
-    private static int getAccIdFromCNAME(String name, boolean accountid) {
-        try {
-            PreparedStatement ps;
-            String text = "SELECT id,accountid FROM characters WHERE name = ?";
-            Connection con = DatabaseConnection.getConnection();
-            ps = con.prepareStatement(text);
-            ps.setString(1, name);
-            int id_;
-            try (ResultSet rs = ps.executeQuery()) {
-                if (!rs.next()) {
-                    rs.close();
-                    ps.close();
-                    return -1;
-                }
-                id_ = accountid ? rs.getInt("accountid") : rs.getInt("id");
-            }
-            ps.close();
-            con.close();
-            return id_;
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
+    
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
     	if (!ServerConstants.USE_DUEY){
@@ -115,364 +39,22 @@ public final class DueyHandler extends AbstractMaplePacketHandler {
     	}
             
         byte operation = slea.readByte();
-        if (operation == Actions.TOSERVER_SEND_ITEM.getCode()) {
-            final int fee = 5000;
+        if (operation == DueyProcessor.Actions.TOSERVER_SEND_ITEM.getCode()) {
             byte inventId = slea.readByte();
             short itemPos = slea.readShort();
             short amount = slea.readShort();
             int mesos = slea.readInt();
             String recipient = slea.readMapleAsciiString();
             
-            if (mesos < 0 || ((long) mesos + fee + getFee(mesos)) > Integer.MAX_VALUE || (amount < 1 && mesos == 0)) {
-            	AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with duey.");
-            	FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to use duey with mesos " + mesos + " and amount " + amount + "\r\n");           	
-            	c.disconnect(true, false);
-            	return;
-            }
-            int finalcost = mesos + fee + getFee(mesos);
-            boolean send = false;
-            if (c.getPlayer().getMeso() >= finalcost) {
-                int accid = getAccIdFromCNAME(recipient, true);
-                if (accid != -1) {
-                    if (accid != c.getAccID()) {
-                        send = true;
-                    } else {
-                        c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_SEND_SAMEACC_ERROR.getCode()));
-                    }
-                } else {
-                    c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_SEND_NAME_DOES_NOT_EXIST.getCode()));
-                }
-            } else {
-                c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_SEND_NOT_ENOUGH_MESOS.getCode()));
-            }
-            
-            MapleClient rClient = null;
-                int channel = c.getWorldServer().find(recipient);
-                if (channel > -1) {
-                    Channel rcserv = c.getWorldServer().getChannel(channel);
-                    rClient = rcserv.getPlayerStorage().getCharacterByName(recipient).getClient();
-                }
-            if (send) {
-                if (inventId > 0) {
-                    MapleInventoryType inv = MapleInventoryType.getByType(inventId);
-                    Item item = c.getPlayer().getInventory(inv).getItem(itemPos);
-                    if (item != null && c.getPlayer().getItemQuantity(item.getItemId(), false) >= amount) {
-                        c.getPlayer().gainMeso(-finalcost, false);
-                        c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode()));
-                        
-                        if (ItemConstants.isRechargable(item.getItemId())) {
-                            MapleInventoryManipulator.removeFromSlot(c, inv, itemPos, item.getQuantity(), true);
-                        } else {
-                            MapleInventoryManipulator.removeFromSlot(c, inv, itemPos, amount, true, false);
-                        }
-                        
-                        addItemToDB(item, amount, mesos, c.getPlayer().getName(), getAccIdFromCNAME(recipient, false));
-                    } else {
-                        if (item != null) {
-                            c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_SEND_INCORRECT_REQUEST.getCode()));
-                        }
-                        return;
-                    }
-                } else {
-                    c.getPlayer().gainMeso(-finalcost, false);
-                    c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_SEND_SUCCESSFULLY_SENT.getCode()));    
-                    
-                    addMesoToDB(mesos, c.getPlayer().getName(), getAccIdFromCNAME(recipient, false));
-                }
-                
-                if (rClient != null && rClient.isLoggedIn() && !rClient.getPlayer().isAwayFromWorld()) {
-                    showDueyNotification(rClient, rClient.getPlayer());
-                }
-            }
-        } else if (operation == Actions.TOSERVER_REMOVE_PACKAGE.getCode()) {
+            DueyProcessor.dueySendItem(c, inventId, itemPos, amount, mesos, recipient);
+        } else if (operation == DueyProcessor.Actions.TOSERVER_REMOVE_PACKAGE.getCode()) {
             int packageid = slea.readInt();
-            removeItemFromDB(packageid);
-            c.announce(MaplePacketCreator.removeItemFromDuey(true, packageid));
-        } else if (operation == Actions.TOSERVER_CLAIM_PACKAGE.getCode()) {
+            
+            DueyProcessor.dueyRemovePackage(c, packageid);
+        } else if (operation == DueyProcessor.Actions.TOSERVER_CLAIM_PACKAGE.getCode()) {
             int packageid = slea.readInt();
-            List<DueyPackages> packages = new LinkedList<>();
-            DueyPackages dp = null;
-            Connection con = null;
-            try {
-                con = DatabaseConnection.getConnection();
-                DueyPackages dueypack;
-                try (PreparedStatement ps = con.prepareStatement("SELECT * FROM dueypackages LEFT JOIN dueyitems USING (PackageId) WHERE PackageId = ?")) {
-                    ps.setInt(1, packageid);
-                    try (ResultSet rs = ps.executeQuery()) {
-                        dueypack = null;
-                        if (rs.next()) {
-                            dueypack = getItemByPID(rs);
-                            dueypack.setSender(rs.getString("SenderName"));
-                            dueypack.setMesos(rs.getInt("Mesos"));
-                            dueypack.setSentTime(rs.getString("TimeStamp"));
-                            
-                            packages.add(dueypack);
-                        }
-                    }
-                }
-                dp = dueypack;
-                if(dp == null) {
-                    c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_UNKNOWN_ERROR.getCode()));
-                    FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to receive package from duey with id " + packageid + "\r\n");
-                    return;
-                }
-                
-                if (dp.getItem() != null) {
-                    if (!MapleInventoryManipulator.checkSpace(c, dp.getItem().getItemId(), dp.getItem().getQuantity(), dp.getItem().getOwner())) {
-                        int itemid = dp.getItem().getItemId();
-                        if(MapleItemInformationProvider.getInstance().isPickupRestricted(itemid) && c.getPlayer().getInventory(ItemConstants.getInventoryType(itemid)).findById(itemid) != null) {
-                            c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_RECEIVER_WITH_UNIQUE.getCode()));
-                        } else {
-                            c.announce(MaplePacketCreator.sendDueyMSG(Actions.TOCLIENT_RECV_NO_FREE_SLOTS.getCode()));
-                        }
-                                                
-                        return;
-                    } else {
-                        MapleInventoryManipulator.addFromDrop(c, dp.getItem(), false);
-                    }
-                }
-                
-                long gainmesos = 0;
-                long totalmesos = (long) dp.getMesos() + (long) c.getPlayer().getMeso();
-
-                if (totalmesos < 0 || dp.getMesos() < 0) gainmesos = 0;
-                else {
-                    totalmesos = Math.min(totalmesos, Integer.MAX_VALUE);
-                    gainmesos = totalmesos - c.getPlayer().getMeso();
-                }
-                c.getPlayer().gainMeso((int)gainmesos, false);
-                            
-                removeItemFromDB(packageid);
-                c.announce(MaplePacketCreator.removeItemFromDuey(false, packageid));
-                
-                con.close();
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static void addMesoToDB(int mesos, String sName, int recipientID) {
-        addItemToDB(null, 1, mesos, sName, recipientID);
-    }
-
-    public static void addItemToDB(Item item, int quantity, int mesos, String sName, int recipientID) {
-        Connection con = null;
-        try {
-            con = DatabaseConnection.getConnection();
-            try (PreparedStatement ps = con.prepareStatement("INSERT INTO dueypackages (RecieverId, SenderName, Mesos, TimeStamp, Checked, Type) VALUES (?, ?, ?, ?, ?, ?)")) {
-                ps.setInt(1, recipientID);
-                ps.setString(2, sName);
-                ps.setInt(3, mesos);
-                ps.setString(4, getCurrentDate());
-                ps.setInt(5, 1);
-                if (item == null) {
-                    ps.setInt(6, 3);
-                    ps.executeUpdate();
-                } else {
-                    ps.setInt(6, item.getItemType());
-                    
-                    ps.executeUpdate();
-                    try (ResultSet rs = ps.getGeneratedKeys()) {
-                        rs.next();
-                        PreparedStatement ps2;
-                        if (item.getInventoryType().equals(MapleInventoryType.EQUIP)) {
-                            ps2 = con.prepareStatement("INSERT INTO dueyitems (PackageId, itemid, quantity, upgradeslots, level, str, dex, `int`, luk, hp, mp, watk, matk, wdef, mdef, acc, avoid, hands, speed, jump, owner) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-                            Equip eq = (Equip) item;
-                            ps2.setInt(2, eq.getItemId());
-                            ps2.setInt(3, 1);
-                            ps2.setInt(4, eq.getUpgradeSlots());
-                            ps2.setInt(5, eq.getLevel());
-                            ps2.setInt(6, eq.getStr());
-                            ps2.setInt(7, eq.getDex());
-                            ps2.setInt(8, eq.getInt());
-                            ps2.setInt(9, eq.getLuk());
-                            ps2.setInt(10, eq.getHp());
-                            ps2.setInt(11, eq.getMp());
-                            ps2.setInt(12, eq.getWatk());
-                            ps2.setInt(13, eq.getMatk());
-                            ps2.setInt(14, eq.getWdef());
-                            ps2.setInt(15, eq.getMdef());
-                            ps2.setInt(16, eq.getAcc());
-                            ps2.setInt(17, eq.getAvoid());
-                            ps2.setInt(18, eq.getHands());
-                            ps2.setInt(19, eq.getSpeed());
-                            ps2.setInt(20, eq.getJump());
-                            ps2.setString(21, eq.getOwner());
-                        } else {
-                            ps2 = con.prepareStatement("INSERT INTO dueyitems (PackageId, itemid, quantity, owner) VALUES (?, ?, ?, ?)");
-                            ps2.setInt(2, item.getItemId());
-                            ps2.setInt(3, quantity);
-                            ps2.setString(4, item.getOwner());
-                        }
-                        ps2.setInt(1, rs.getInt(1));
-                        ps2.executeUpdate();
-                        ps2.close();
-                    }
-                }
-            }
             
-            con.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static List<DueyPackages> loadItems(MapleCharacter chr) {
-        List<DueyPackages> packages = new LinkedList<>();
-        Connection con = null;
-        try {
-            con = DatabaseConnection.getConnection();
-            try (PreparedStatement ps = con.prepareStatement("SELECT * FROM dueypackages dp LEFT JOIN dueyitems di ON dp.PackageId=di.PackageId WHERE RecieverId = ?")) {
-                ps.setInt(1, chr.getId());
-                try (ResultSet rs = ps.executeQuery()) {
-                    while (rs.next()) {
-                        DueyPackages dueypack = getItemByPID(rs);
-                        dueypack.setSender(rs.getString("SenderName"));
-                        dueypack.setMesos(rs.getInt("Mesos"));
-                        dueypack.setSentTime(rs.getString("TimeStamp"));
-                        packages.add(dueypack);
-                    }
-                }
-            }
-            
-            con.close();
-            return packages;
-        } catch (SQLException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private static String getCurrentDate() {
-        String date = "";
-        Calendar cal = Calendar.getInstance();
-        int day = cal.get(Calendar.DATE) - 1; // instant duey ?
-        int month = cal.get(Calendar.MONTH) + 1; // its an array of months.
-        int year = cal.get(Calendar.YEAR);
-        date += day < 9 ? "0" + day + "-" : "" + day + "-";
-        date += month < 9 ? "0" + month + "-" : "" + month + "-";
-        date += year;
-        
-        return date;
-    }
-
-    private static int getFee(int meso) {
-        int fee = 0;
-        if (meso >= 10000000) {
-            fee = meso / 25;
-        } else if (meso >= 5000000) {
-            fee = meso * 3 / 100;
-        } else if (meso >= 1000000) {
-            fee = meso / 50;
-        } else if (meso >= 100000) {
-            fee = meso / 100;
-        } else if (meso >= 50000) {
-            fee = meso / 200;
-        }
-        return fee;
-    }
-
-    private static void removeItemFromDB(int packageid) {
-        Connection con = null;
-        try {
-            con = DatabaseConnection.getConnection();
-            
-            PreparedStatement ps = con.prepareStatement("DELETE FROM dueypackages WHERE PackageId = ?");
-            ps.setInt(1, packageid);
-            ps.executeUpdate();
-            ps.close();
-            ps = con.prepareStatement("DELETE FROM dueyitems WHERE PackageId = ?");
-            ps.setInt(1, packageid);
-            ps.executeUpdate();
-            ps.close();
-            con.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private static DueyPackages getItemByPID(ResultSet rs) {
-        try {
-            DueyPackages dueypack;
-            if (rs.getInt("type") == 1) {
-                Equip eq = new Equip(rs.getInt("itemid"), (byte) 0, -1);
-                eq.setUpgradeSlots((byte) rs.getInt("upgradeslots"));
-                eq.setLevel((byte) rs.getInt("level"));
-                eq.setStr((short) rs.getInt("str"));
-                eq.setDex((short) rs.getInt("dex"));
-                eq.setInt((short) rs.getInt("int"));
-                eq.setLuk((short) rs.getInt("luk"));
-                eq.setHp((short) rs.getInt("hp"));
-                eq.setMp((short) rs.getInt("mp"));
-                eq.setWatk((short) rs.getInt("watk"));
-                eq.setMatk((short) rs.getInt("matk"));
-                eq.setWdef((short) rs.getInt("wdef"));
-                eq.setMdef((short) rs.getInt("mdef"));
-                eq.setAcc((short) rs.getInt("acc"));
-                eq.setAvoid((short) rs.getInt("avoid"));
-                eq.setHands((short) rs.getInt("hands"));
-                eq.setSpeed((short) rs.getInt("speed"));
-                eq.setJump((short) rs.getInt("jump"));
-                eq.setOwner(rs.getString("owner"));
-                dueypack = new DueyPackages(rs.getInt("PackageId"), eq);
-            } else if (rs.getInt("type") == 2) {
-                Item newItem = new Item(rs.getInt("itemid"), (short) 0, (short) rs.getInt("quantity"));
-                newItem.setOwner(rs.getString("owner"));
-                dueypack = new DueyPackages(rs.getInt("PackageId"), newItem);
-            } else {
-                dueypack = new DueyPackages(rs.getInt("PackageId"));
-            }
-            return dueypack;
-        } catch (SQLException se) {
-            se.printStackTrace();
-            return null;
-        }
-    }
-    
-    private static void showDueyNotification(MapleClient c, MapleCharacter player) {
-        Connection con = null;
-        PreparedStatement ps = null;
-        PreparedStatement pss = null;
-        ResultSet rs = null;
-        try {
-            con = DatabaseConnection.getConnection();
-            ps = con.prepareStatement("SELECT Mesos FROM dueypackages WHERE RecieverId = ? and Checked = 1");
-            ps.setInt(1, player.getId());
-            rs = ps.executeQuery();
-            if (rs.next()) {
-                try {
-                    Connection con2 = DatabaseConnection.getConnection();
-                    pss = con2.prepareStatement("UPDATE dueypackages SET Checked = 0 where RecieverId = ?");
-                    pss.setInt(1, player.getId());
-                    pss.executeUpdate();
-                    pss.close();
-                    con2.close();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-
-                c.announce(MaplePacketCreator.sendDueyNotification(false));
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                if (rs != null) {
-                    rs.close();
-                }
-                if (pss != null) {
-                    pss.close();
-                }
-                if (ps != null) {
-                    ps.close();
-                }
-                if (con != null) {
-                    con.close();
-                }
-            } catch (SQLException ex) {
-                ex.printStackTrace();
-            }
+            DueyProcessor.dueyClaimPackage(c, packageid);
         }
     }
 }

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

@@ -23,23 +23,9 @@ package net.server.channel.handlers;
 
 import client.MapleCharacter;
 import client.MapleClient;
-import client.inventory.Item;
-import client.inventory.ItemFactory;
-import client.inventory.MapleInventory;
-import client.inventory.MapleInventoryType;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.List;
+import client.processor.FredrickProcessor;
 
 import net.AbstractMaplePacketHandler;
-import server.MapleInventoryManipulator;
-import server.MapleItemInformationProvider;
-import tools.DatabaseConnection;
-import tools.FilePrinter;
-import tools.MaplePacketCreator;
-import tools.Pair;
 import tools.data.input.SeekableLittleEndianAccessor;
 
 /**
@@ -58,62 +44,11 @@ public class FredrickHandler extends AbstractMaplePacketHandler {
                 //c.announce(MaplePacketCreator.getFredrick((byte) 0x24));
                 break;
             case 0x1A:
-                List<Pair<Item, MapleInventoryType>> items;
-                try {
-                    items = ItemFactory.MERCHANT.loadItems(chr.getId(), false);
-                    if (!check(chr, items)) {
-                        c.announce(MaplePacketCreator.fredrickMessage((byte) 0x21));
-                        return;
-                    }
-                    chr.gainMeso(chr.getMerchantMeso(), false);
-                    chr.setMerchantMeso(0);
-                    if (deleteItems(chr)) {
-                        if(chr.getHiredMerchant() != null)
-                            chr.getHiredMerchant().clearItems();
-                        
-                        for (int i = 0; i < items.size(); i++) {
-                            Item item = items.get(i).getLeft();
-                            MapleInventoryManipulator.addFromDrop(c, item, false);
-                            String itemName = MapleItemInformationProvider.getInstance().getName(item.getItemId());
-                            FilePrinter.print(FilePrinter.FREDRICK + chr.getName() + ".txt", chr.getName() + " gained " + item.getQuantity() + " " + itemName + " (" + item.getItemId() + ")\r\n");
-                        }
-                        c.announce(MaplePacketCreator.fredrickMessage((byte) 0x1E));
-                        
-                    } else {
-                        chr.message("An unknown error has occured.");
-                    }
-                    break;
-                } catch (SQLException ex) {
-                    ex.printStackTrace();
-                }
+                FredrickProcessor.fredrickRetrieveItems(c);
                 break;
             case 0x1C: //Exit
                 break;
             default:
         }
     }
-
-    private static boolean check(MapleCharacter chr, List<Pair<Item, MapleInventoryType>> items) {
-        if (chr.getMeso() + chr.getMerchantMeso() < 0) {
-            return false;
-        }
-        return MapleInventory.checkSpotsAndOwnership(chr, items);
-    }
-
-    private static boolean deleteItems(MapleCharacter chr) {
-        try {
-            Connection con = DatabaseConnection.getConnection();
-            try (PreparedStatement ps = con.prepareStatement("DELETE FROM `inventoryitems` WHERE `type` = ? AND `characterid` = ?")) {
-                ps.setInt(1, ItemFactory.MERCHANT.getValue());
-                ps.setInt(2, chr.getId());
-                ps.execute();
-            }
-            con.close();
-            return true;
-        } catch (SQLException e) {
-            e.printStackTrace();
-            return false;
-        }
-
-    }
 }

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

@@ -30,7 +30,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
 import tools.MaplePacketCreator;
 
 public final class HealOvertimeHandler extends AbstractMaplePacketHandler {
-
+    @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter chr = c.getPlayer();
         AutobanManager abm = chr.getAutobanManager();

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

@@ -30,6 +30,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
  * @author BubblesDev
  */
 public final class InnerPortalHandler extends AbstractMaplePacketHandler {
+    @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
     }
 }

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

@@ -26,6 +26,8 @@ import server.maps.MapleMapObject;
 import tools.data.input.SeekableLittleEndianAccessor;
 import client.MapleCharacter;
 import client.MapleClient;
+import java.awt.Point;
+import tools.FilePrinter;
 
 /**
  *
@@ -43,6 +45,13 @@ public final class ItemPickupHandler extends AbstractMaplePacketHandler {
         MapleCharacter chr = c.getPlayer();
         MapleMapObject ob = chr.getMap().getMapObject(oid);
         
+        Point charPos = chr.getPosition();
+        Point obPos = ob.getPosition();
+        if (Math.abs(charPos.getX() - obPos.getX()) > 800 || Math.abs(charPos.getY() - obPos.getY()) > 600) {
+            FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to pick up an item too far away. Mapid: " + chr.getMapId() + " Player pos: " + charPos + " Object pos: " + obPos + "\r\n");
+            return;
+        }
+        
         chr.pickupItem(ob);
     }
 }

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

@@ -52,17 +52,13 @@ public final class MobDamageMobFriendlyHandler extends AbstractMaplePacketHandle
                 if (monster.getHp() - damage < 1) {     // friendly dies
                         if(monster.getId() == 9300102) {
                                 monster.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "The Watch Hog has been injured by the aliens. Better luck next time..."));
-                        }
-                        else if (monster.getId() == 9300061) {  //moon bunny
+                        } else if (monster.getId() == 9300061) {  //moon bunny
                                 monster.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "The Moon Bunny went home because he was sick."));
-                        }
-                        else if(monster.getId() == 9300093) {   //tylus
+                        } else if(monster.getId() == 9300093) {   //tylus
                                 monster.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "Tylus has fallen by the overwhelming forces of the ambush."));
-                        }
-                        else if(monster.getId() == 9300137) {   //juliet
+                        } else if(monster.getId() == 9300137) {   //juliet
                                 monster.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "Juliet has fainted on the middle of the combat."));
-                        }
-                        else if(monster.getId() == 9300138) {   //romeo
+                        } else if(monster.getId() == 9300138) {   //romeo
                                 monster.getMap().broadcastMessage(MaplePacketCreator.serverNotice(6, "Romeo has fainted on the middle of the combat."));
                         }
                         

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

@@ -24,6 +24,7 @@ package net.server.channel.handlers;
 import client.MapleClient;
 import net.AbstractMaplePacketHandler;
 import server.maps.MapleMap;
+import tools.MaplePacketCreator;
 import tools.data.input.SeekableLittleEndianAccessor;
 
 /**
@@ -31,6 +32,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
  * @author Jay Estrella
  */
 public final class MobDamageMobHandler extends AbstractMaplePacketHandler {
+    @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         int from = slea.readInt();
         slea.readInt();
@@ -40,6 +42,7 @@ public final class MobDamageMobHandler extends AbstractMaplePacketHandler {
         MapleMap map = c.getPlayer().getMap();
         if (map.getMonsterByOid(from) != null && map.getMonsterByOid(to) != null) {
             map.damageMonster(c.getPlayer(), map.getMonsterByOid(to), dmg);
+            map.broadcastMessage(MaplePacketCreator.damageMonster(to, dmg));
         }
     }
 }

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

@@ -31,12 +31,14 @@ import tools.FilePrinter;
 import tools.MaplePacketCreator;
 import tools.data.input.SeekableLittleEndianAccessor;
 
-public final class PartyChatHandler extends AbstractMaplePacketHandler {
+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()) {
-			return;
-		}
+        if(player.getAutobanManager().getLastSpam(7) + 200 > System.currentTimeMillis()) {
+                return;
+        }
+        
         int type = slea.readByte(); // 0 for buddys, 1 for partys
         int numRecipients = slea.readByte();
         int recipients[] = new int[numRecipients];
@@ -63,6 +65,6 @@ public final class PartyChatHandler extends AbstractMaplePacketHandler {
                 Server.getInstance().allianceMessage(allianceId, MaplePacketCreator.multiChat(player.getName(), chattext, 3), player.getId(), -1);
             }
         }
-		player.getAutobanManager().spam(7);
+        player.getAutobanManager().spam(7);
     }
 }

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

@@ -22,6 +22,7 @@
 package net.server.channel.handlers;
 
 import client.MapleClient;
+import client.processor.DueyProcessor;
 import constants.ServerConstants;
 import net.AbstractMaplePacketHandler;
 import scripting.npc.NPCScriptManager;
@@ -53,7 +54,7 @@ public final class NPCTalkHandler extends AbstractMaplePacketHandler {
             
             if (npc.getId() == 9010009) {   //is duey
                 c.getPlayer().setNpcCooldown(System.currentTimeMillis());
-                c.announce(MaplePacketCreator.sendDuey((byte) 8, DueyHandler.loadItems(c.getPlayer())));
+                DueyProcessor.dueySendTalk(c);
             } else {
                 if (c.getCM() != null || c.getQM() != null) {
                     c.announce(MaplePacketCreator.enableActions());

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

@@ -1,22 +1,22 @@
 /*
- * This file is part of the HeavenMS (MapleSolaxiaV2) Maple Story Server
- *
- * Copyright (C) 2017 RonanLana
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+    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 net.server.channel.handlers;
 
 import constants.ItemConstants;

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

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

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

@@ -31,6 +31,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
 import client.MapleCharacter;
 import client.MapleClient;
 import constants.ServerConstants;
+import java.util.List;
 import scripting.event.EventInstanceManager;
 import server.maps.MapleMap;
 
@@ -81,34 +82,41 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
                     player.setMPC(partyplayer);
                     player.getMap().addPartyMember(player);
                     player.silentPartyUpdate();
-                    c.announce(MaplePacketCreator.partyCreated(partyplayer));
+                    c.announce(MaplePacketCreator.partyCreated(partyplayer, party.getId()));
+                    
+                    player.updateMapDropsUponPartyOperation(null);
                 } else {
                     c.announce(MaplePacketCreator.serverNotice(5, "You can't create a party as you are already in one."));
                 }
                 break;
             }
             case 2: { // leave/disband
+                List<MapleCharacter> partymembers = player.getPartyMembers();
+                
                 leaveParty(party, partyplayer, c);
+                player.updateMapDropsUponPartyOperation(partymembers);
                 break;
             }
             case 3: { // join
                 int partyid = slea.readInt();
-                if (c.getPlayer().getParty() == null) {
-                        party = world.getParty(partyid);
-                        if (party != null) {
-                            if (party.getMembers().size() < 6) {
-                                partyplayer = new MaplePartyCharacter(player);
-                                player.getMap().addPartyMember(player);
-                                
-                                world.updateParty(party.getId(), PartyOperation.JOIN, partyplayer);
-                                player.receivePartyMemberHP();
-                                player.updatePartyMemberHP();
-                            } else {
-                                c.announce(MaplePacketCreator.partyStatusMessage(17));
-                            }
+                if (player.getParty() == null) {
+                    party = world.getParty(partyid);
+                    if (party != null) {
+                        if (party.getMembers().size() < 6) {
+                            partyplayer = new MaplePartyCharacter(player);
+                            player.getMap().addPartyMember(player);
+
+                            world.updateParty(party.getId(), PartyOperation.JOIN, partyplayer);
+                            player.receivePartyMemberHP();
+                            player.updatePartyMemberHP();
+                            
+                            player.updateMapDropsUponPartyOperation(null);
                         } else {
-                            c.announce(MaplePacketCreator.serverNotice(5, "The person you have invited to the party is already in one."));
+                            c.announce(MaplePacketCreator.partyStatusMessage(17));
                         }
+                    } else {
+                        c.announce(MaplePacketCreator.serverNotice(5, "The person you have invited to the party is already in one."));
+                    }
                 } else {
                     c.announce(MaplePacketCreator.serverNotice(5, "You can't join the party as you are already in one."));
                 }
@@ -139,7 +147,9 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
                             player.setParty(party);
                             player.setMPC(partyplayer);
                             player.getMap().addPartyMember(player);
-                            c.announce(MaplePacketCreator.partyCreated(partyplayer));
+                            c.announce(MaplePacketCreator.partyCreated(partyplayer, party.getId()));
+                            
+                            player.updateMapDropsUponPartyOperation(null);
                         }
                         if (party.getMembers().size() < 6) {
                             invited.getClient().announce(MaplePacketCreator.partyInvite(player));
@@ -161,6 +171,8 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
                     if (expelled != null) {
                         MapleCharacter emc = expelled.getPlayer();
                         if(emc != null) {
+                            List<MapleCharacter> partyMembers = emc.getPartyMembers();
+                            
                             MapleMap map = emc.getMap();
                             if(map != null) map.removePartyMember(emc);
                             
@@ -170,9 +182,12 @@ public final class PartyOperationHandler extends AbstractMaplePacketHandler {
                             }
                             
                             emc.setParty(null);
+                            world.updateParty(party.getId(), PartyOperation.EXPEL, expelled);
+                            
+                            emc.updateMapDropsUponPartyOperation(partyMembers);
+                        } else {
+                            world.updateParty(party.getId(), PartyOperation.EXPEL, expelled);
                         }
-                        
-                        world.updateParty(party.getId(), PartyOperation.EXPEL, expelled);
                     }
                 }
                 break;

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

@@ -3,7 +3,8 @@
     Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
 		       Matthias Butz <matze@odinms.de>
 		       Jan Christian Meyer <vimes@odinms.de>
-    Copyleft (L) 2017 RonanLana (HeavenMS)
+
+    Copyleft (L) 2016 - 2018 RonanLana (HeavenMS)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -96,10 +97,10 @@ public final class PetAutoPotHandler extends AbstractMaplePacketHandler {
             maxMp = maxHpMp.right;
             
             incHp = stat.getHp();
-            if(incHp <= 0 && hasHpGain) incHp = (short)((maxHp * stat.getHpRate()) / 100.0);
+            if(incHp <= 0 && hasHpGain) incHp = (short)(maxHp * stat.getHpRate());
             
             incMp = stat.getMp();
-            if(incMp <= 0 && hasMpGain) incMp = (short)((maxMp * stat.getMpRate()) / 100.0);
+            if(incMp <= 0 && hasMpGain) incMp = (short)(maxMp * stat.getMpRate());
             
             curHp = chr.getHp();
             curMp = chr.getMp();
@@ -114,12 +115,12 @@ public final class PetAutoPotHandler extends AbstractMaplePacketHandler {
                     curMp += incMp;
 
                     //System.out.println();
-                    //System.out.println("hp: " + hasHpGain + " player hp " + curHp + " maxhp " + maxHp);
-                    //System.out.println("mp: " + hasMpGain + " player mp " + curMp + " maxmp " + maxMp);
-                    //System.out.println("redo? " + (shouldReusePot(chr) && toUse.getQuantity() > 0));
-                } while(shouldReusePot(chr) && toUse.getQuantity() > 0);
+                    //System.out.println("hp: " + hasHpGain + " hpgain " + incHp + " player hp " + curHp + " maxhp " + maxHp);
+                    //System.out.println("mp: " + hasMpGain + " mpgain " + incMp + " player mp " + curMp + " maxmp " + maxMp);
+                    //System.out.println("redo? " + (shouldReusePot() && toUse.getQuantity() > 0));
+                } while(shouldReusePot() && toUse.getQuantity() > 0);
 
-                if(toUse.getQuantity() == 0 && shouldReusePot(chr)) {
+                if(toUse.getQuantity() == 0 && shouldReusePot()) {
                     // depleted out the current slot, fetch for more
 
                     if(!cursorOnNextAvailablePot(chr)) {
@@ -170,7 +171,7 @@ public final class PetAutoPotHandler extends AbstractMaplePacketHandler {
         return new Pair<>(hp, mp);
     }
     
-    private boolean shouldReusePot(MapleCharacter chr) {
+    private boolean shouldReusePot() {
         return (hasHpGain && curHp < ServerConstants.PET_AUTOHP_RATIO * maxHp) || (hasMpGain && curMp < ServerConstants.PET_AUTOMP_RATIO * maxMp);
     } 
 }

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

@@ -25,7 +25,6 @@ import client.MapleCharacter;
 import client.MapleClient;
 import client.autoban.AutobanFactory;
 import client.inventory.Item;
-import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
 import constants.ItemConstants;
 import constants.ServerConstants;
@@ -71,6 +70,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
         ADD_ITEM(0x16),
         BUY(0x17),
         UPDATE_MERCHANT(0x19),
+        UPDATE_PLAYERSHOP(0x1A),
         REMOVE_ITEM(0x1B),
         BAN_PLAYER(0x1C),
         MERCHANT_THING(0x1D),
@@ -113,7 +113,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         byte mode = slea.readByte();
-        MapleCharacter chr = c.getPlayer();
+        final MapleCharacter chr = c.getPlayer();
         
         if (mode == Action.CREATE.getCode()) {
             byte createType = slea.readByte();
@@ -175,7 +175,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
 
                 if (GameConstants.isFreeMarketRoom(chr.getMapId()) || itemId > 5030000 && itemId < 5030012 || itemId > 5140000 && itemId < 5140006) {
                     if (createType == 4) {
-                        MaplePlayerShop shop = new MaplePlayerShop(c.getPlayer(), desc);
+                        MaplePlayerShop shop = new MaplePlayerShop(chr, desc);
                         chr.setPlayerShop(shop);
                         chr.getMap().addMapObject(shop);
                         shop.sendShop(c);
@@ -207,6 +207,8 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             		return;
             	}
             } else {
+                if (isTradeOpen(chr)) return;
+                
                 int oid = slea.readInt();
                 MapleMapObject ob = chr.getMap().getMapObject(oid);
                 if (ob instanceof MaplePlayerShop) {
@@ -217,9 +219,9 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     String pw = slea.available() > 1 ? slea.readMapleAsciiString() : "";
                     
                     MapleMiniGame game = (MapleMiniGame) ob;
-                    if(game.checkPassword(pw) || game.checkPassword(c.getPlayer().getName())) {
-                        if (game.hasFreeSlot() && !game.isVisitor(c.getPlayer())) {
-                            game.addVisitor(c.getPlayer());
+                    if(game.checkPassword(pw) || game.checkPassword(chr.getName())) {
+                        if (game.hasFreeSlot() && !game.isVisitor(chr)) {
+                            game.addVisitor(chr);
                             chr.setMiniGame(game);
                             switch (game.getGameType()) {
                                 case "omok":
@@ -237,7 +239,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     }
                 } else if (ob instanceof MapleHiredMerchant && chr.getHiredMerchant() == null) {
                     MapleHiredMerchant merchant = (MapleHiredMerchant) ob;
-                    if (merchant.isOwner(c.getPlayer())) {
+                    if (merchant.isOwner(chr)) {
                         merchant.setOpen(false);
                         merchant.removeAllVisitors();
                         
@@ -245,11 +247,11 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     } else if (!merchant.isOpen()) {
                         chr.getClient().announce(MaplePacketCreator.getMiniRoomError(18));
                         return;
-                    } else if (!merchant.addVisitor(c.getPlayer())) {
+                    } else if (!merchant.addVisitor(chr)) {
                         chr.getClient().announce(MaplePacketCreator.getMiniRoomError(2));
                         return;
                     } else {
-                        c.announce(MaplePacketCreator.getHiredMerchant(c.getPlayer(), merchant, false));
+                        c.announce(MaplePacketCreator.getHiredMerchant(chr, merchant, false));
                     }
                     chr.setHiredMerchant(merchant);
                 }
@@ -269,20 +271,22 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     game.chat(c, slea.readMapleAsciiString());
                 }
             } else if (merchant != null) {
-                merchant.sendMessage(c.getPlayer(), slea.readMapleAsciiString());
+                merchant.sendMessage(chr, slea.readMapleAsciiString());
             }
         } else if (mode == Action.EXIT.getCode()) {
             if (chr.getTrade() != null) {
-                MapleTrade.cancelTrade(c.getPlayer());
+                MapleTrade.cancelTrade(chr);
             } else {
                 chr.closePlayerShop();
                 chr.closeMiniGame();
                 chr.closeHiredMerchant(true);
             }
         } else if (mode == Action.OPEN.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             MaplePlayerShop shop = chr.getPlayerShop();
             MapleHiredMerchant merchant = chr.getHiredMerchant();
-            if (shop != null && shop.isOwner(c.getPlayer())) {
+            if (shop != null && shop.isOwner(chr)) {
                 slea.readByte();//01
                 
                 if(ServerConstants.USE_ERASE_PERMIT_ON_OPENSHOP) {
@@ -291,9 +295,9 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                     } catch(RuntimeException re) {} // fella does not have a player shop permit...
                 }
                 
-                chr.getMap().broadcastMessage(MaplePacketCreator.addCharBox(c.getPlayer(), 4));
+                chr.getMap().broadcastMessage(MaplePacketCreator.addCharBox(chr, 4));
                 shop.setOpen(true);
-            } else if (merchant != null && merchant.isOwner(c.getPlayer())) {
+            } else if (merchant != null && merchant.isOwner(chr)) {
                 chr.setHasMerchant(true);
                 merchant.setOpen(true);
                 chr.getMap().addMapObject(merchant);
@@ -321,14 +325,14 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
         } else if (mode == Action.GIVE_UP.getCode()) {
             MapleMiniGame game = chr.getMiniGame();
             if (game.getGameType().equals("omok")) {
-                if (game.isOwner(c.getPlayer())) {
+                if (game.isOwner(chr)) {
                     game.broadcast(MaplePacketCreator.getMiniGameOwnerForfeit(game));
                 } else {
                     game.broadcast(MaplePacketCreator.getMiniGameVisitorForfeit(game));
                 }
             }
             if (game.getGameType().equals("matchcard")) {
-                if (game.isOwner(c.getPlayer())) {
+                if (game.isOwner(chr)) {
                     game.broadcast(MaplePacketCreator.getMatchCardVisitorWin(game));
                 } else {
                     game.broadcast(MaplePacketCreator.getMatchCardOwnerWin(game));
@@ -336,7 +340,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             }
         } else if (mode == Action.REQUEST_TIE.getCode()) {
             MapleMiniGame game = chr.getMiniGame();
-            if (game.isOwner(c.getPlayer())) {
+            if (game.isOwner(chr)) {
                 game.broadcastToVisitor(MaplePacketCreator.getMiniGameRequestTie(game));
             } else {
                 game.getOwner().getClient().announce(MaplePacketCreator.getMiniGameRequestTie(game));
@@ -352,7 +356,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             }
         } else if (mode == Action.SKIP.getCode()) {
             MapleMiniGame game = chr.getMiniGame();
-            if (game.isOwner(c.getPlayer())) {
+            if (game.isOwner(chr)) {
                 game.broadcast(MaplePacketCreator.getMiniGameSkipOwner(game));
             } else {
                 game.broadcast(MaplePacketCreator.getMiniGameSkipVisitor(game));
@@ -361,7 +365,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             int x = slea.readInt(); // x point
             int y = slea.readInt(); // y point
             int type = slea.readByte(); // piece ( 1 or 2; Owner has one piece, visitor has another, it switches every game.)
-            chr.getMiniGame().setPiece(x, y, type, c.getPlayer());
+            chr.getMiniGame().setPiece(x, y, type, chr);
         } else if (mode == Action.SELECT_CARD.getCode()) {
             int turn = slea.readByte(); // 1st turn = 1; 2nd turn = 0
             int slot = slea.readByte(); // slot
@@ -369,20 +373,20 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             int firstslot = game.getFirstSlot();
             if (turn == 1) {
                 game.setFirstSlot(slot);
-                if (game.isOwner(c.getPlayer())) {
+                if (game.isOwner(chr)) {
                     game.broadcastToVisitor(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, turn));
                 } else {
                     game.getOwner().getClient().announce(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, turn));
                 }
             } else if ((game.getCardId(firstslot + 1)) == (game.getCardId(slot + 1))) {
-                if (game.isOwner(c.getPlayer())) {
+                if (game.isOwner(chr)) {
                     game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 2));
                     game.setOwnerPoints();
                 } else {
                     game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 3));
                     game.setVisitorPoints();
                 }
-            } else if (game.isOwner(c.getPlayer())) {
+            } else if (game.isOwner(chr)) {
                 game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 0));
             } else {
                 game.broadcast(MaplePacketCreator.getMatchCardSelect(game, turn, slot, firstslot, 1));
@@ -401,7 +405,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                 return;            	
             }
             if (chr.getTrade() != null) {
-                if ((quantity <= item.getQuantity() && quantity >= 0) || ItemConstants.isRechargable(item.getItemId())) {
+                if ((quantity <= item.getQuantity() && quantity >= 0) || ItemConstants.isRechargeable(item.getItemId())) {
                     if (ii.isDropRestricted(item.getItemId())) { // ensure that undroppable items do not make it to the trade window
                         if (!((item.getFlag() & ItemConstants.KARMA) == ItemConstants.KARMA)) {
                             c.announce(MaplePacketCreator.serverNotice(1, "That item is untradeable."));
@@ -410,7 +414,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                         }
                     }
                     Item tradeItem = item.copy();
-                    if (ItemConstants.isRechargable(item.getItemId())) {
+                    if (ItemConstants.isRechargeable(item.getItemId())) {
                         tradeItem.setQuantity(item.getQuantity());
                         MapleInventoryManipulator.removeFromSlot(c, ivType, item.getPosition(), item.getQuantity(), true);
                     } else {
@@ -422,98 +426,105 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
                 }
             }
         } else if (mode == Action.CONFIRM.getCode()) {
-            MapleTrade.completeTrade(c.getPlayer());
+            MapleTrade.completeTrade(chr);
         } else if (mode == Action.ADD_ITEM.getCode() || mode == Action.PUT_ITEM.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             MapleInventoryType ivType = MapleInventoryType.getByType(slea.readByte());
             short slot = slea.readShort();
             short bundles = slea.readShort();
-            if (chr.getInventory(ivType).getItem(slot) == null || chr.getItemQuantity(chr.getInventory(ivType).getItem(slot).getItemId(), false) < bundles || chr.getInventory(ivType).getItem(slot).getFlag() == ItemConstants.UNTRADEABLE) {
+            Item ivItem = chr.getInventory(ivType).getItem(slot);
+            
+            if (ivItem == null || ivItem.getFlag() == ItemConstants.UNTRADEABLE) {
                 c.announce(MaplePacketCreator.serverNotice(1, "Could not perform shop operation with that item."));
                 c.announce(MaplePacketCreator.enableActions());
                 return;
             }
+            
             short perBundle = slea.readShort();
-            int price = slea.readInt();
-            if (perBundle <= 0 || perBundle * bundles > 2000 || bundles <= 0 || price <= 0 || price > Integer.MAX_VALUE) {
-            	AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with hired merchants.");
-            	FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().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);
+            
+            if (ItemConstants.isRechargeable(ivItem.getItemId())) {
+                perBundle = 1;
+                bundles = 1;
+            } else if (chr.getItemQuantity(ivItem.getItemId(), false) < perBundle * bundles) {
+                c.announce(MaplePacketCreator.serverNotice(1, "Could not perform shop operation with that item."));
+                c.announce(MaplePacketCreator.enableActions());
                 return;
             }
-            Item ivItem = chr.getInventory(ivType).getItem(slot);
-            Item sellItem = ivItem.copy();
-            if (chr.getItemQuantity(ivItem.getItemId(), false) < perBundle * bundles) {
+            
+            int price = slea.readInt();
+            if (perBundle <= 0 || perBundle * bundles > 2000 || bundles <= 0 || price <= 0 || price > Integer.MAX_VALUE) {
+            	AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to packet edit with hired merchants.");
+            	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;
-            } else if (ServerConstants.USE_ENFORCE_UNMERCHABLE_PET && ItemConstants.isPet(ivItem.getItemId())) {
+            }
+            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."));
                 return;
             }
-            sellItem.setQuantity(perBundle);
+            
+            if(!ItemConstants.isRechargeable(ivItem.getItemId())) {
+                sellItem.setQuantity(perBundle);
+            }
+            
             MaplePlayerShopItem shopItem = new MaplePlayerShopItem(sellItem, bundles, price);
             MaplePlayerShop shop = chr.getPlayerShop();
             MapleHiredMerchant merchant = chr.getHiredMerchant();
-            if (shop != null && shop.isOwner(c.getPlayer())) {
-                if (ivItem != null && ivItem.getQuantity() >= bundles * perBundle) {
-                    shop.addItem(shopItem);
-                    c.announce(MaplePacketCreator.getPlayerShopItemUpdate(shop));
+            if (shop != null && shop.isOwner(chr)) {
+                if (shop.isOpen()) {
+                    c.announce(MaplePacketCreator.serverNotice(1, "You can't sell it anymore."));
+                    return;
                 }
-            } else if (merchant != null && merchant.isOwner(c.getPlayer())) {
+                
+                shop.addItem(shopItem);
+                c.announce(MaplePacketCreator.getPlayerShopItemUpdate(shop));
+            } else if (merchant != null && merchant.isOwner(chr)) {
+                if (merchant.isOpen()) {
+                    c.announce(MaplePacketCreator.serverNotice(1, "You can't sell it anymore."));
+                    return;
+                }
+                
                 merchant.addItem(shopItem);
-                c.announce(MaplePacketCreator.updateHiredMerchant(merchant, c.getPlayer()));
+                c.announce(MaplePacketCreator.updateHiredMerchant(merchant, chr));
             }
-            if (ItemConstants.isRechargable(ivItem.getItemId())) {
+            if (ItemConstants.isRechargeable(ivItem.getItemId())) {
                 MapleInventoryManipulator.removeFromSlot(c, ivType, slot, ivItem.getQuantity(), true);
             } else {
                 MapleInventoryManipulator.removeFromSlot(c, ivType, slot, (short) (bundles * perBundle), true);
             }
         } else if (mode == Action.REMOVE_ITEM.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             MaplePlayerShop shop = chr.getPlayerShop();
-            if (shop != null && shop.isOwner(c.getPlayer())) {
+            if (shop != null && shop.isOwner(chr)) {
+                if (shop.isOpen()) {
+                    c.announce(MaplePacketCreator.serverNotice(1, "You can't take it with the store open."));
+                    return;
+                }
+                
                 int slot = slea.readShort();
                 if (slot >= shop.getItems().size() || slot < 0) {
-                        AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with a player shop.");
-                	FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to remove item at slot " + slot + "\r\n");
-                	c.disconnect(true, false);
-                	return;
+                    AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to packet edit with a player shop.");
+                    FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " tried to remove item at slot " + slot + "\r\n");
+                    c.disconnect(true, false);
+                    return;
                 }
-                MaplePlayerShopItem shopItem = shop.getItems().get(slot);
-                Item ivItem = shopItem.getItem().copy();
-                shop.removeItem(slot);
-                ivItem.setQuantity(shopItem.getBundles());
-                MapleInventoryManipulator.addFromDrop(c, ivItem, false);
-                c.announce(MaplePacketCreator.getPlayerShopItemUpdate(shop));
+                
+                shop.takeItemBack(slot, chr);
             }
-        } else if (mode == Action.MERCHANT_MESO.getCode()) {//Hmmmm
-            /*if (!chr.getHiredMerchant().isOwner(chr) || chr.getMerchantMeso() < 1) return;
-            int possible = Integer.MAX_VALUE - chr.getMerchantMeso();
-            if (possible > 0) {
-                if (possible < chr.getMerchantMeso()) {
-                    chr.gainMeso(possible, false);
-                    chr.setMerchantMeso(chr.getMerchantMeso() - possible);
-                } else {
-                    chr.gainMeso(chr.getMerchantMeso(), false);
-                    chr.setMerchantMeso(0);
-                }
-                c.announce(MaplePacketCreator.updateHiredMerchant(chr.getHiredMerchant(), chr));
-            }*/
+        } else if (mode == Action.MERCHANT_MESO.getCode()) {
+            MapleHiredMerchant merchant = chr.getHiredMerchant();
+            if (merchant == null) return;
+            
+            merchant.withdrawMesos(chr);
         } else if (mode == Action.MERCHANT_ORGANIZE.getCode()) {
             MapleHiredMerchant merchant = chr.getHiredMerchant();
-            if (!merchant.isOwner(chr)) return;
+            if (merchant == null || !merchant.isOwner(chr)) return;
+            
+            merchant.withdrawMesos(chr);
+            merchant.clearInexistentItems();
             
-            if (chr.getMerchantMeso() > 0) {
-                int possible = Integer.MAX_VALUE - chr.getMerchantMeso();
-                if (possible > 0) {
-                    if (possible < chr.getMerchantMeso()) {
-                        chr.gainMeso(possible, false);
-                        chr.setMerchantMeso(chr.getMerchantMeso() - possible);
-                    } else {
-                        chr.gainMeso(chr.getMerchantMeso(), false);
-                        chr.setMerchantMeso(0);
-                    }
-                }
-            }
-            for (int i = 0; i < merchant.getItems().size(); i++) {
-                if (!merchant.getItems().get(i).isExist()) merchant.removeFromSlot(i);
-            }
             if (merchant.getItems().isEmpty()) {
                 c.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
                 c.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
@@ -524,57 +535,65 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             c.announce(MaplePacketCreator.updateHiredMerchant(merchant, chr));
 
         } else if (mode == Action.BUY.getCode() || mode == Action.MERCHANT_BUY.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             int itemid = slea.readByte();
             short quantity = slea.readShort();
             if (quantity < 1) {
-                AutobanFactory.PACKET_EDIT.alert(c.getPlayer(), c.getPlayer().getName() + " tried to packet edit with a hired merchant and or player shop.");
-            	FilePrinter.printError(FilePrinter.EXPLOITS + c.getPlayer().getName() + ".txt", c.getPlayer().getName() + " tried to buy item " + itemid + " with quantity " + quantity + "\r\n");
+                AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to packet edit with a hired merchant and or player shop.");
+            	FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " tried to buy item " + itemid + " with quantity " + quantity + "\r\n");
             	c.disconnect(true, false);
             	return;
             }
             MaplePlayerShop shop = chr.getPlayerShop();
             MapleHiredMerchant merchant = chr.getHiredMerchant();
-            if (shop != null && shop.isVisitor(c.getPlayer())) {
+            if (shop != null && shop.isVisitor(chr)) {
                 shop.buy(c, itemid, quantity);
                 shop.broadcast(MaplePacketCreator.getPlayerShopItemUpdate(shop));
             } else if (merchant != null && !merchant.isOwner(chr)) {
                 merchant.buy(c, itemid, quantity);
-                merchant.broadcastToVisitorsThreadsafe(MaplePacketCreator.updateHiredMerchant(merchant, c.getPlayer()));
+                merchant.broadcastToVisitorsThreadsafe(MaplePacketCreator.updateHiredMerchant(merchant, chr));
             }
         } else if (mode == Action.TAKE_ITEM_BACK.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             MapleHiredMerchant merchant = chr.getHiredMerchant();
-            if (merchant != null && merchant.isOwner(c.getPlayer())) {
+            if (merchant != null && merchant.isOwner(chr)) {
+                if (merchant.isOpen()) {
+                    c.announce(MaplePacketCreator.serverNotice(1, "You can't take it with the store open."));
+                    return;
+                }
+                
                 int slot = slea.readShort();
-                MaplePlayerShopItem shopItem = merchant.getItems().get(slot);
-                if (!MapleInventory.checkSpot(chr, shopItem.getItem())) {
-                        c.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
-                	c.announce(MaplePacketCreator.enableActions());
-                	return;
+                if (slot >= merchant.getItems().size() || slot < 0) {
+                    AutobanFactory.PACKET_EDIT.alert(chr, chr.getName() + " tried to packet edit with a hired merchant.");
+                    FilePrinter.printError(FilePrinter.EXPLOITS + chr.getName() + ".txt", chr.getName() + " tried to remove item at slot " + slot + "\r\n");
+                    c.disconnect(true, false);
+                    return;
                 }
-                if (shopItem.getBundles() > 0) {
-                    Item iitem = shopItem.getItem();
-                    iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));                    
-                    MapleInventoryManipulator.addFromDrop(c, iitem, true);
-                }
-                merchant.removeFromSlot(slot);
-                c.announce(MaplePacketCreator.updateHiredMerchant(merchant, c.getPlayer()));
+                
+                merchant.takeItemBack(slot, chr);
             }
         } else if (mode == Action.CLOSE_MERCHANT.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             MapleHiredMerchant merchant = chr.getHiredMerchant();
-            if (merchant != null && merchant.isOwner(c.getPlayer())) {
+            if (merchant != null && merchant.isOwner(chr)) {
                 c.announce(MaplePacketCreator.hiredMerchantOwnerLeave());
                 c.announce(MaplePacketCreator.leaveHiredMerchant(0x00, 0x03));
                 merchant.closeShop(c, false);
                 chr.setHasMerchant(false);
             }
         } else if (mode == Action.MAINTENANCE_OFF.getCode()) {
+            if (isTradeOpen(chr)) return;
+            
             MapleHiredMerchant merchant = chr.getHiredMerchant();
             if(merchant != null) {
-                if (merchant.getItems().isEmpty() && merchant.isOwner(c.getPlayer())) {
+                if (merchant.getItems().isEmpty() && merchant.isOwner(chr)) {
                     merchant.closeShop(c, false);
                     chr.setHasMerchant(false);
                 }
-                if (merchant.isOwner(c.getPlayer())) {
+                if (merchant.isOwner(chr)) {
                     merchant.clearMessages();
                     merchant.setOpen(true);
                 }
@@ -585,7 +604,7 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
         } else if (mode == Action.BAN_PLAYER.getCode()) {
             slea.skip(1);
             
-            if (chr.getPlayerShop() != null && chr.getPlayerShop().isOwner(c.getPlayer())) {
+            if (chr.getPlayerShop() != null && chr.getPlayerShop().isOwner(chr)) {
                 chr.getPlayerShop().banPlayer(slea.readMapleAsciiString());
             }
         } else if (mode == Action.EXPEL.getCode()) {
@@ -600,4 +619,14 @@ public final class PlayerInteractionHandler extends AbstractMaplePacketHandler {
             }
         }
     }
+    
+    private static boolean isTradeOpen(MapleCharacter chr) {
+        if (chr.getTrade() != null) {   // thanks to Rien dev team
+            //Apparently there is a dupe exploit that causes racing conditions when saving/retrieving from the db with stuff like trade open.
+            chr.announce(MaplePacketCreator.enableActions());
+            return true;
+        }
+        
+        return false;
+    }
 }

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

@@ -148,6 +148,8 @@ public final class PlayerLoggedinHandler extends AbstractMaplePacketHandler {
             player.announce(MaplePacketCreator.sendAutoMpPot(player.getKeymap().get(92).getAction()));
         
         player.getMap().addPlayer(player);
+        player.visitMap(player.getMap());
+        
         World world = server.getWorld(c.getWorld());
         world.getPlayerStorage().addPlayer(player);
         

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

@@ -34,6 +34,7 @@ import tools.data.input.SeekableLittleEndianAccessor;
  * @author kevintjuh93 :3
  */
 public class RemoteStoreHandler extends AbstractMaplePacketHandler {
+    @Override
     public void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
         MapleCharacter chr = c.getPlayer();
         MapleHiredMerchant hm = getMerchant(c);
@@ -54,7 +55,7 @@ public class RemoteStoreHandler extends AbstractMaplePacketHandler {
         c.announce(MaplePacketCreator.enableActions());
     }
 
-    private MapleHiredMerchant getMerchant(MapleClient c) {
+    private static MapleHiredMerchant getMerchant(MapleClient c) {
         if (c.getPlayer().hasMerchant()) {
             return c.getWorldServer().getHiredMerchant(c.getPlayer().getId());
         }

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

@@ -116,8 +116,8 @@ public final class StorageHandler extends AbstractMaplePacketHandler {
 			} else {
 				MapleInventoryType invType = ItemConstants.getInventoryType(itemId);
 				Item item = chr.getInventory(invType).getItem(slot).copy();
-				if (item.getItemId() == itemId && (item.getQuantity() >= quantity || ItemConstants.isRechargable(itemId))) {
-					if (ItemConstants.isRechargable(itemId)) {
+				if (item.getItemId() == itemId && (item.getQuantity() >= quantity || ItemConstants.isRechargeable(itemId))) {
+					if (ItemConstants.isRechargeable(itemId)) {
 						quantity = item.getQuantity();
 					}
 					chr.gainMeso(meso, false, true, false);

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

@@ -21,11 +21,13 @@
 */
 package net.server.channel.handlers;
 
+import client.MapleCharacter;
 import client.MapleClient;
 import client.MapleDisease;
 import client.inventory.Item;
 import client.inventory.MapleInventoryType;
 import constants.ItemConstants;
+import constants.ServerConstants;
 import net.AbstractMaplePacketHandler;
 import server.MapleInventoryManipulator;
 import server.MapleItemInformationProvider;
@@ -38,7 +40,9 @@ import tools.data.input.SeekableLittleEndianAccessor;
 public final class UseItemHandler extends AbstractMaplePacketHandler {
     @Override
     public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
-        if (!c.getPlayer().isAlive()) {
+        MapleCharacter chr = c.getPlayer();
+        
+        if (!chr.isAlive()) {
             c.announce(MaplePacketCreator.enableActions());
             return;
         }
@@ -46,47 +50,52 @@ public final class UseItemHandler extends AbstractMaplePacketHandler {
         slea.readInt();
         short slot = slea.readShort();
         int itemId = slea.readInt();
-        Item toUse = c.getPlayer().getInventory(MapleInventoryType.USE).getItem(slot);
+        Item toUse = chr.getInventory(MapleInventoryType.USE).getItem(slot);
         if (toUse != null && toUse.getQuantity() > 0 && toUse.getItemId() == itemId) {
             if (itemId == 2022178 || itemId == 2050004) {
-                c.getPlayer().dispelDebuffs();
+                chr.dispelDebuffs();
                 remove(c, slot);
                 return;
-            }
-            else if (itemId == 2050001) {
-		c.getPlayer().dispelDebuff(MapleDisease.DARKNESS);
+            } else if (itemId == 2050001) {
+		chr.dispelDebuff(MapleDisease.DARKNESS);
                 remove(c, slot);
                 return;
 	    } else if (itemId == 2050002) {
-		c.getPlayer().dispelDebuff(MapleDisease.WEAKEN);
-                c.getPlayer().dispelDebuff(MapleDisease.SLOW);
+		chr.dispelDebuff(MapleDisease.WEAKEN);
+                chr.dispelDebuff(MapleDisease.SLOW);
                 remove(c, slot);
                 return;
             } else if (itemId == 2050003) {
-                c.getPlayer().dispelDebuff(MapleDisease.SEAL);
-		c.getPlayer().dispelDebuff(MapleDisease.CURSE);
+                chr.dispelDebuff(MapleDisease.SEAL);
+		chr.dispelDebuff(MapleDisease.CURSE);
                 remove(c, slot);
                 return;
-            }
-            else if (ItemConstants.isTownScroll(itemId)) {
-                if (ii.getItemEffect(toUse.getItemId()).applyTo(c.getPlayer())) {
+            } else if (ItemConstants.isTownScroll(itemId)) {
+                int banMap = chr.getMapId();
+                int banSp = chr.getMap().findClosestPlayerSpawnpoint(chr.getPosition()).getId();
+                long banTime = System.currentTimeMillis();
+                
+                if (ii.getItemEffect(toUse.getItemId()).applyTo(chr)) {
+                    if(ServerConstants.USE_BANISHABLE_TOWN_SCROLL) {
+                        chr.setBanishPlayerData(banMap, banSp, banTime);
+                    }
+                    
                     remove(c, slot);
                 }
                 return;
-            }
-            else if (ItemConstants.isAntibanishScroll(itemId)) {
-                if (ii.getItemEffect(toUse.getItemId()).applyTo(c.getPlayer())) {
+            } else if (ItemConstants.isAntibanishScroll(itemId)) {
+                if (ii.getItemEffect(toUse.getItemId()).applyTo(chr)) {
                     remove(c, slot);
                 } else {
-                    c.getPlayer().dropMessage(5, "You cannot recover from a banish state at the moment.");
+                    chr.dropMessage(5, "You cannot recover from a banish state at the moment.");
                 }
                 return;
             }
             
             remove(c, slot);
             
-            ii.getItemEffect(toUse.getItemId()).applyTo(c.getPlayer());
-            c.getPlayer().checkBerserk(c.getPlayer().isHidden());
+            ii.getItemEffect(toUse.getItemId()).applyTo(chr);
+            chr.checkBerserk(chr.isHidden());
         }
     }
 

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

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/BaseWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/CharacterAutosaverWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/CharacterDiseaseWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/CouponWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/HiredMerchantWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/MountTirednessWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/net/server/worker/PetFullnessWorker.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/provider/wz/XMLDomMapleData.java

@@ -21,6 +21,7 @@
  */
 package provider.wz;
 
+import constants.ServerConstants;
 import java.awt.Point;
 import java.io.File;
 import java.io.FileInputStream;
@@ -60,12 +61,12 @@ public class XMLDomMapleData implements MapleData {
 			throw new RuntimeException(e);
 		}
 		this.imageDataDir = imageDataDir;
-                this.nf = NumberFormat.getInstance(Locale.FRANCE);
+                this.nf = NumberFormat.getInstance(ServerConstants.USE_UNITPRICE_WITH_COMMA ? Locale.FRANCE : Locale.UK);
 	}
 
 	private XMLDomMapleData(Node node) {
 		this.node = node;
-                this.nf = NumberFormat.getInstance(Locale.FRANCE);
+                this.nf = NumberFormat.getInstance(ServerConstants.USE_UNITPRICE_WITH_COMMA ? Locale.FRANCE : Locale.UK);
 	}
 
 	@Override

src/scripting/reactor/ReactorActionManager.java

@@ -43,8 +43,10 @@ import server.TimerManager;
 import server.life.MapleLifeFactory;
 import server.life.MapleMonster;
 import server.maps.MapMonitor;
+import server.maps.MapleMap;
 import server.maps.MapleReactor;
 import server.maps.ReactorDropEntry;
+import tools.MaplePacketCreator;
 
 /**
  * @author Lerk
@@ -253,10 +255,13 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
     }
     
     public void hitMonsterWithReactor(int id, int hitsToKill) {  // until someone comes with a better solution, why not?
-        MapleMonster mm = reactor.getMap().getMonsterById(id);
+        MapleMap map = reactor.getMap();
+        MapleMonster mm = map.getMonsterById(id);
         if(mm != null) {
             int damage = (int)Math.ceil(mm.getMaxHp() / hitsToKill);
-            reactor.getMap().damageMonster(this.getPlayer(), mm, damage);
+            
+            map.damageMonster(this.getPlayer(), mm, damage);
+            map.broadcastMessage(MaplePacketCreator.damageMonster(mm.getObjectId(), damage));
         }
     }
 

src/server/MapleInventoryManipulator.java

@@ -70,7 +70,7 @@ public class MapleInventoryManipulator {
         if (!type.equals(MapleInventoryType.EQUIP)) {
             short slotMax = ii.getSlotMax(c, itemId);
             List<Item> existing = c.getPlayer().getInventory(type).listById(itemId);
-            if (!ItemConstants.isRechargable(itemId) && petid == -1) {
+            if (!ItemConstants.isRechargeable(itemId) && petid == -1) {
                 if (existing.size() > 0) { // first update all existing slots to slotMax
                     Iterator<Item> i = existing.iterator();
                     while (quantity > 0) {
@@ -89,7 +89,7 @@ public class MapleInventoryManipulator {
                         }
                     }
                 }
-                while (quantity > 0 || ItemConstants.isRechargable(itemId)) {
+                while (quantity > 0 || ItemConstants.isRechargeable(itemId)) {
                     short newQ = (short) Math.min(quantity, slotMax);
                     if (newQ != 0) {
                         quantity -= newQ;
@@ -106,7 +106,7 @@ public class MapleInventoryManipulator {
                             nItem.setOwner(owner);
                         }
                         c.announce(MaplePacketCreator.modifyInventory(true, Collections.singletonList(new ModifyInventory(0, nItem))));
-                        if ((ItemConstants.isRechargable(itemId)) && quantity == 0) {
+                        if ((ItemConstants.isRechargeable(itemId)) && quantity == 0) {
                             break;
                         }
                     } else {
@@ -166,7 +166,7 @@ public class MapleInventoryManipulator {
         if (!type.equals(MapleInventoryType.EQUIP)) {
             short slotMax = ii.getSlotMax(c, item.getItemId());
             List<Item> existing = c.getPlayer().getInventory(type).listById(item.getItemId());
-            if (!ItemConstants.isRechargable(item.getItemId()) && petId == -1) {
+            if (!ItemConstants.isRechargeable(item.getItemId()) && petId == -1) {
                 if (existing.size() > 0) { // first update all existing slots to slotMax
                     Iterator<Item> i = existing.iterator();
                     while (quantity > 0) {
@@ -248,7 +248,7 @@ public class MapleInventoryManipulator {
         if (!type.equals(MapleInventoryType.EQUIP)) {
             short slotMax = ii.getSlotMax(c, itemid);
             List<Item> existing = c.getPlayer().getInventory(type).listById(itemid);
-            if (!ItemConstants.isRechargable(itemid)) {
+            if (!ItemConstants.isRechargeable(itemid)) {
                 if (existing.size() > 0) // first update all existing slots to slotMax
                 {
                     for (Item eItem : existing) {
@@ -266,7 +266,7 @@ public class MapleInventoryManipulator {
             final int numSlotsNeeded;
             if (slotMax > 0) {
                 numSlotsNeeded = (int) (Math.ceil(((double) quantity) / slotMax));
-            } else if (ItemConstants.isRechargable(itemid)) {
+            } else if (ItemConstants.isRechargeable(itemid)) {
                 numSlotsNeeded = 1;
             } else {
                 numSlotsNeeded = 1;
@@ -293,7 +293,7 @@ public class MapleInventoryManipulator {
         
         if (!type.equals(MapleInventoryType.EQUIP)) {
             short slotMax = ii.getSlotMax(c, itemid);
-            if (!ItemConstants.isRechargable(itemid)) {
+            if (!ItemConstants.isRechargeable(itemid)) {
                 List<Item> existing = c.getPlayer().getInventory(type).listById(itemid);
                 
                 if (existing.size() > 0) // first update all existing slots to slotMax
@@ -313,7 +313,7 @@ public class MapleInventoryManipulator {
             final int numSlotsNeeded;
             if (slotMax > 0) {
                 numSlotsNeeded = (int) (Math.ceil(((double) quantity) / slotMax));
-            } else if (ItemConstants.isRechargable(itemid)) {
+            } else if (ItemConstants.isRechargeable(itemid)) {
                 numSlotsNeeded = 1;
             } else {
                 numSlotsNeeded = 1;
@@ -337,7 +337,7 @@ public class MapleInventoryManipulator {
 
     public static void removeFromSlot(MapleClient c, MapleInventoryType type, short slot, short quantity, boolean fromDrop, boolean consume) {
         Item item = c.getPlayer().getInventory(type).getItem(slot);
-        boolean allowZero = consume && ItemConstants.isRechargable(item.getItemId());
+        boolean allowZero = consume && ItemConstants.isRechargeable(item.getItemId());
         c.getPlayer().getInventory(type).removeItem(slot, quantity, allowZero);
         if (item.getQuantity() == 0 && !allowZero) {
             c.announce(MaplePacketCreator.modifyInventory(fromDrop, Collections.singletonList(new ModifyInventory(3, item))));
@@ -396,7 +396,7 @@ public class MapleInventoryManipulator {
         short slotMax = ii.getSlotMax(c, source.getItemId());
         c.getPlayer().getInventory(type).move(src, dst, slotMax);
         final List<ModifyInventory> mods = new ArrayList<>();
-        if (!(type.equals(MapleInventoryType.EQUIP) || type.equals(MapleInventoryType.CASH)) && initialTarget != null && initialTarget.getItemId() == source.getItemId() && !ItemConstants.isRechargable(source.getItemId()) && isSameOwner(source, initialTarget)) {
+        if (!(type.equals(MapleInventoryType.EQUIP) || type.equals(MapleInventoryType.CASH)) && initialTarget != null && initialTarget.getItemId() == source.getItemId() && !ItemConstants.isRechargeable(source.getItemId()) && isSameOwner(source, initialTarget)) {
             if ((olddstQ + oldsrcQ) > slotMax) {
                 mods.add(new ModifyInventory(1, source));
                 mods.add(new ModifyInventory(1, initialTarget));
@@ -562,11 +562,11 @@ public class MapleInventoryManipulator {
                 c.getPlayer().setChalkboard(null);
             }
         }
-        if ((!ItemConstants.isRechargable(itemId) && source.getQuantity() < quantity) || quantity < 0) {
+        if ((!ItemConstants.isRechargeable(itemId) && source.getQuantity() < quantity) || quantity < 0) {
             return;
         }
         Point dropPos = new Point(c.getPlayer().getPosition());
-        if (quantity < source.getQuantity() && !ItemConstants.isRechargable(itemId)) {
+        if (quantity < source.getQuantity() && !ItemConstants.isRechargeable(itemId)) {
             Item target = source.copy();
             target.setQuantity(quantity);
             source.setQuantity((short) (source.getQuantity() - quantity));

src/server/MapleItemInformationProvider.java

@@ -421,6 +421,41 @@ public class MapleItemInformationProvider {
         return pEntry;
     }
 
+    private static double getRoundedUnitPrice(double unitPrice, int max) {
+        double intPart = Math.floor(unitPrice);
+        double fractPart = unitPrice - intPart;
+        if(fractPart == 0.0) return intPart;
+        
+        double fractMask = 0.0;
+        double lastFract, curFract = 1.0;
+        int i = 1;
+        
+        do {
+            lastFract = curFract;
+            curFract /= 2;
+            
+            if(fractPart == curFract) {
+                break;
+            } else if(fractPart > curFract) {
+                fractMask += curFract;
+                fractPart -= curFract;
+            }
+            
+            i++;
+        } while(i <= max);
+        
+        if(i > max) {
+            lastFract = curFract;
+            curFract = 0.0;
+        }
+        
+        if(Math.abs(fractPart - curFract) < Math.abs(fractPart - lastFract)) {
+            return intPart + fractMask + curFract;
+        } else {
+            return intPart + fractMask + lastFract;
+        }
+    }
+    
     private Pair<Integer, Double> getItemPriceData(int itemId) {
         MapleData item = getItemData(itemId);
         if (item == null) {
@@ -439,7 +474,7 @@ public class MapleItemInformationProvider {
         pData = item.getChildByPath("info/unitPrice");
         if (pData != null) {
             try {
-                fEntry = MapleDataTool.getDouble(pData);
+                fEntry = getRoundedUnitPrice(MapleDataTool.getDouble(pData), 5);
             } catch (Exception e) {
                 fEntry = (double) MapleDataTool.getInt(pData);
             }
@@ -472,7 +507,7 @@ public class MapleItemInformationProvider {
             return -1;
         }
         
-        if(!ItemConstants.isRechargable(itemId)) {
+        if(!ItemConstants.isRechargeable(itemId)) {
             retPrice *= quantity;
         } else {
             retPrice += Math.ceil(quantity * getUnitPrice(itemId));
@@ -481,38 +516,6 @@ public class MapleItemInformationProvider {
         return retPrice;
     }
     
-    public static boolean canSell(Item item, short quantity) {
-        if (item == null) { //Basic check
-            return false;
-        }
-        
-        short iQuant = item.getQuantity();
-        if (iQuant == 0xFFFF) {
-            iQuant = 1;
-        } else if(iQuant < 0) {
-            return false;
-        }
-        
-        if (!ItemConstants.isRechargable(item.getItemId())) {
-            if (iQuant == 0 || quantity > iQuant) {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    public static short getSellingQuantity(Item item, short quantity) {
-        if (ItemConstants.isRechargable(item.getItemId())) {
-            quantity = item.getQuantity();
-            if (quantity == 0xFFFF) {
-                quantity = 1;
-            }
-        }
-        
-        return quantity;
-    }
-    
     protected String getEquipmentSlot(int itemId) {
         if (equipmentSlotCache.containsKey(itemId)) {
             return equipmentSlotCache.get(itemId);

src/server/MapleShop.java

@@ -91,7 +91,7 @@ public class MapleShop {
         if (item.getPrice() > 0) {
             if (c.getPlayer().getMeso() >= (long) item.getPrice() * quantity) {
                 if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) {
-                    if (!ItemConstants.isRechargable(itemId)) { //Pets can't be bought from shops
+                    if (!ItemConstants.isRechargeable(itemId)) { //Pets can't be bought from shops
                         MapleInventoryManipulator.addById(c, itemId, quantity);          
                         c.getPlayer().gainMeso(-(item.getPrice() * quantity), false);
                     } else {
@@ -110,7 +110,7 @@ public class MapleShop {
         } else if (item.getPitch() > 0) {
             if (c.getPlayer().getInventory(MapleInventoryType.ETC).countById(4310000) >= (long) item.getPitch() * quantity) {
                 if (MapleInventoryManipulator.checkSpace(c, itemId, quantity, "")) {
-                    if (!ItemConstants.isRechargable(itemId)) {
+                    if (!ItemConstants.isRechargeable(itemId)) {
                         MapleInventoryManipulator.addById(c, itemId, quantity);
                         MapleInventoryManipulator.removeById(c, MapleInventoryType.ETC, 4310000, item.getPitch() * quantity, false, false);
                     } else {
@@ -149,6 +149,37 @@ public class MapleShop {
         }
     }
 
+    private static boolean canSell(Item item, short quantity) {
+        if (item == null) { //Basic check
+            return false;
+        }
+        
+        short iQuant = item.getQuantity();
+        if (iQuant == 0xFFFF) {
+            iQuant = 1;
+        } else if(iQuant < 0) {
+            return false;
+        }
+        
+        if (!ItemConstants.isRechargeable(item.getItemId())) {
+            if (iQuant == 0 || quantity > iQuant) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    private static short getSellingQuantity(Item item, short quantity) {
+        if (ItemConstants.isRechargeable(item.getItemId())) {
+            quantity = item.getQuantity();
+            if (quantity == 0xFFFF) {
+                quantity = 1;
+            }
+        }
+        
+        return quantity;
+    }
 
     public void sell(MapleClient c, MapleInventoryType type, short slot, short quantity) {
         if (quantity == 0xFFFF || quantity == 0) {
@@ -158,8 +189,8 @@ public class MapleShop {
         }
         
         Item item = c.getPlayer().getInventory(type).getItem((short) slot);
-        if(MapleItemInformationProvider.canSell(item, quantity)) {
-            quantity = MapleItemInformationProvider.getSellingQuantity(item, quantity);
+        if(canSell(item, quantity)) {
+            quantity = getSellingQuantity(item, quantity);
             MapleInventoryManipulator.removeFromSlot(c, type, (byte) slot, quantity, false);
             
             MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
@@ -168,13 +199,15 @@ public class MapleShop {
                 c.getPlayer().gainMeso(recvMesos, false);
             }
             c.announce(MaplePacketCreator.shopTransaction((byte) 0x8));
+        } else {
+            c.announce(MaplePacketCreator.shopTransaction((byte) 0x5));
         }
     }
 
     public void recharge(MapleClient c, short slot) {
         MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
         Item item = c.getPlayer().getInventory(MapleInventoryType.USE).getItem(slot);
-        if (item == null || !ItemConstants.isRechargable(item.getItemId())) {
+        if (item == null || !ItemConstants.isRechargeable(item.getItemId())) {
             return;
         }
         short slotMax = ii.getSlotMax(c, item.getItemId());
@@ -189,8 +222,7 @@ public class MapleShop {
                 c.getPlayer().gainMeso(-price, false, true, false);
                 c.announce(MaplePacketCreator.shopTransaction((byte) 0x8));
             } else {
-                c.announce(MaplePacketCreator.serverNotice(1, "You do not have enough mesos."));
-                c.announce(MaplePacketCreator.enableActions());
+                c.announce(MaplePacketCreator.shopTransaction((byte) 0x2));
             }
         }
     }
@@ -228,7 +260,7 @@ public class MapleShop {
             rs = ps.executeQuery();
             List<Integer> recharges = new ArrayList<>(rechargeableItems);
             while (rs.next()) {
-                if (ItemConstants.isRechargable(rs.getInt("itemid"))) {
+                if (ItemConstants.isRechargeable(rs.getInt("itemid"))) {
                     MapleShopItem starItem = new MapleShopItem((short) 1, rs.getInt("itemid"), rs.getInt("price"), rs.getInt("pitch"));
                     ret.addItem(starItem);
                     if (rechargeableItems.contains(starItem.getItemId())) {

src/server/MapleStorageInventory.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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
@@ -230,7 +230,7 @@ public class MapleStorageInventory {
             source.setPosition(dSlot);
             inventory.put(dSlot, source);
             inventory.remove(sSlot);
-        } else if (target.getItemId() == source.getItemId() && !ItemConstants.isRechargable(source.getItemId()) && !MapleItemInformationProvider.getInstance().isPickupRestricted(source.getItemId()) && isSameOwner(source, target)) {
+        } else if (target.getItemId() == source.getItemId() && !ItemConstants.isRechargeable(source.getItemId()) && !MapleItemInformationProvider.getInstance().isPickupRestricted(source.getItemId()) && isSameOwner(source, target)) {
             if (isEquipOrCash(source)) {
                 swap(target, source);
             } else if (source.getQuantity() + target.getQuantity() > slotMax) {

src/server/maps/MapleDoorObject.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/server/maps/MapleHiredMerchant.java

@@ -165,6 +165,37 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         }
     }
 
+    public void withdrawMesos(MapleCharacter chr) {
+        if (isOwner(chr)) {
+            synchronized (items) {
+                chr.withdrawMerchantMesos();
+            }
+        }
+    }
+    
+    public void takeItemBack(int slot, MapleCharacter chr) {
+        synchronized (items) {
+            MaplePlayerShopItem shopItem = items.get(slot);
+            if(shopItem.isExist()) {
+                if (shopItem.getBundles() > 0) {
+                    Item iitem = shopItem.getItem().copy();
+                    iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));
+                    
+                    if (!MapleInventory.checkSpot(chr, iitem)) {
+                        chr.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
+                        chr.announce(MaplePacketCreator.enableActions());
+                        return;
+                    }
+                    
+                    MapleInventoryManipulator.addFromDrop(chr.getClient(), iitem, true);
+                }
+                
+                removeFromSlot(slot);
+                chr.announce(MaplePacketCreator.updateHiredMerchant(this, chr));
+            }
+        }
+    }
+    
     private static boolean canBuy(MapleClient c, Item newItem) {
         return MapleInventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && MapleInventoryManipulator.addFromDrop(c, newItem, false);
     }
@@ -172,21 +203,19 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
     public void buy(MapleClient c, int item, short quantity) {
         synchronized (items) {
             MaplePlayerShopItem pItem = items.get(item);
-            
             Item newItem = pItem.getItem().copy();
+            
             newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity)));
-            if ((newItem.getFlag() & ItemConstants.KARMA) == ItemConstants.KARMA) {
-                newItem.setFlag((byte) (newItem.getFlag() ^ ItemConstants.KARMA));
-            }
-            if (quantity < 1 || pItem.getBundles() < 1 || !pItem.isExist() || pItem.getBundles() < quantity) {
+            if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) {
                 c.announce(MaplePacketCreator.enableActions());
                 return;
             } else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) {
                 c.announce(MaplePacketCreator.enableActions());
                 return;
-            } else if (!pItem.isExist()) {
-                c.announce(MaplePacketCreator.enableActions());
-                return;
+            }
+            
+            if ((newItem.getFlag() & ItemConstants.KARMA) == ItemConstants.KARMA) {
+                newItem.setFlag((byte) (newItem.getFlag() ^ ItemConstants.KARMA));
             }
             
             int price = (int) Math.min((long)pItem.getPrice() * quantity, Integer.MAX_VALUE);
@@ -196,7 +225,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
                     if(ServerConstants.USE_ANNOUNCE_SHOPITEMSOLD) announceItemSold(newItem, price);   // idea thanks to vcoc
                     
                     synchronized (sold) {
-                        sold.add(new SoldItem(c.getPlayer().getName(), pItem.getItem().getItemId(), quantity, price));
+                        sold.add(new SoldItem(c.getPlayer().getName(), pItem.getItem().getItemId(), newItem.getQuantity(), price));
                     }
                     
                     pItem.setBundles((short) (pItem.getBundles() - quantity));
@@ -224,7 +253,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
                     c.getPlayer().dropMessage(1, "Your inventory is full. Please clean a slot before buying this item.");
                 }
             } else {
-                c.getPlayer().dropMessage(1, "You do not have enough mesos.");
+                c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item.");
             }
             try {
                 this.saveItems(false);
@@ -388,10 +417,24 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
         }
     }
 
-    public void removeFromSlot(int slot) {
-        synchronized (items) {
-            items.remove(slot);
+    public void clearInexistentItems() {
+        synchronized(items) {
+            for (int i = items.size() - 1; i >= 0; i--) {
+                if (!items.get(i).isExist()) {
+                    items.remove(i);
+                }
+            }
+            
+            try {
+                this.saveItems(false);
+            } catch (SQLException ex) {
+                ex.printStackTrace();
+            }
         }
+    }
+    
+    private void removeFromSlot(int slot) {
+        items.remove(slot);
         
         try {
             this.saveItems(false);

src/server/maps/MapleMap.java

@@ -650,6 +650,7 @@ public class MapleMap {
         if (mob.dropsDisabled() || !dropsOn) {
             return;
         }
+        
         final byte droptype = (byte) (mob.getStats().isExplosiveReward() ? 3 : mob.getStats().isFfaLoot() ? 2 : chr.getParty() != null ? 1 : 0);
         final int mobpos = mob.getPosition().x;
         int chRate = chr.getDropRate();
@@ -793,7 +794,7 @@ public class MapleMap {
         
         objectWLock.lock();
         try {
-            if(!everlast) registerItemDrop(mdrop);
+            registerItemDrop(mdrop);
             registeredDrops.add(new WeakReference<>((MapleMapObject) mdrop));
         } finally {
             objectWLock.unlock();
@@ -803,13 +804,23 @@ public class MapleMap {
     }
     
     private void registerItemDrop(MapleMapItem mdrop) {
-        droppedItems.put(mdrop, System.currentTimeMillis() + ServerConstants.ITEM_EXPIRE_TIME);
+        droppedItems.put(mdrop, !everlast ? System.currentTimeMillis() + ServerConstants.ITEM_EXPIRE_TIME : Long.MAX_VALUE);
+    }
+    
+    private void unregisterItemDrop(MapleMapItem mdrop) {
+        objectWLock.lock();
+        try {
+            droppedItems.remove(mdrop);
+        } finally {
+            objectWLock.unlock();
+        }
     }
     
     private void makeDisappearExpiredItemDrops() {
-        objectWLock.lock();
+        List<MapleMapItem> toDisappear = new LinkedList<>();
+        
+        objectRLock.lock();
         try {
-            List<MapleMapItem> toDisappear = new LinkedList<>();
             long timeNow = System.currentTimeMillis();
             
             for(Entry<MapleMapItem, Long> it : droppedItems.entrySet()) {
@@ -817,9 +828,17 @@ public class MapleMap {
                     toDisappear.add(it.getKey());
                 }
             }
-            
+        } finally {
+            objectRLock.unlock();
+        }
+        
+        for(MapleMapItem mmi : toDisappear) {
+            makeDisappearItemFromMap(mmi);
+        }
+        
+        objectWLock.lock();
+        try {
             for(MapleMapItem mmi : toDisappear) {
-                makeDisappearItemFromMap(mmi);
                 droppedItems.remove(mmi);
             }
         } finally {
@@ -827,12 +846,64 @@ public class MapleMap {
         }
     }
     
-    public void pickItemDrop(byte[] pickupPacket, MapleMapItem mdrop) {
+    private List<MapleMapItem> getDroppedItems() {
+        objectRLock.lock();
+        try {
+            return new LinkedList<>(droppedItems.keySet());
+        } finally {
+            objectRLock.unlock();
+        }
+    }
+    
+    public void pickItemDrop(byte[] pickupPacket, MapleMapItem mdrop) { // mdrop must be already locked and not-pickedup checked by now
         broadcastMessage(pickupPacket, mdrop.getPosition());
         
         droppedItemCount.decrementAndGet();
         this.removeMapObject(mdrop);
         mdrop.setPickedUp(true);
+        unregisterItemDrop(mdrop);
+    }
+    
+    private static boolean shouldShowQuestItem(MapleCharacter chr, int questid, int itemid) {
+        return questid <= 0 || (chr.getQuestStatus(questid) == 1 && chr.needQuestItem(questid, itemid));
+    }
+    
+    public void updatePlayerItemDrops(int partyid, int charid, List<MapleCharacter> partyMembers, MapleCharacter partyLeaver) {
+        for(MapleMapItem mdrop : getDroppedItems()) {
+            if(mdrop.getOwnerId() == charid) {
+                mdrop.lockItem();
+                try {
+                    if(mdrop.isPickedUp()) return;
+                    
+                    mdrop.setPartyOwnerId(partyid);
+                    
+                    byte[] removePacket = MaplePacketCreator.silentRemoveItemFromMap(mdrop.getObjectId());
+                    byte[] updatePacket = MaplePacketCreator.updateMapItemObject(mdrop, partyLeaver == null);
+                    
+                    for(MapleCharacter mc : partyMembers) {
+                        if(this.equals(mc.getMap())) {
+                            mc.announce(removePacket);
+                            
+                            if(shouldShowQuestItem(mc, mdrop.getQuest(), mdrop.getItemId())) {
+                                mc.announce(updatePacket);
+                            }
+                        }
+                    }
+                    
+                    if(partyLeaver != null) {
+                        if(this.equals(partyLeaver.getMap())) {
+                            partyLeaver.announce(removePacket);
+                            
+                            if(shouldShowQuestItem(partyLeaver, mdrop.getQuest(), mdrop.getItemId())) {
+                                partyLeaver.announce(MaplePacketCreator.updateMapItemObject(mdrop, true));
+                            }
+                        }
+                    }
+                } finally {
+                    mdrop.unlockItem();
+                }
+            }
+        }
     }
     
     private void spawnDrop(final Item idrop, final Point dropPos, final MapleMapObject dropper, final MapleCharacter chr, final byte droptype, final short questid) {
@@ -841,8 +912,15 @@ public class MapleMap {
         spawnAndAddRangedMapObject(mdrop, new DelayedPacketCreation() {
             @Override
             public void sendPackets(MapleClient c) {
-                if (questid <= 0 || (c.getPlayer().getQuestStatus(questid) == 1 && c.getPlayer().needQuestItem(questid, idrop.getItemId()))) {
-                    c.announce(MaplePacketCreator.dropItemFromMapObject(mdrop, dropper.getPosition(), dropPos, (byte) 1));
+                MapleCharacter chr = c.getPlayer();
+                
+                if (shouldShowQuestItem(chr, questid, idrop.getItemId())) {
+                    mdrop.lockItem();
+                    try {
+                        c.announce(MaplePacketCreator.dropItemFromMapObject(chr.getParty() != null, mdrop, dropper.getPosition(), dropPos, (byte) 1));
+                    } finally {
+                        mdrop.unlockItem();
+                    }
                 }
             }
         }, null);
@@ -859,7 +937,12 @@ public class MapleMap {
         spawnAndAddRangedMapObject(mdrop, new DelayedPacketCreation() {
             @Override
             public void sendPackets(MapleClient c) {
-                c.announce(MaplePacketCreator.dropItemFromMapObject(mdrop, dropper.getPosition(), droppos, (byte) 1));
+                mdrop.lockItem();
+                try {
+                    c.announce(MaplePacketCreator.dropItemFromMapObject(c.getPlayer().getParty() != null, mdrop, dropper.getPosition(), droppos, (byte) 1));
+                } finally {
+                    mdrop.unlockItem();
+                }
             }
         }, null);
 
@@ -868,8 +951,14 @@ public class MapleMap {
 
     public final void disappearingItemDrop(final MapleMapObject dropper, final MapleCharacter owner, final Item item, final Point pos) {
         final Point droppos = calcDropPos(pos, pos);
-        final MapleMapItem drop = new MapleMapItem(item, droppos, dropper, owner, owner.getClient(), (byte) 1, false);
-        broadcastMessage(MaplePacketCreator.dropItemFromMapObject(drop, dropper.getPosition(), droppos, (byte) 3), drop.getPosition());
+        final MapleMapItem mdrop = new MapleMapItem(item, droppos, dropper, owner, owner.getClient(), (byte) 1, false);
+        
+        mdrop.lockItem();
+        try {
+            broadcastItemDropMessage(mdrop, dropper.getPosition(), droppos, (byte) 3, mdrop.getPosition());
+        } finally {
+            mdrop.unlockItem();
+        }
     }
 
     public MapleMonster getMonsterById(int id) {
@@ -1918,11 +2007,22 @@ public class MapleMap {
         spawnAndAddRangedMapObject(mdrop, new DelayedPacketCreation() {
             @Override
             public void sendPackets(MapleClient c) {
-                c.announce(MaplePacketCreator.dropItemFromMapObject(mdrop, dropper.getPosition(), droppos, (byte) 1));
+                mdrop.lockItem();
+                try {
+                    c.announce(MaplePacketCreator.dropItemFromMapObject(c.getPlayer().getParty() != null, mdrop, dropper.getPosition(), droppos, (byte) 1));
+                } finally {
+                    mdrop.unlockItem();
+                }
             }
         }, null);
-        broadcastMessage(MaplePacketCreator.dropItemFromMapObject(mdrop, dropper.getPosition(), droppos, (byte) 0));
-
+        
+        mdrop.lockItem();
+        try {
+            broadcastItemDropMessage(mdrop, dropper.getPosition(), droppos, (byte) 0);
+        } finally {
+            mdrop.unlockItem();
+        }
+        
         instantiateItemDrop(mdrop);
         activateItemReactors(mdrop, owner.getClient());
     }
@@ -1997,8 +2097,13 @@ public class MapleMap {
             objectRLock.lock();
             try {
                 for(MapleMapItem mmi : droppedItems.keySet()) {
-                    if(!mmi.isPickedUp()) {
-                        list.add(mmi);
+                    mmi.lockItem();
+                    try {
+                        if(!mmi.isPickedUp()) {
+                            list.add(mmi);
+                        }
+                    } finally {
+                        mmi.unlockItem();
                     }
                 }
             } finally {
@@ -2435,18 +2540,6 @@ public class MapleMap {
         }
     }
     
-    public void dropMessage(int type, String message) {
-        broadcastStringMessage(type, message);
-    }
-    
-    public void broadcastStringMessage(int type, String message) {
-        broadcastMessage(MaplePacketCreator.serverNotice(type, message));
-    }
-
-    public void broadcastBossHpMessage(MapleMonster mm, int bossHash, final byte[] packet) {
-        broadcastBossHpMessage(mm, bossHash, null, packet, Double.POSITIVE_INFINITY, null);
-    }
-    
     public void broadcastMessage(final byte[] packet) {
         broadcastMessage(null, packet, Double.POSITIVE_INFINITY, null);
     }
@@ -2488,10 +2581,6 @@ public class MapleMap {
         broadcastMessage(null, packet, getRangedDistance(), rangedFrom);
     }
     
-    public void broadcastBossHpMessage(MapleMonster mm, int bossHash, final byte[] packet, Point rangedFrom) {
-        broadcastBossHpMessage(mm, bossHash, null, packet, getRangedDistance(), rangedFrom);
-    }
-
     /**
      * Always ranged from point. Does not repeat to source.
      *
@@ -2522,6 +2611,14 @@ public class MapleMap {
         }
     }
     
+    public void broadcastBossHpMessage(MapleMonster mm, int bossHash, final byte[] packet) {
+        broadcastBossHpMessage(mm, bossHash, null, packet, Double.POSITIVE_INFINITY, null);
+    }
+    
+    public void broadcastBossHpMessage(MapleMonster mm, int bossHash, final byte[] packet, Point rangedFrom) {
+        broadcastBossHpMessage(mm, bossHash, null, packet, getRangedDistance(), rangedFrom);
+    }
+    
     private void broadcastBossHpMessage(MapleMonster mm, int bossHash, MapleCharacter source, final byte[] packet, double rangeSq, Point rangedFrom) {
         chrRLock.lock();
         try {
@@ -2541,6 +2638,41 @@ public class MapleMap {
         }
     }
 
+    private void broadcastItemDropMessage(MapleMapItem mdrop, Point dropperPos, Point dropPos, byte mod, Point rangedFrom) {
+        broadcastItemDropMessage(mdrop, dropperPos, dropPos, mod, getRangedDistance(), rangedFrom);
+    }
+    
+    private void broadcastItemDropMessage(MapleMapItem mdrop, Point dropperPos, Point dropPos, byte mod) {
+        broadcastItemDropMessage(mdrop, dropperPos, dropPos, mod, Double.POSITIVE_INFINITY, null);
+    }
+    
+    private void broadcastItemDropMessage(MapleMapItem mdrop, Point dropperPos, Point dropPos, byte mod, double rangeSq, Point rangedFrom) {
+        chrRLock.lock();
+        try {
+            for (MapleCharacter chr : characters) {
+                final byte[] packet = MaplePacketCreator.dropItemFromMapObject(chr.getParty() != null, mdrop, dropperPos, dropPos, mod);
+                
+                if (rangeSq < Double.POSITIVE_INFINITY) {
+                    if (rangedFrom.distanceSq(chr.getPosition()) <= rangeSq) {
+                        chr.announce(packet);
+                    }
+                } else {
+                    chr.announce(packet);
+                }
+            }
+        } finally {
+            chrRLock.unlock();
+        }
+    }
+    
+    public void dropMessage(int type, String message) {
+        broadcastStringMessage(type, message);
+    }
+    
+    public void broadcastStringMessage(int type, String message) {
+        broadcastMessage(MaplePacketCreator.serverNotice(type, message));
+    }
+    
     private boolean isNonRangedType(MapleMapObjectType type) {
         switch (type) {
             case NPC:
@@ -2982,6 +3114,7 @@ public class MapleMap {
                                 return;
                             }
                             mapitem.setPickedUp(true);
+                            unregisterItemDrop(mapitem);
 
                             reactor.setShouldCollect(false);
                             MapleMap.this.broadcastMessage(MaplePacketCreator.removeItemFromMap(mapitem.getObjectId(), 0, 0), mapitem.getPosition());

src/server/maps/MapleMapItem.java

@@ -97,8 +97,24 @@ public class MapleMapItem extends AbstractMapleMapObject {
 	return character_ownerid;
     }
     
+    public final int getPartyOwnerId() {
+        return party_ownerid;
+    }
+    
+    public final void setPartyOwnerId(int partyid) {
+        party_ownerid = partyid;
+    }
+    
+    public final boolean isFFADrop() {
+        return type == 2 || type == 3 || hasExpiredOwnershipTime();
+    }
+    
+    public final boolean hasExpiredOwnershipTime() {
+        return System.currentTimeMillis() - dropTime >= 15 * 1000;
+    }
+    
     public final boolean canBePickedBy(MapleCharacter chr) {
-        if (character_ownerid <= 0) return true;
+        if (character_ownerid <= 0 || isFFADrop()) return true;
         
         if (party_ownerid == -1) {
             if (chr.getId() == character_ownerid) {
@@ -116,7 +132,7 @@ public class MapleMapItem extends AbstractMapleMapObject {
             }
         }
         
-        return System.currentTimeMillis() - dropTime >= 15 * 1000;
+        return hasExpiredOwnershipTime();
     }
     
     public final MapleClient getOwnerClient() {
@@ -166,8 +182,15 @@ public class MapleMapItem extends AbstractMapleMapObject {
 
     @Override
     public void sendSpawnData(final MapleClient client) {
-	if (questid <= 0 || (client.getPlayer().getQuestStatus(questid) == 1 && client.getPlayer().needQuestItem(questid, item.getItemId()))) {
-	    client.announce(MaplePacketCreator.dropItemFromMapObject(this, null, getPosition(), (byte) 2));
+        MapleCharacter chr = client.getPlayer();
+        
+	if (questid <= 0 || (chr.getQuestStatus(questid) == 1 && chr.needQuestItem(questid, item.getItemId()))) {
+	    this.lockItem();
+            try {
+                client.announce(MaplePacketCreator.dropItemFromMapObject(chr.getParty() != null, this, null, getPosition(), (byte) 2));
+            } finally {
+                this.unlockItem();
+            }
 	}
     }
 

src/server/maps/MapleMiniDungeon.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/server/maps/MaplePlayerShop.java

@@ -24,7 +24,9 @@ package server.maps;
 import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.Item;
+import client.inventory.MapleInventory;
 import client.inventory.MapleInventoryType;
+import constants.ItemConstants;
 import constants.ServerConstants;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -53,6 +55,7 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
     private MapleCharacter owner;
     private MapleCharacter[] visitors = new MapleCharacter[3];
     private List<MaplePlayerShopItem> items = new ArrayList<>();
+    private List<SoldItem> sold = new LinkedList<>();
     private String description;
     private int boughtnumber = 0;
     private List<String> bannedList = new ArrayList<>();
@@ -182,16 +185,37 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
         }
     }
 
-    public void removeItem(int item) {
-        synchronized (items) {
-            items.remove(item);
-        }
+    private void removeFromSlot(int slot) {
+        items.remove(slot);
     }
 
     private static boolean canBuy(MapleClient c, Item newItem) {
         return MapleInventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && MapleInventoryManipulator.addFromDrop(c, newItem, false);
     }
     
+    public void takeItemBack(int slot, MapleCharacter chr) {
+        synchronized (items) {
+            MaplePlayerShopItem shopItem = items.get(slot);
+            if(shopItem.isExist()) {
+                if (shopItem.getBundles() > 0) {
+                    Item iitem = shopItem.getItem().copy();
+                    iitem.setQuantity((short) (shopItem.getItem().getQuantity() * shopItem.getBundles()));
+                    
+                    if (!MapleInventory.checkSpot(chr, iitem)) {
+                        chr.announce(MaplePacketCreator.serverNotice(1, "Have a slot available on your inventory to claim back the item."));
+                        chr.announce(MaplePacketCreator.enableActions());
+                        return;
+                    }
+                    
+                    MapleInventoryManipulator.addFromDrop(chr.getClient(), iitem, true);
+                }
+                
+                removeFromSlot(slot);
+                chr.announce(MaplePacketCreator.getPlayerShopItemUpdate(this));
+            }
+        }
+    }
+    
     /**
      * no warnings for now o.o
      * @param c
@@ -203,13 +227,22 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
             if (isVisitor(c.getPlayer())) {
                 MaplePlayerShopItem pItem = items.get(item);
                 Item newItem = pItem.getItem().copy();
-                newItem.setQuantity(newItem.getQuantity());
-                if (quantity < 1 || pItem.getBundles() < 1 || newItem.getQuantity() > pItem.getBundles() || !pItem.isExist()) {
+                
+                newItem.setQuantity((short) ((pItem.getItem().getQuantity() * quantity)));
+                if (quantity < 1 || !pItem.isExist() || pItem.getBundles() < quantity) {
+                    c.announce(MaplePacketCreator.enableActions());
                     return;
                 } else if (newItem.getInventoryType().equals(MapleInventoryType.EQUIP) && newItem.getQuantity() > 1) {
+                    c.announce(MaplePacketCreator.enableActions());
                     return;
                 }
-                synchronized (c.getPlayer()) {
+                
+                if ((newItem.getFlag() & ItemConstants.KARMA) == ItemConstants.KARMA) {
+                    newItem.setFlag((byte) (newItem.getFlag() ^ ItemConstants.KARMA));
+                }
+                
+                visitorLock.lock();
+                try {
                     int price = (int) Math.min((long)pItem.getPrice() * quantity, Integer.MAX_VALUE);
                     
                     if (c.getPlayer().getMeso() >= price) {
@@ -219,6 +252,13 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
                             if(ServerConstants.USE_ANNOUNCE_SHOPITEMSOLD) announceItemSold(newItem, price);   // idea thanks to vcoc
                             owner.gainMeso(price, true);
                             
+                            SoldItem soldItem = new SoldItem(c.getPlayer().getName(), pItem.getItem().getItemId(), quantity, price);
+                            owner.announce(MaplePacketCreator.getPlayerShopOwnerUpdate(soldItem, item));
+                            
+                            synchronized (sold) {
+                                sold.add(soldItem);
+                            }
+                            
                             pItem.setBundles((short) (pItem.getBundles() - quantity));
                             if (pItem.getBundles() < 1) {
                                 pItem.setDoesExist(false);
@@ -232,7 +272,11 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
                         } else {
                             c.getPlayer().dropMessage(1, "Your inventory is full. Please clean a slot before buying this item.");
                         }
+                    } else {
+                        c.getPlayer().dropMessage(1, "You don't have enough mesos to purchase this item.");
                     }
+                } finally {
+                    visitorLock.unlock();
                 }
             }
         }
@@ -489,6 +533,12 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
         }
         return list;
     }
+    
+    public List<SoldItem> getSold() {
+        synchronized (sold) {
+            return Collections.unmodifiableList(sold);
+        }
+    }
 
     @Override
     public void sendDestroyData(MapleClient client) {
@@ -504,4 +554,34 @@ public class MaplePlayerShop extends AbstractMapleMapObject {
     public MapleMapObjectType getType() {
         return MapleMapObjectType.SHOP;
     }
+    
+    public class SoldItem {
+
+        int itemid, mesos;
+        short quantity;
+        String buyer;
+
+        public SoldItem(String buyer, int itemid, short quantity, int mesos) {
+            this.buyer = buyer;
+            this.itemid = itemid;
+            this.quantity = quantity;
+            this.mesos = mesos;
+        }
+
+        public String getBuyer() {
+            return buyer;
+        }
+
+        public int getItemId() {
+            return itemid;
+        }
+
+        public short getQuantity() {
+            return quantity;
+        }
+
+        public int getMesos() {
+            return mesos;
+        }
+    }
 }

src/server/quest/MapleQuestRequirementType.java

@@ -78,8 +78,8 @@ public enum MapleQuestRequirementType {
             return COMPLETED_QUEST;
 	} else if(name.equals("start")) {
             return START;
-	} else if(name.equals("end")) {
-            return END;
+	/*} else if(name.equals("end")) {   already coded
+            return END;*/
 	} else if(name.equals("daybyday")) {
             return DAY_BY_DAY;
         } else if (name.equals("money")) {

src/server/quest/requirements/BuffExceptRequirement.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/server/quest/requirements/BuffRequirement.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/server/quest/requirements/ItemRequirement.java

@@ -74,7 +74,7 @@ public class ItemRequirement extends MapleQuestRequirement {
 				count += item.getQuantity();
 			}
 			//Weird stuff, nexon made some quests only available when wearing gm clothes. This enables us to accept it ><
-			if (iType.equals(MapleInventoryType.EQUIP)) {
+			if (iType.equals(MapleInventoryType.EQUIP) && !ItemConstants.isMedal(itemId)) {
                                 if(chr.isGM()) {
                                         for (Item item : chr.getInventory(MapleInventoryType.EQUIPPED).listById(itemId)) {
                                                 count += item.getQuantity();

src/server/quest/requirements/MesoRequirement.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/tools/MaplePacketCreator.java

@@ -400,7 +400,7 @@ public class MaplePacketCreator {
                         mplew.writeMapleAsciiString(item.getOwner());
                         mplew.writeShort(item.getFlag()); // flag
 
-                        if (ItemConstants.isRechargable(item.getItemId())) {
+                        if (ItemConstants.isRechargeable(item.getItemId())) {
                                 mplew.writeInt(2);
                                 mplew.write(new byte[]{(byte) 0x54, 0, 0, (byte) 0x34});
                         }
@@ -1738,18 +1738,37 @@ public class MaplePacketCreator {
                 mplew.write(animation);
                 return mplew.getPacket();
         }
+        
+        public static byte[] updateMapItemObject(MapleMapItem drop, boolean giveOwnership) {
+                final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+                mplew.writeShort(SendOpcode.DROP_ITEM_FROM_MAPOBJECT.getValue());
+                mplew.write(2);
+                mplew.writeInt(drop.getObjectId());
+                mplew.writeBool(drop.getMeso() > 0);
+                mplew.writeInt(drop.getItemId());
+                mplew.writeInt(giveOwnership ? 0 : -1);
+                mplew.write(drop.getDropType());
+                mplew.writePos(drop.getPosition());
+                mplew.writeInt(giveOwnership ? 0 : -1);
 
-        public static byte[] dropItemFromMapObject(MapleMapItem drop, Point dropfrom, Point dropto, byte mod) {
+                if (drop.getMeso() == 0) {
+                        addExpirationTime(mplew, drop.getItem().getExpiration());
+                }
+                mplew.write(drop.isPlayerDrop() ? 0 : 1);
+                return mplew.getPacket();
+        }
+
+        public static byte[] dropItemFromMapObject(boolean recvrInParty, MapleMapItem drop, Point dropfrom, Point dropto, byte mod) {
                 final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
                 mplew.writeShort(SendOpcode.DROP_ITEM_FROM_MAPOBJECT.getValue());
                 mplew.write(mod);
                 mplew.writeInt(drop.getObjectId());
                 mplew.writeBool(drop.getMeso() > 0); // 1 mesos, 0 item, 2 and above all item meso bag,
                 mplew.writeInt(drop.getItemId()); // drop object ID
-                mplew.writeInt(drop.getOwnerId()); // owner charid/partyid :)
+                mplew.writeInt(!drop.isFFADrop() ? (recvrInParty ? drop.getPartyOwnerId() : drop.getOwnerId()) : 0); // owner charid/partyid :)
                 mplew.write(drop.getDropType()); // 0 = timeout for non-owner, 1 = timeout for non-owner's party, 2 = FFA, 3 = explosive/FFA
                 mplew.writePos(dropto);
-                mplew.writeInt(drop.getDropType() == 0 ? drop.getOwnerId() : 0); //test
+                mplew.writeInt(!drop.isFFADrop() ? drop.getOwnerId() : 0); // owner charid
 
                 if (mod != 2) {
                         mplew.writePos(dropfrom);
@@ -1761,7 +1780,7 @@ public class MaplePacketCreator {
                 mplew.write(drop.isPlayerDrop() ? 0 : 1); //pet EQP pickup
                 return mplew.getPacket();
         }
-
+        
         /**
          * Gets a packet spawning a player as a mapobject to other clients.
          *
@@ -2273,7 +2292,7 @@ public class MaplePacketCreator {
                         mplew.writeInt(item.getPrice() == 0 ? item.getPitch() : 0); //Perfect Pitch
                         mplew.writeInt(0); //Can be used x minutes after purchase
                         mplew.writeInt(0); //Hmm
-                        if (!ItemConstants.isRechargable(item.getItemId())) {
+                        if (!ItemConstants.isRechargeable(item.getItemId())) {
                                 mplew.writeShort(1); // stacksize o.o
                                 mplew.writeShort(item.getBuyable());
                         } else {
@@ -2383,6 +2402,10 @@ public class MaplePacketCreator {
                 return mplew.getPacket();
         }
 
+        public static byte[] silentRemoveItemFromMap(int oid) {
+                return removeItemFromMap(oid, 1, 0);
+        }
+        
         /**
          * animation: 0 - expire<br/> 1 - without animation<br/> 2 - pickup<br/> 4 -
          * explode<br/> cid is ignored for 0 and 1
@@ -3020,7 +3043,18 @@ public class MaplePacketCreator {
                 }
                 return mplew.getPacket();
         }
-
+        
+        public static byte[] getPlayerShopOwnerUpdate(MaplePlayerShop.SoldItem item, int position) {
+                final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
+                mplew.writeShort(SendOpcode.PLAYER_INTERACTION.getValue());
+                mplew.write(PlayerInteractionHandler.Action.UPDATE_PLAYERSHOP.getCode());
+                mplew.write(position);
+                mplew.writeShort(item.getQuantity());
+                mplew.writeMapleAsciiString(item.getBuyer());
+                
+                return mplew.getPacket();
+        }
+        
         /**
          *
          * @param c
@@ -3035,7 +3069,20 @@ public class MaplePacketCreator {
                 mplew.write(4);
                 mplew.write(4);
                 mplew.write(owner ? 0 : 1);
-                mplew.write(0);
+                
+                if (owner) {
+                        List<MaplePlayerShop.SoldItem> sold = shop.getSold();
+                        mplew.write(sold.size());
+                        for (MaplePlayerShop.SoldItem s : sold) {
+                                mplew.writeInt(s.getItemId());
+                                mplew.writeShort(s.getQuantity());
+                                mplew.writeInt(s.getMesos());
+                                mplew.writeMapleAsciiString(s.getBuyer());
+                        }
+                } else {
+                        mplew.write(0);
+                }
+                
                 addCharLook(mplew, shop.getOwner(), false);
                 mplew.writeMapleAsciiString(shop.getOwner().getName());
                 
@@ -3051,7 +3098,7 @@ public class MaplePacketCreator {
                 mplew.write(0xFF);
                 mplew.writeMapleAsciiString(shop.getDescription());
                 List<MaplePlayerShopItem> items = shop.getItems();
-                mplew.write(0x10);
+                mplew.write(0x10);  //TODO SLOTS, which is 16 for most stores...slotMax
                 mplew.write(items.size());
                 for (MaplePlayerShopItem item : items) {
                         mplew.writeShort(item.getBundles());
@@ -3518,12 +3565,11 @@ public class MaplePacketCreator {
                 return mplew.getPacket();
         }
 
-        public static byte[] partyCreated(MaplePartyCharacter partychar) {
+        public static byte[] partyCreated(MaplePartyCharacter partychar, int partyId) {
                 final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
                 mplew.writeShort(SendOpcode.PARTY_OPERATION.getValue());
                 mplew.write(8);
-                mplew.writeShort(0x8b);
-                mplew.writeShort(1);
+                mplew.writeInt(partyId);
                 if (partychar.getDoors().size() > 0) {
                         boolean deployedPortal = false;
                     
@@ -3674,7 +3720,7 @@ public class MaplePacketCreator {
                 case EXPEL:
                 case LEAVE:
                         mplew.write(0x0C);
-                        mplew.writeInt(40546);
+                        mplew.writeInt(party.getId());
                         mplew.writeInt(target.getId());
                         if (op == PartyOperation.DISBAND) {
                                 mplew.write(0);
@@ -3692,7 +3738,7 @@ public class MaplePacketCreator {
                         break;
                 case JOIN:
                         mplew.write(0xF);
-                        mplew.writeInt(40546);
+                        mplew.writeInt(party.getId());
                         mplew.writeMapleAsciiString(target.getName());
                         addPartyStatus(forChannel, party, mplew, false);
                         break;
@@ -5365,19 +5411,19 @@ public class MaplePacketCreator {
                 if (hm.isOwner(chr)) {
                         mplew.writeInt(hm.getTimeLeft());
                         mplew.write(firstTime ? 1 : 0);
-                        //List<SoldItem> sold = hm.getSold();
-                        mplew.write(0);//sold.size()
-                        /*for (SoldItem s : sold) { fix this
-                     mplew.writeInt(s.getItemId());
-                     mplew.writeShort(s.getQuantity());
-                     mplew.writeInt(s.getMesos());
-                     mplew.writeMapleAsciiString(s.getBuyer());
-                     }*/
+                        List<MapleHiredMerchant.SoldItem> sold = hm.getSold();
+                        mplew.write(sold.size());
+                        for (MapleHiredMerchant.SoldItem s : sold) {
+                                mplew.writeInt(s.getItemId());
+                                mplew.writeShort(s.getQuantity());
+                                mplew.writeInt(s.getMesos());
+                                mplew.writeMapleAsciiString(s.getBuyer());
+                        }
                         mplew.writeInt(chr.getMerchantMeso());//:D?
                 }
                 mplew.writeMapleAsciiString(hm.getDescription());
                 mplew.write(0x10); //TODO SLOTS, which is 16 for most stores...slotMax
-                mplew.writeInt(chr.getMeso());
+                mplew.writeInt(hm.isOwner(chr) ? chr.getMerchantMeso() : chr.getMeso());
                 mplew.write(hm.getItems().size());
                 if (hm.getItems().isEmpty()) {
                         mplew.write(0);//Hmm??
@@ -5396,7 +5442,7 @@ public class MaplePacketCreator {
                 final MaplePacketLittleEndianWriter mplew = new MaplePacketLittleEndianWriter();
                 mplew.writeShort(SendOpcode.PLAYER_INTERACTION.getValue());
                 mplew.write(PlayerInteractionHandler.Action.UPDATE_MERCHANT.getCode());
-                mplew.writeInt(chr.getMeso());
+                mplew.writeInt(hm.isOwner(chr) ? chr.getMerchantMeso() : chr.getMeso());
                 mplew.write(hm.getItems().size());
                 for (MaplePlayerShopItem item : hm.getItems()) {
                         mplew.writeShort(item.getBundles());

src/tools/locks/MonitoredLockType.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/tools/locks/MonitoredReadLock.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/tools/locks/MonitoredReentrantLock.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/tools/locks/MonitoredReentrantReadWriteLock.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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

src/tools/locks/MonitoredWriteLock.java

@@ -1,6 +1,6 @@
 /*
-    This file is part of the HeavenMS (MapleSolaxiaV2) MapleStory Server
-    Copyleft (L) 2017 RonanLana
+    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