Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestCrystallizeItem.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestCrystallizeItem.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestCrystallizeItem.java (working copy) @@ -68,6 +68,12 @@ return; } + if (activeChar.getPrivateStoreType() != 0) + { + activeChar.sendPacket(new SystemMessage(SystemMessage.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE)); + return; + } + int skillLevel = activeChar.getSkillLevel(L2Skill.SKILL_CRYSTALLIZE); if (skillLevel <= 0) { Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRestart.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRestart.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRestart.java (working copy) @@ -57,6 +57,14 @@ { return; } + + if (player.getPrivateStoreType() != 0) + { + player.sendMessage("Cannot restart while trading"); + return; + } + + if(GameTimeController.getGameTicks() - player.getAttackEndTime() < 15 * GameTimeController.TICKS_PER_SECOND || player.isAttacked()) { _log.fine("Player " + player.getName() + " tried to logout while fighting"); Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestGiveItemToPet.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestGiveItemToPet.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestGiveItemToPet.java (working copy) @@ -62,6 +62,13 @@ return; } + if (player.getPrivateStoreType() != 0) + { + player.sendMessage("Cannot exchange items while trading"); + return; + } + + PetInventory petInventory = pet.getInventory(); PcInventory playerInventory = player.getInventory(); Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRecipeItemMakeSelf.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRecipeItemMakeSelf.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRecipeItemMakeSelf.java (working copy) @@ -51,6 +51,13 @@ void runImpl() { L2PcInstance activeChar = getClient().getActiveChar(); + + if (activeChar.getPrivateStoreType() != 0) + { + activeChar.sendMessage("Cannot make items while trading"); + return; + } + RecipeController.getInstance().requestMakeItem(activeChar, _id); } Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRecipeBookOpen.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRecipeBookOpen.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestRecipeBookOpen.java (working copy) @@ -41,6 +41,11 @@ void runImpl() { + if (getClient().getActiveChar().getPrivateStoreType() != 0) + { + getClient().getActiveChar().sendMessage("Cannot use recipe book while trading"); + return; + } RecipeController.getInstance().requestBookOpen(getClient().getActiveChar()); } Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestActionUse.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestActionUse.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestActionUse.java (working copy) @@ -305,6 +305,13 @@ { L2PcInstance activeChar = getClient().getActiveChar(); L2Summon pet = activeChar.getPet(); + + if (activeChar.getPrivateStoreType() != 0) + { + activeChar.sendMessage("Cannot use skills while trading"); + return; + } + if (target != null && pet != null && pet != target) { L2Skill skill; @@ -343,6 +350,13 @@ { L2PcInstance activeChar = getClient().getActiveChar(); L2Object target = activeChar.getTarget(); + + if (activeChar.getPrivateStoreType() != 0) + { + activeChar.sendMessage("Cannot use skills while trading"); + return; + } + if (activeChar != target) { if (target.isAutoAttackable(activeChar) || _ctrlPressed) Index: C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestEnchantItem.java =================================================================== --- C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestEnchantItem.java (revision 1119) +++ C:/eclipse-31m7/workspace/L2_GameServer/java/net/sf/l2j/gameserver/clientpackets/RequestEnchantItem.java (working copy) @@ -43,6 +43,14 @@ L2PcInstance activeChar = getClient().getActiveChar(); L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId); L2ItemInstance scroll = activeChar.getEnchantScroll(); + + if (activeChar.getPrivateStoreType() != 0) + { + activeChar.sendMessage("Cannot enchant items while trading"); + return; + } + + if (item == null || activeChar.getEnchantScroll() == null) { return;