Stuff

Index: C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/UseItem.java===================================================================--- C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/UseItem.java	(revision 2235)+++ C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/UseItem.java	(working copy)@@ -23,13 +23,13 @@ import java.util.logging.Logger;  import javolution.util.FastList;- import net.sf.l2j.Config; import net.sf.l2j.gameserver.ClientThread; import net.sf.l2j.gameserver.handler.IItemHandler; import net.sf.l2j.gameserver.handler.ItemHandler; import net.sf.l2j.gameserver.model.L2ItemInstance; import net.sf.l2j.gameserver.model.L2PcInstance;+import net.sf.l2j.gameserver.serverpackets.ActionFailed; import net.sf.l2j.gameserver.serverpackets.InventoryUpdate; import net.sf.l2j.gameserver.serverpackets.ShowCalculator; import net.sf.l2j.gameserver.serverpackets.SystemMessage;@@ -63,6 +63,13 @@ 		if (activeChar == null) 			return;         +        if(activeChar.getPrivateStoreType() != 0)+        {+            activeChar.sendPacket(new SystemMessage(SystemMessage.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE));+            activeChar.sendPacket(new ActionFailed());+            return;+        }+         		synchronized (activeChar.getInventory()) 		{ 		    L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);Index: C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/Inventory.java===================================================================--- C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/Inventory.java	(revision 2235)+++ C:/eclipse/workspace/L2_GameServer/java/net/sf/l2j/gameserver/model/Inventory.java	(working copy)@@ -25,7 +25,6 @@ import java.util.logging.Logger;  import javolution.util.FastList;- import net.sf.l2j.Config; import net.sf.l2j.L2DatabaseFactory; import net.sf.l2j.gameserver.ItemTable;@@ -510,6 +509,9 @@ 	 */     public L2ItemInstance[] equipItemAndRecord(L2ItemInstance item)     {+        if(((L2PcInstance)getOwner()).getPrivateStoreType() != 0)+            return null;+ 		Inventory.ChangeRecorder recorder = newRecorder();  		try 		{@@ -526,6 +528,9 @@ 	 */ 	public synchronized void equipItem(L2ItemInstance item) 	{+        if(((L2PcInstance)getOwner()).getPrivateStoreType() != 0)+            return;+ 		int targetSlot = item.getItem().getBodyPart(); 		switch (targetSlot) 		{