Item container related cleanup.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -922,12 +922,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -928,12 +928,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -928,12 +928,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -928,12 +928,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -962,12 +962,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1030,12 +1030,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1030,12 +1030,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -1023,12 +1023,13 @@ public abstract class Inventory extends ItemContainer
 				item.setLastChange(ItemInstance.MODIFIED);
 				item.updateDatabase();
 				
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.updateDatabase();
+				newItem.updateDatabase();
 				refreshWeight();
-				return item;
+				return newItem;
 			}
 		}
+		
 		return dropItem(process, item, actor, reference);
 	}
 	

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -389,24 +389,27 @@ public abstract class ItemContainer
 			if (count == item.getCount())
 			{
 				removeItem(item);
-			}
-			else
-			{
-				item.changeCount(process, -count, actor, reference);
-				item.updateDatabase(true);
-				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
-				item.setOwnerId(getOwnerId());
-			}
 				
 				item.setItemLocation(newLocation);
 				item.updateDatabase(true);
-		}
-		
 				refreshWeight();
 				
 				return item;
 			}
 			
+			item.changeCount(process, -count, actor, reference);
+			item.updateDatabase(true);
+			
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+			newItem.setOwnerId(getOwnerId());
+			newItem.setItemLocation(newLocation);
+			newItem.updateDatabase(true);
+			refreshWeight();
+			
+			return newItem;
+		}
+	}
+	
 	/**
 	 * Detaches the item from this item container so it can be used as a single instance.
 	 * @param process string Identifier of process triggering this action

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -658,6 +658,7 @@ public class PlayerInventory extends Inventory
 		{
 			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
 		}
+		
 		return item;
 	}
 	

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -63,6 +63,7 @@ public class RequestDropItem implements IClientIncomingPacket
 		{
 			return;
 		}
+		
 		// Flood protect drop to avoid packet lag
 		if (!client.getFloodProtectors().getDropItem().tryPerformAction("drop item"))
 		{
@@ -75,6 +76,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED);
 			return;
 		}
+		
 		if (item.isQuestItem() && !(player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS) && Config.GM_TRADE_RESTRICTED_ITEMS))
 		{
 			return;
@@ -122,12 +124,14 @@ public class RequestDropItem implements IClientIncomingPacket
 			player.sendPacket(SystemMessageId.WHILE_OPERATING_A_PRIVATE_STORE_OR_WORKSHOP_YOU_CANNOT_DISCARD_DESTROY_OR_TRADE_AN_ITEM);
 			return;
 		}
+		
 		if (player.isFishing())
 		{
 			// You can't mount, dismount, break and drop items while fishing
 			player.sendPacket(SystemMessageId.YOU_CANNOT_DO_THAT_WHILE_FISHING_2);
 			return;
 		}
+		
 		if (player.isFlying())
 		{
 			return;

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -92,13 +92,14 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		{
 			return;
 		}
-		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
+		
 		final Npc manager = player.getLastFolkNPC();
 		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM())
 		{
 			return;
 		}
 		
+		final boolean isPrivate = warehouse instanceof PlayerWarehouse;
 		if (!isPrivate && !player.getAccessLevel().allowTransaction())
 		{
 			player.sendMessage("Transactions are disabled for your Access Level.");
@@ -121,9 +122,9 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		final long fee = _items.size() * 30;
 		long currentAdena = player.getAdena();
 		int slots = 0;
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
-			final ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance item = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (item == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (validity check)");
@@ -133,11 +134,11 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 			// Calculate needed adena and slots
 			if (item.getId() == ADENA_ID)
 			{
-				currentAdena -= i.getCount();
+				currentAdena -= itemHolder.getCount();
 			}
 			if (!item.isStackable())
 			{
-				slots += i.getCount();
+				slots += itemHolder.getCount();
 			}
 			else if (warehouse.getItemByItemId(item.getId()) == null)
 			{
@@ -167,10 +168,10 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 		
 		// Proceed to the transfer
 		final InventoryUpdate playerIU = Config.FORCE_INVENTORY_UPDATE ? null : new InventoryUpdate();
-		for (ItemHolder i : _items)
+		for (ItemHolder itemHolder : _items)
 		{
 			// Check validity of requested item
-			final ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			final ItemInstance oldItem = player.checkItemManipulation(itemHolder.getId(), itemHolder.getCount(), "deposit");
 			if (oldItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (olditem == null)");
@@ -182,7 +183,7 @@ public class SendWareHouseDepositList implements IClientIncomingPacket
 				continue;
 			}
 			
-			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			final ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), itemHolder.getId(), itemHolder.getCount(), warehouse, player, manager);
 			if (newItem == null)
 			{
 				LOGGER.warning("Error depositing a warehouse object for char " + player.getName() + " (newitem == null)");

L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java

@@ -18,13 +18,13 @@ package custom.KetraOrcSupport;
 
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java

@@ -18,13 +18,13 @@ package custom.VarkaSilenosSupport;
 
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java

@@ -17,9 +17,9 @@
 package quests.Q104_SpiritOfMirrors;
 
 import org.l2jmobius.gameserver.enums.Race;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java

@@ -17,10 +17,10 @@
 package quests.Q212_TrialOfDuty;
 
 import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java

@@ -18,9 +18,9 @@ package quests.Q218_TestimonyOfLife;
 
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.enums.Race;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java

@@ -17,10 +17,10 @@
 package quests.Q224_TestOfSagittarius;
 
 import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java

@@ -16,10 +16,10 @@
  */
 package quests.Q401_PathToAWarrior;
 
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java

