Index: java/net/sf/l2j/gameserver/model/Inventory.java =================================================================== --- java/net/sf/l2j/gameserver/model/Inventory.java (revision 2063) +++ java/net/sf/l2j/gameserver/model/Inventory.java (working copy) @@ -296,7 +296,8 @@ protected void addItem(L2ItemInstance item) { super.addItem(item); - if (item.isEquipped()) equipItem(item); + if (item.isEquipped()) + equipItem(item); } /** @@ -533,6 +534,15 @@ { if((getOwner() instanceof L2PcInstance) && ((L2PcInstance)getOwner()).getPrivateStoreType() != 0) return; + + if((getOwner() instanceof L2PcInstance) && !((L2PcInstance)getOwner()).isHero()) + { + int itemId = item.getItemId(); + if ((itemId >= 6611 && itemId <= 6621) || itemId == 6842) + { + return; + } + } int targetSlot = item.getItem().getBodyPart(); @@ -746,6 +756,15 @@ int objectId = inv.getInt(1); item = L2ItemInstance.restoreFromDb(objectId); if (item == null) continue; + + if((getOwner() instanceof L2PcInstance) && !(((L2PcInstance)getOwner()).isHero())) + { + int itemId = item.getItemId(); + if ((itemId >= 6611 && itemId <= 6621) || itemId == 6842) + { + item.setLocation(ItemLocation.INVENTORY); + } + } L2World.getInstance().storeObject(item);