Fixed chair exploit & beholder issue + Mini-dungeon revamp

Fixed an (quite amusing) exploit with map chairs stacking "extra healing" schedules on certain conditions. Fixed mini-dungeon not disposing players properly in some cases. Refactored the mini-dungeon structure. Fixed an issue on CASH inventory merging same items when trying to swap them. Fixed Beholder crash issue when trying to enter Cash Shop.
2017-10-16 15:13:42 -02:00
parent 1ec7487bd3
commit 57c29603d1
96 changed files with 632 additions and 434 deletions
--- a/src/net/server/channel/handlers/InventoryMergeHandler.java
+++ b/src/net/server/channel/handlers/InventoryMergeHandler.java
@@ -0,0 +1,99 @@
+/*
+ This file is part of the OdinMS Maple Story Server
+ Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+ Matthias Butz <matze@odinms.de>
+ Jan Christian Meyer <vimes@odinms.de>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as
+ published by the Free Software Foundation version 3 as published by
+ the Free Software Foundation. You may not use, modify or distribute
+ this program under any other version of the GNU Affero General Public
+ License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.server.channel.handlers;
+
+import constants.ServerConstants;
+import net.AbstractMaplePacketHandler;
+import server.MapleInventoryManipulator;
+import tools.MaplePacketCreator;
+import tools.data.input.SeekableLittleEndianAccessor;
+import client.MapleCharacter;
+import client.MapleClient;
+import client.inventory.Item;
+import client.inventory.MapleInventory;
+import client.inventory.MapleInventoryType;
+import server.MapleItemInformationProvider;
+
+public final class InventoryMergeHandler extends AbstractMaplePacketHandler {
+
+    @Override
+    public final void handlePacket(SeekableLittleEndianAccessor slea, MapleClient c) {
+        MapleCharacter chr = c.getPlayer();
+        chr.getAutobanManager().setTimestamp(2, slea.readInt(), 3);
+        MapleInventoryType inventoryType = MapleInventoryType.getByType(slea.readByte());
+                
+	if(!ServerConstants.USE_ITEM_SORT) {
+            c.announce(MaplePacketCreator.enableActions());
+            return;
+	}
+		
+	MapleInventory inventory = c.getPlayer().getInventory(inventoryType);
+        
+        //------------------- RonanLana's SLOT MERGER -----------------
+        
+        MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+        Item srcItem, dstItem;
+
+        for(short dst = 1; dst <= inventory.getSlotLimit(); dst++) {
+            dstItem = inventory.getItem(dst);
+            if(dstItem == null) continue;
+
+            for(short src = (short)(dst + 1); src <= inventory.getSlotLimit(); src++) {
+                srcItem = inventory.getItem(src);
+                if(srcItem == null) continue;
+
+                if(dstItem.getItemId() != srcItem.getItemId()) continue;
+                if(dstItem.getQuantity() == ii.getSlotMax(c, inventory.getItem(dst).getItemId())) break;
+
+                MapleInventoryManipulator.move(c, inventoryType, src, dst);
+            }
+        }
+        
+        //------------------------------------------------------------
+                
+        inventory = c.getPlayer().getInventory(inventoryType);
+        boolean sorted = false;
+
+        while (!sorted) {
+            short freeSlot = inventory.getNextFreeSlot();
+
+            if (freeSlot != -1) {
+                short itemSlot = -1;
+                for (short i = (short) (freeSlot + 1); i <= inventory.getSlotLimit(); i = (short) (i + 1)) {
+                    if (inventory.getItem(i) != null) {
+                        itemSlot = i;
+                        break;
+                    }
+                }
+                if (itemSlot > 0) {
+                    MapleInventoryManipulator.move(c, inventoryType,  itemSlot, freeSlot);
+                } else {
+                    sorted = true;
+                }
+            } else {
+                sorted = true;
+            }
+        }
+        c.announce(MaplePacketCreator.finishedSort(inventoryType.getType()));
+        c.announce(MaplePacketCreator.enableActions());
+    }
+}