From 89eca2995b1b6bbfe07eb923e257000bab6c5f17 Mon Sep 17 00:00:00 2001 From: ronancpl Date: Sun, 26 May 2019 16:36:32 -0300 Subject: [PATCH] Minor patch Fixed a glitch in inventory when storing items. Fixed leaked test code throwing issues in merchant's buy action. --- src/client/processor/StorageProcessor.java | 2 ++ src/server/maps/MapleHiredMerchant.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/client/processor/StorageProcessor.java b/src/client/processor/StorageProcessor.java index 59672063b9..b2f5f4aa0e 100644 --- a/src/client/processor/StorageProcessor.java +++ b/src/client/processor/StorageProcessor.java @@ -139,6 +139,8 @@ public class StorageProcessor { c.announce(MaplePacketCreator.enableActions()); return; } + + item = item.copy(); // thanks Robin Schulz & BHB88 for noticing a inventory glitch when storing items } finally { inv.unlockInventory(); } diff --git a/src/server/maps/MapleHiredMerchant.java b/src/server/maps/MapleHiredMerchant.java index f8e5a89f2c..f5a78bab01 100644 --- a/src/server/maps/MapleHiredMerchant.java +++ b/src/server/maps/MapleHiredMerchant.java @@ -238,8 +238,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject { } } - private static boolean canBuy(MapleClient c, Item newItem) { - System.out.println(newItem.getPet().getName()); + private static boolean canBuy(MapleClient c, Item newItem) { // thanks xiaokelvin for noticing a leaked test code here return MapleInventoryManipulator.checkSpace(c, newItem.getItemId(), newItem.getQuantity(), newItem.getOwner()) && MapleInventoryManipulator.addFromDrop(c, newItem, false); }