@@ -17,10 +17,10 @@
 package quests.Q403_PathToARogue;
 
 import org.l2jmobius.commons.util.Rnd;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.base.ClassId;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java

@@ -17,9 +17,9 @@
 package teleports.OracleTeleport;
 
 import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;
 import org.l2jmobius.gameserver.model.quest.State;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/RecipeController.java

@@ -29,12 +29,12 @@ import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.datatables.xml.RecipeData;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.ManufactureItem;
 import org.l2jmobius.gameserver.model.RecipeList;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.RecipeInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.skills.Stat;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/CreatureAI.java

@@ -27,7 +27,6 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_PICK_UP;
 import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_REST;
 
 import org.l2jmobius.gameserver.ai.PlayerAI.IntentionCommand;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -36,6 +35,7 @@ import org.l2jmobius.gameserver.model.actor.Playable;
 import org.l2jmobius.gameserver.model.actor.instance.BoatInstance;
 import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance.ItemLocation;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminDestroyItems.java

@@ -17,8 +17,8 @@
 package org.l2jmobius.gameserver.handler.admincommandhandlers;
 
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java

@@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.handler.admincommandhandlers;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.CharInfo;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Fishing.java

@@ -21,13 +21,13 @@ import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.ISkillHandler;
 import org.l2jmobius.gameserver.instancemanager.FishingZoneManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/Mount.java

@@ -18,9 +18,9 @@ package org.l2jmobius.gameserver.handler.usercommandhandlers;
 
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.handler.IUserCommandHandler;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.Ride;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/CastleManorManager.java

@@ -30,12 +30,12 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.datatables.sql.ClanTable;
 import org.l2jmobius.gameserver.datatables.xml.ManorSeedData;
-import org.l2jmobius.gameserver.model.ClanWarehouse;
-import org.l2jmobius.gameserver.model.ItemContainer;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.entity.siege.Castle;
+import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ArmorSet.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.model;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CharSelectInfoPackage.java

@@ -16,6 +16,9 @@
  */
 package org.l2jmobius.gameserver.model;
 
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
+
 /**
  * Used to Store data sent to Client for Character Selection screen.
  * @version $Revision: 1.2.2.2.2.4 $ $Date: 2005/03/27 15:29:33 $

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java

@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.entity.event.CTF;
 import org.l2jmobius.gameserver.model.entity.event.DM;
 import org.l2jmobius.gameserver.model.entity.event.TvT;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/StoreTradeList.java

@@ -21,6 +21,7 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java

@@ -24,6 +24,7 @@ import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.datatables.OfflineTradeTable;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -53,7 +53,6 @@ import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
 import org.l2jmobius.gameserver.model.ChanceSkillList;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.ForceBuff;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.ObjectPosition;
 import org.l2jmobius.gameserver.model.Party;
@@ -92,6 +91,7 @@ import org.l2jmobius.gameserver.model.entity.event.GameEvent;
 import org.l2jmobius.gameserver.model.entity.event.TvT;
 import org.l2jmobius.gameserver.model.entity.event.VIP;
 import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.WeaponType;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java

@@ -26,7 +26,6 @@ import org.l2jmobius.gameserver.datatables.xml.ExperienceData;
 import org.l2jmobius.gameserver.geoengine.GeoEngine;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.PetInventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillTargetType;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
@@ -39,6 +38,7 @@ import org.l2jmobius.gameserver.model.actor.knownlist.SummonKnownList;
 import org.l2jmobius.gameserver.model.actor.stat.SummonStat;
 import org.l2jmobius.gameserver.model.actor.status.SummonStatus;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CastleChamberlainInstance.java

@@ -24,11 +24,11 @@ import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.datatables.sql.ClanTable;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.CastleManorManager;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.StoreTradeList;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.clan.Clan;
 import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.BuyList;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java

@@ -30,10 +30,7 @@ import org.l2jmobius.gameserver.datatables.sql.PetDataTable;
 import org.l2jmobius.gameserver.idfactory.IdFactory;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
 import org.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.PetData;
-import org.l2jmobius.gameserver.model.PetInventory;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -42,6 +39,9 @@ import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.stat.PetStat;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -90,17 +90,11 @@ import org.l2jmobius.gameserver.model.BlockList;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.Fish;
 import org.l2jmobius.gameserver.model.Fishing;
-import org.l2jmobius.gameserver.model.Inventory;
-import org.l2jmobius.gameserver.model.ItemContainer;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Macro;
 import org.l2jmobius.gameserver.model.MacroList;
 import org.l2jmobius.gameserver.model.ManufactureList;
 import org.l2jmobius.gameserver.model.Party;
-import org.l2jmobius.gameserver.model.PetInventory;
-import org.l2jmobius.gameserver.model.PlayerFreight;
-import org.l2jmobius.gameserver.model.PlayerInventory;
-import org.l2jmobius.gameserver.model.PlayerWarehouse;
 import org.l2jmobius.gameserver.model.Radar;
 import org.l2jmobius.gameserver.model.RecipeList;
 import org.l2jmobius.gameserver.model.Request;
@@ -143,6 +137,12 @@ import org.l2jmobius.gameserver.model.entity.siege.FortSiege;
 import org.l2jmobius.gameserver.model.entity.siege.Siege;
 import org.l2jmobius.gameserver.model.entity.siege.clanhalls.DevastatedCastle;
 import org.l2jmobius.gameserver.model.holders.PlayerStatsHolder;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
+import org.l2jmobius.gameserver.model.itemcontainer.PetInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
 import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.Henna;
 import org.l2jmobius.gameserver.model.items.Item;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java

@@ -19,9 +19,9 @@ package org.l2jmobius.gameserver.model.actor.instance;
 import java.util.Map;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.PlayerFreight;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.EnchantResult;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java

@@ -20,12 +20,12 @@ import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.instancemanager.CoupleManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.entity.Announcements;
 import org.l2jmobius.gameserver.model.entity.Wedding;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;
 import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java

@@ -38,10 +38,10 @@ import org.l2jmobius.gameserver.datatables.sql.ClanTable;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.CrownManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
-import org.l2jmobius.gameserver.model.ClanWarehouse;
-import org.l2jmobius.gameserver.model.ItemContainer;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java

@@ -34,7 +34,6 @@ import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.Radar;
@@ -47,6 +46,7 @@ import org.l2jmobius.gameserver.model.entity.Announcements;
 import org.l2jmobius.gameserver.model.entity.event.manager.EventTask;
 import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.entity.siege.Castle;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.spawn.Spawn;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/VIP.java

@@ -31,10 +31,10 @@ import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.datatables.sql.NpcTable;
 import org.l2jmobius.gameserver.datatables.sql.SpawnTable;
 import org.l2jmobius.gameserver.enums.Race;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
 import org.l2jmobius.gameserver.model.entity.Announcements;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.spawn.Spawn;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/CastleUpdater.java

@@ -21,8 +21,8 @@ import java.util.logging.Logger;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.concurrent.ThreadPool;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.ItemContainer;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 
 /**
  * Thorgrim - 2005 Class managing periodical events with castle

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -26,6 +26,10 @@ import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.datatables.xml.ArmorSetData;
+import org.l2jmobius.gameserver.model.ArmorSet;
+import org.l2jmobius.gameserver.model.Skill;
+import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.EtcItem;
@@ -641,12 +645,13 @@ public abstract class Inventory extends ItemContainer
 			item.setLastChange(ItemInstance.MODIFIED);
 			item.updateDatabase();
 			
-			item = ItemTable.getInstance().createItem(process, item.getItemId(), count, actor, reference);
+			final ItemInstance newItem = ItemTable.getInstance().createItem(process, item.getItemId(), count, actor, reference);
-			item.updateDatabase();
+			newItem.updateDatabase();
 			refreshWeight();
 			
-			return item;
+			return newItem;
 		}
+		
 		// Directly drop entire item
 		return dropItem(process, item, actor, reference);
 	}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -26,8 +26,9 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.database.DatabaseFactory;
-import org.l2jmobius.gameserver.GameTimeController;
 import org.l2jmobius.gameserver.datatables.ItemTable;
+import org.l2jmobius.gameserver.model.World;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
@@ -189,23 +190,8 @@ public abstract class ItemContainer
 			ItemTable.getInstance().destroyItem(process, item, actor, reference);
 			item.updateDatabase();
 			item = olditem;
-			
-			// Updates database
-			if ((item.getItemId() == 57) && (count < (10000 * Config.RATE_DROP_ADENA)))
-			{
-				// Small adena changes won't be saved to database all the time
-				if ((GameTimeController.getGameTicks() % 5) == 0)
-				{
-					item.updateDatabase();
 		}
-			}
+		else // If item hasn't be found in inventory, create new one
-			else
-			{
-				item.updateDatabase();
-			}
-		}
-		// If item hasn't be found in inventory, create new one
-		else
 		{
 			item.setOwnerId(process, getOwnerId(), actor, reference);
 			item.setLocation(getBaseLocation());
@@ -213,13 +199,9 @@ public abstract class ItemContainer
 			
 			// Add item in inventory
 			addItem(item);
-			
-			// Updates database
-			item.updateDatabase();
 		}
 		
 		refreshWeight();
-		
 		return item;
 	}
 	
@@ -241,23 +223,8 @@ public abstract class ItemContainer
 		{
 			item.changeCount(process, count, actor, reference);
 			item.setLastChange(ItemInstance.MODIFIED);
-			
-			// Updates database
-			if ((itemId == 57) && (count < (10000 * Config.RATE_DROP_ADENA)))
-			{
-				// Small adena changes won't be saved to database all the time
-				if ((GameTimeController.getGameTicks() % 5) == 0)
-				{
-					item.updateDatabase();
 		}
-			}
+		else // If item hasn't be found in inventory, create new one
-			else
-			{
-				item.updateDatabase();
-			}
-		}
-		// If item hasn't be found in inventory, create new one
-		else
 		{
 			for (int i = 0; i < count; i++)
 			{
@@ -284,8 +251,6 @@ public abstract class ItemContainer
 				
 				// Add item in inventory
 				addItem(item);
-				// Updates database
-				item.updateDatabase();
 				
 				// If stackable, end loop as entire count is included in 1 instance of item
 				if (template.isStackable() || !Config.MULTIPLE_ITEM_DROP)
@@ -296,7 +261,6 @@ public abstract class ItemContainer
 		}
 		
 		refreshWeight();
-		
 		return item;
 	}
 	
@@ -362,7 +326,6 @@ public abstract class ItemContainer
 		}
 		
 		ItemInstance targetitem = sourceitem.isStackable() ? target.getItemByItemId(sourceitem.getItemId()) : null;
-		
 		synchronized (sourceitem)
 		{
 			// check if this item still present in this container
@@ -390,8 +353,7 @@ public abstract class ItemContainer
 				{
 					sourceitem.changeCount(process, -count, actor, reference);
 				}
-				else
+				else // Otherwise destroy old item
-				// Otherwise destroy old item
 				{
 					removeItem(sourceitem);
 					ItemTable.getInstance().destroyItem(process, sourceitem, actor, reference);
@@ -401,8 +363,7 @@ public abstract class ItemContainer
 				{
 					targetitem.changeCount(process, count, actor, reference);
 				}
-				else
+				else // Otherwise add new item
-				// Otherwise add new item
 				{
 					targetitem = target.addItem(process, sourceitem.getItemId(), count, actor, reference);
 				}
@@ -414,15 +375,13 @@ public abstract class ItemContainer
 			{
 				targetitem.updateDatabase();
 			}
-			
 			if (sourceitem.isAugmented())
 			{
 				sourceitem.getAugmentation().removeBonus(actor);
 			}
-			
 			refreshWeight();
+			target.refreshWeight();
 		}
-		
 		return targetitem;
 	}
 	
@@ -519,8 +478,7 @@ public abstract class ItemContainer
 				item.changeCount(process, -count, actor, reference);
 				item.setLastChange(ItemInstance.MODIFIED);
 			}
-			// Directly drop entire item
+			else // Directly drop entire item
-			else
 			{
 				return destroyItem(process, item, actor, reference);
 			}

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import org.l2jmobius.gameserver.model.actor.instance.PetInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance.ItemLocation;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerFreight.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import java.util.ArrayList;
 import java.util.List;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
+import org.l2jmobius.gameserver.model.TradeList;
+import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.TradeList.TradeItem;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.Item;
@@ -450,6 +452,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance transferItem(String process, int objectId, int count, ItemContainer target, PlayerInstance actor, WorldObject reference)
 	{
 		final ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -474,7 +477,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance destroyItem(String process, ItemInstance item, PlayerInstance actor, WorldObject reference)
 	{
-		item = super.destroyItem(process, item, actor, reference);
+		final ItemInstance itemInstance = super.destroyItem(process, item, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -485,7 +489,7 @@ public class PlayerInventory extends Inventory
 			_ancientAdena = null;
 		}
 		
-		return item;
+		return itemInstance;
 	}
 	
 	/**
@@ -501,6 +505,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance destroyItem(String process, int objectId, int count, PlayerInstance actor, WorldObject reference)
 	{
 		final ItemInstance item = super.destroyItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -527,6 +532,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance destroyItemByItemId(String process, int itemId, int count, PlayerInstance actor, WorldObject reference)
 	{
 		final ItemInstance item = super.destroyItemByItemId(process, itemId, count, actor, reference);
+		
 		if ((_adena != null) && (_adena.getCount() <= 0))
 		{
 			_adena = null;
@@ -551,7 +557,8 @@ public class PlayerInventory extends Inventory
 	@Override
 	public ItemInstance dropItem(String process, ItemInstance item, PlayerInstance actor, WorldObject reference)
 	{
-		item = super.dropItem(process, item, actor, reference);
+		final ItemInstance itemInstance = super.dropItem(process, item, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;
@@ -562,7 +569,7 @@ public class PlayerInventory extends Inventory
 			_ancientAdena = null;
 		}
 		
-		return item;
+		return itemInstance;
 	}
 	
 	/**
@@ -578,6 +585,7 @@ public class PlayerInventory extends Inventory
 	public ItemInstance dropItem(String process, int objectId, int count, PlayerInstance actor, WorldObject reference)
 	{
 		final ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
 		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId())))
 		{
 			_adena = null;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerWarehouse.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance.ItemLocation;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Warehouse.java

@@ -14,12 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.model;
+package org.l2jmobius.gameserver.model.itemcontainer;
 
 /**
  * @version $Revision: 1.3.2.1.2.12 $ $Date: 2005/04/06 16:13:42 $
  */
 public abstract class Warehouse extends ItemContainer
 {
-	// null
 }

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java

@@ -25,10 +25,10 @@ import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.Rnd;
 import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.model.DropData;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.skills.Stat;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Formulas.java

@@ -24,7 +24,6 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
 import org.l2jmobius.gameserver.instancemanager.ClassDamageManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.Skill.SkillType;
@@ -42,6 +41,7 @@ import org.l2jmobius.gameserver.model.entity.ClanHall;
 import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
 import org.l2jmobius.gameserver.model.entity.siege.Siege;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemId.java

@@ -16,8 +16,8 @@
  */
 package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.skills.Env;
 

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionSlotItemType.java

@@ -16,8 +16,8 @@
  */
 package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.skills.Env;
 

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionTargetBodyPart.java

@@ -16,7 +16,7 @@
  */
 package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.model.Inventory;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.skills.Env;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/conditions/ConditionUsingItemType.java

@@ -16,8 +16,8 @@
  */
 package org.l2jmobius.gameserver.model.skills.conditions;
 
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.ArmorType;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java

@@ -41,7 +41,6 @@ import org.l2jmobius.gameserver.instancemanager.FortSiegeManager;
 import org.l2jmobius.gameserver.instancemanager.PetitionManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.model.Effect;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.ClassMasterInstance;
@@ -61,6 +60,7 @@ import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSigns;
 import org.l2jmobius.gameserver.model.entity.siege.Castle;
 import org.l2jmobius.gameserver.model.entity.siege.FortSiege;
 import org.l2jmobius.gameserver.model.entity.siege.Siege;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.quest.Quest;
 import org.l2jmobius.gameserver.model.quest.QuestState;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java

@@ -23,9 +23,9 @@ import java.util.logging.Logger;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.datatables.ItemTable;
 import org.l2jmobius.gameserver.model.Augmentation;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.Armor;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java

@@ -25,7 +25,6 @@ import org.l2jmobius.gameserver.GameTimeController;
 import org.l2jmobius.gameserver.ai.CtrlIntention;
 import org.l2jmobius.gameserver.datatables.SkillTable;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Location;
 import org.l2jmobius.gameserver.model.ManufactureList;
 import org.l2jmobius.gameserver.model.Skill;
@@ -38,6 +37,7 @@ import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SiegeSummonInstance;
 import org.l2jmobius.gameserver.model.actor.instance.StaticObjectInstance;
 import org.l2jmobius.gameserver.model.actor.instance.SummonInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.PlayerInventory;
 import org.l2jmobius.gameserver.model.Skill;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPackageSend.java

@@ -21,12 +21,12 @@ import java.util.List;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.ItemContainer;
-import org.l2jmobius.gameserver.model.PlayerFreight;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.actor.instance.FolkInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
+import org.l2jmobius.gameserver.model.itemcontainer.PlayerFreight;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java

@@ -20,11 +20,11 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.datatables.SkillTable;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.Party;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.entity.olympiad.Olympiad;
 import org.l2jmobius.gameserver.model.entity.sevensigns.SevenSignsFestival;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.zone.ZoneId;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.GameClient.GameClientState;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseDepositList.java

@@ -20,11 +20,11 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.model.ClanWarehouse;
-import org.l2jmobius.gameserver.model.ItemContainer;
 import org.l2jmobius.gameserver.model.actor.instance.FolkInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.items.type.EtcItemType;
 import org.l2jmobius.gameserver.network.SystemMessageId;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java

@@ -19,12 +19,12 @@ package org.l2jmobius.gameserver.network.clientpackets;
 import java.util.logging.Logger;
 
 import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.ClanWarehouse;
-import org.l2jmobius.gameserver.model.ItemContainer;
 import org.l2jmobius.gameserver.model.actor.instance.FolkInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse;
+import org.l2jmobius.gameserver.model.itemcontainer.ItemContainer;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
 import org.l2jmobius.gameserver.network.serverpackets.ActionFailed;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -27,10 +27,10 @@ import org.l2jmobius.gameserver.handler.IItemHandler;
 import org.l2jmobius.gameserver.handler.ItemHandler;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.ClanHallManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.Item;
 import org.l2jmobius.gameserver.model.items.Weapon;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java

@@ -21,10 +21,10 @@ import java.util.logging.Logger;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.datatables.sql.NpcTable;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 public class CharInfo extends GameServerPacket
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java

@@ -25,9 +25,9 @@ import java.util.logging.Logger;
 
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.gameserver.model.CharSelectInfoPackage;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.clan.Clan;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.network.GameClient;
 
 /**

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java

@@ -16,8 +16,8 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 /**
  * TODO Add support for Eval. Score dddddSdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddffffddddSddd rev420 dddddSdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddffffddddSdddcccddhh rev478

L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java

@@ -19,11 +19,11 @@ package org.l2jmobius.gameserver.network.serverpackets;
 import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.datatables.sql.NpcTable;
 import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.actor.Creature;
 import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 
 public class UserInfo extends GameServerPacket
 {

L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java

@@ -62,7 +62,6 @@ import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.instancemanager.DayNightSpawnManager;
 import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
-import org.l2jmobius.gameserver.model.Inventory;
 import org.l2jmobius.gameserver.model.TradeList;
 import org.l2jmobius.gameserver.model.World;
 import org.l2jmobius.gameserver.model.WorldObject;
@@ -73,6 +72,7 @@ import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
 import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.entity.Announcements;
+import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
 import org.l2jmobius.gameserver.model.multisell.Multisell;
 import org.l2jmobius.gameserver.network.SystemMessageId;