Proper naming for Item ItemTemplate getter.

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java

@@ -176,10 +176,10 @@ public class AdminElement implements IAdminCommandHandler
 			player.sendPacket(iu);
 			
 			// informations
-			BuilderUtil.sendSysMessage(activeChar, "Changed elemental power of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + old + " to " + current + ".");
+			BuilderUtil.sendSysMessage(activeChar, "Changed elemental power of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + old + " to " + current + ".");
 			if (player != activeChar)
 			{
-				player.sendMessage(activeChar.getName() + " has changed the elemental power of your " + itemInstance.getItem().getName() + " from " + old + " to " + current + ".");
+				player.sendMessage(activeChar.getName() + " has changed the elemental power of your " + itemInstance.getTemplate().getName() + " from " + old + " to " + current + ".");
 			}
 		}
 	}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java

@@ -214,8 +214,8 @@ public class AdminEnchant implements IAdminCommandHandler
 			player.broadcastUserInfo();
 			
 			// informations
-			BuilderUtil.sendSysMessage(activeChar, "Changed enchantment of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
-			player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
+			BuilderUtil.sendSysMessage(activeChar, "Changed enchantment of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
+			player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
 		}
 	}
 	

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java

@@ -87,7 +87,7 @@ public class ConvertItem extends AbstractEffect
 		
 		final int enchantLevel = wpn.getEnchantLevel();
 		final Elementals elementals = wpn.getElementals() == null ? null : wpn.getElementals()[0];
-		final List<Item> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
+		final List<Item> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart());
 		final InventoryUpdate iu = new InventoryUpdate();
 		for (Item item : unequipped)
 		{
@@ -103,7 +103,7 @@ public class ConvertItem extends AbstractEffect
 		byte count = 0;
 		for (Item item : unequipped)
 		{
-			if (!(item.getItem() instanceof Weapon))
+			if (!(item.getTemplate() instanceof Weapon))
 			{
 				count++;
 				continue;

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java

@@ -90,7 +90,7 @@ public class Heal extends AbstractEffect
 			final Item weaponInst = creature.getActiveWeaponInstance();
 			if (weaponInst != null)
 			{
-				mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
+				mAtkMul = weaponInst.getTemplate().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getTemplate().getCrystalType() == CrystalType.S80 ? 2 : 1;
 			}
 			// shot dynamic bonus
 			mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java

@@ -59,7 +59,7 @@ public class BeastSoulShot implements IItemHandler
 		final int itemId = item.getId();
 		final short shotConsumption = activeOwner.getSummon().getSoulShotsPerHit();
 		final long shotCount = item.getCount();
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		if (skills == null)
 		{
 			LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!");

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java

@@ -59,7 +59,7 @@ public class BeastSpiritShot implements IItemHandler
 		final int itemId = item.getId();
 		final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these!
 		final short shotConsumption = activeOwner.getSummon().getSpiritShotsPerHit();
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		if (skills == null)
 		{
 			LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!");

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java

@@ -44,7 +44,7 @@ public class BlessedSpiritShot implements IItemHandler
 		final Player player = (Player) playable;
 		final Item weaponInst = player.getActiveWeaponInstance();
 		final Weapon weaponItem = player.getActiveWeaponItem();
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		final int itemId = item.getId();
 		if (skills == null)
 		{
@@ -69,7 +69,7 @@ public class BlessedSpiritShot implements IItemHandler
 		}
 		
 		// Check for correct grade
-		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
+		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
 		if (!gradeCheck)
 		{
 			if (!player.getAutoSoulShot().contains(itemId))

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java

@@ -40,7 +40,7 @@ public class CharmOfCourage implements IItemHandler
 		
 		final Player player = playable.getActingPlayer();
 		int level = player.getLevel();
-		final int itemLevel = item.getItem().getCrystalType().getLevel();
+		final int itemLevel = item.getTemplate().getCrystalType().getLevel();
 		if (level < 20)
 		{
 			level = 0;

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java

@@ -45,7 +45,7 @@ public class ExtractableItems implements IItemHandler
 		}
 		
 		final Player player = playable.getActingPlayer();
-		final EtcItem etcitem = (EtcItem) item.getItem();
+		final EtcItem etcitem = (EtcItem) item.getTemplate();
 		final List<ExtractableProduct> exitem = etcitem.getExtractableItems();
 		if (exitem == null)
 		{

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java

@@ -60,14 +60,14 @@ public class FishShots implements IItemHandler
 		}
 		
 		final long count = item.getCount();
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		if (skills == null)
 		{
 			LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": is missing skills!");
 			return false;
 		}
 		
-		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
+		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
 		if (!gradeCheck)
 		{
 			player.sendPacket(SystemMessageId.THAT_IS_THE_WRONG_GRADE_OF_SOULSHOT_FOR_THAT_FISHING_POLE);

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java

@@ -45,7 +45,7 @@ public class Harvester implements IItemHandler
 			return false;
 		}
 		
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		if (skills == null)
 		{
 			LOGGER.warning(getClass().getSimpleName() + ": is missing skills!");

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java

@@ -111,7 +111,7 @@ public class ItemSkillsTemplate implements IItemHandler
 					playable.sendPacket(sm);
 				}
 				
-				if (itemSkill.isSimultaneousCast() || ((item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) && itemSkill.isStatic()))
+				if (itemSkill.isSimultaneousCast() || ((item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) && itemSkill.isStatic()))
 				{
 					playable.doSimultaneousCast(itemSkill);
 				}
@@ -147,12 +147,12 @@ public class ItemSkillsTemplate implements IItemHandler
 	 */
 	private boolean checkConsume(Item item, boolean hasConsumeSkill)
 	{
-		switch (item.getItem().getDefaultAction())
+		switch (item.getTemplate().getDefaultAction())
 		{
 			case CAPSULE:
 			case SKILL_REDUCE:
 			{
-				if (!hasConsumeSkill && item.getItem().hasImmediateEffect())
+				if (!hasConsumeSkill && item.getTemplate().hasImmediateEffect())
 				{
 					return true;
 				}

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java

@@ -46,7 +46,7 @@ public class PetFood implements IItemHandler
 			return false;
 		}
 		
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		if (skills != null)
 		{
 			for (SkillHolder sk : skills)

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Seed.java

@@ -86,7 +86,7 @@ public class Seed implements IItemHandler
 		final Player player = playable.getActingPlayer();
 		target.setSeeded(seed, player);
 		
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		if (skills != null)
 		{
 			for (SkillHolder sk : skills)

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java

@@ -45,7 +45,7 @@ public class SoulShots implements IItemHandler
 		final Player player = playable.getActingPlayer();
 		final Item weaponInst = player.getActiveWeaponInstance();
 		final Weapon weaponItem = player.getActiveWeaponItem();
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		final int itemId = item.getId();
 		if (skills == null)
 		{
@@ -63,7 +63,7 @@ public class SoulShots implements IItemHandler
 			return false;
 		}
 		
-		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
+		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
 		if (!gradeCheck)
 		{
 			if (!player.getAutoSoulShot().contains(itemId))

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java

@@ -44,7 +44,7 @@ public class SpiritShot implements IItemHandler
 		final Player player = (Player) playable;
 		final Item weaponInst = player.getActiveWeaponInstance();
 		final Weapon weaponItem = player.getActiveWeaponItem();
-		final SkillHolder[] skills = item.getItem().getSkills();
+		final SkillHolder[] skills = item.getTemplate().getSkills();
 		final int itemId = item.getId();
 		if (skills == null)
 		{
@@ -68,7 +68,7 @@ public class SpiritShot implements IItemHandler
 			return false;
 		}
 		
-		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getItem().getCrystalTypePlus() == item.getItem().getCrystalTypePlus());
+		final boolean gradeCheck = item.isEtcItem() && (item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT) && (weaponInst.getTemplate().getCrystalTypePlus() == item.getTemplate().getCrystalTypePlus());
 		if (!gradeCheck)
 		{
 			if (!player.getAutoSoulShot().contains(itemId))

L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java

@@ -186,11 +186,11 @@ public class Enchant implements ITelnetCommand
 			player.broadcastUserInfo();
 			
 			// informations
-			player.sendMessage("Changed enchantment of " + player.getName() + "'s " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
-			player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getItem().getName() + " from " + curEnchant + " to " + ench + ".");
+			player.sendMessage("Changed enchantment of " + player.getName() + "'s " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
+			player.sendMessage("Admin has changed the enchantment of your " + itemInstance.getTemplate().getName() + " from " + curEnchant + " to " + ench + ".");
 			
 			// log
-			GMAudit.auditGMAction("TelnetAdmin", "enchant", player.getName(), itemInstance.getItem().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
+			GMAudit.auditGMAction("TelnetAdmin", "enchant", player.getName(), itemInstance.getTemplate().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
 			return true;
 		}
 		return false;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java

@@ -509,9 +509,9 @@ public class AttackableAI extends CreatureAI
 								{
 									ItemsOnGroundManager.getInstance().removeObject(droppedItem);
 								}
-								if (droppedItem.getItem().hasExImmediateEffect())
+								if (droppedItem.getTemplate().hasExImmediateEffect())
 								{
-									for (SkillHolder skillHolder : droppedItem.getItem().getSkills())
+									for (SkillHolder skillHolder : droppedItem.getTemplate().getSkills())
 									{
 										npc.doSimultaneousCast(skillHolder.getSkill());
 									}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/AugmentationData.java

@@ -516,7 +516,7 @@ public class AugmentationData
 		int stat34 = 0;
 		if (Config.RETAIL_LIKE_AUGMENTATION)
 		{
-			if (item.getItem().isMagicWeapon())
+			if (item.getTemplate().isMagicWeapon())
 			{
 				final List<AugmentationChance> selectedChances12 = new ArrayList<>();
 				final List<AugmentationChance> selectedChances34 = new ArrayList<>();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/ItemTable.java

@@ -305,7 +305,7 @@ public class ItemTable
 				LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null
 					+ ", item " + item.getObjectId() //
 					+ ":+" + item.getEnchantLevel() //
-					+ " " + item.getItem().getName() //
+					+ " " + item.getTemplate().getName() //
 					+ "(" + item.getCount() //
 					+ "), " + String.valueOf(actor) // in case of null
 					+ ", " + String.valueOf(reference)); // in case of null
@@ -314,7 +314,7 @@ public class ItemTable
 			{
 				LOGGER_ITEMS.info("CREATE:" + String.valueOf(process) // in case of null
 					+ ", item " + item.getObjectId() //
-					+ ":" + item.getItem().getName() //
+					+ ":" + item.getTemplate().getName() //
 					+ "(" + item.getCount() //
 					+ "), " + String.valueOf(actor) // in case of null
 					+ ", " + String.valueOf(reference)); // in case of null
@@ -347,7 +347,7 @@ public class ItemTable
 		}
 		
 		// Notify to scripts
-		EventDispatcher.getInstance().notifyEventAsync(new OnItemCreate(process, item, actor, reference), item.getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnItemCreate(process, item, actor, reference), item.getTemplate());
 		return item;
 	}
 	
@@ -392,7 +392,7 @@ public class ItemTable
 						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
 							+ ", item " + item.getObjectId() //
 							+ ":+" + item.getEnchantLevel() //
-							+ " " + item.getItem().getName() //
+							+ " " + item.getTemplate().getName() //
 							+ "(" + item.getCount() //
 							+ "), PrevCount(" + old //
 							+ "), " + String.valueOf(actor) // in case of null
@@ -402,7 +402,7 @@ public class ItemTable
 					{
 						LOGGER_ITEMS.info("DELETE:" + String.valueOf(process) // in case of null
 							+ ", item " + item.getObjectId() //
-							+ ":" + item.getItem().getName() //
+							+ ":" + item.getTemplate().getName() //
 							+ "(" + item.getCount() //
 							+ "), PrevCount(" + old //
 							+ "), " + String.valueOf(actor) // in case of null
@@ -437,7 +437,7 @@ public class ItemTable
 			}
 			
 			// if it's a pet control item, delete the pet as well
-			if (item.getItem().isPetItem())
+			if (item.getTemplate().isPetItem())
 			{
 				try (Connection con = DatabaseFactory.getConnection();
 					PreparedStatement statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id=?"))

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java

@@ -129,14 +129,14 @@ public class EnchantItemHPBonusData implements IXmlReader
 	 */
 	public int getHPBonus(Item item)
 	{
-		final List<Integer> values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus());
+		final List<Integer> values = _armorHPBonuses.get(item.getTemplate().getCrystalTypePlus());
 		if ((values == null) || values.isEmpty() || (item.getOlyEnchantLevel() <= 0))
 		{
 			return 0;
 		}
 		
 		final int bonus = values.get(Math.min(item.getOlyEnchantLevel(), values.size()) - 1);
-		if (item.getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)
+		if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)
 		{
 			return (int) (bonus * FULL_ARMOR_MODIFIER);
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -126,7 +126,7 @@ public class ItemsOnGroundManager implements Runnable
 					_items.add(item);
 					count++;
 					// add to ItemsAutoDestroy only items not protected
-					if (!Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && (dropTime > -1) && (((Config.AUTODESTROY_ITEM_AFTER > 0) && !item.getItem().hasExImmediateEffect()) || ((Config.HERB_AUTO_DESTROY_TIME > 0) && item.getItem().hasExImmediateEffect())))
+					if (!Config.LIST_PROTECTED_ITEMS.contains(item.getId()) && (dropTime > -1) && (((Config.AUTODESTROY_ITEM_AFTER > 0) && !item.getTemplate().hasExImmediateEffect()) || ((Config.HERB_AUTO_DESTROY_TIME > 0) && item.getTemplate().hasExImmediateEffect())))
 					{
 						ItemsAutoDestroyTaskManager.getInstance().addItem(item);
 					}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/ItemInfo.java

@@ -87,7 +87,7 @@ public class ItemInfo
 		_objectId = item.getObjectId();
 		
 		// Get the Item of the Item
-		_item = item.getItem();
+		_item = item.getTemplate();
 		
 		// Get the enchant level of the Item
 		_enchant = item.getEnchantLevel();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TempItem.java

@@ -40,7 +40,7 @@ public class TempItem
 		super();
 		_itemId = item.getId();
 		_quantity = quantity;
-		_itemName = item.getItem().getName();
+		_itemName = item.getTemplate().getName();
 		_referencePrice = item.getReferencePrice();
 	}
 	

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/TradeItem.java

@@ -46,7 +46,7 @@ public class TradeItem
 	public TradeItem(Item item, long count, long price)
 	{
 		_objectId = item.getObjectId();
-		_item = item.getItem();
+		_item = item.getTemplate();
 		_location = item.getLocationSlot();
 		_enchant = item.getEnchantLevel();
 		_type1 = item.getCustomType1();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Npc.java

@@ -1816,7 +1816,7 @@ public class Npc extends Creature
 			item.dropMe(this, newX, newY, newZ);
 			
 			// Add drop to auto destroy item task.
-			if (!Config.LIST_PROTECTED_ITEMS.contains(itemId) && (((Config.AUTODESTROY_ITEM_AFTER > 0) && !item.getItem().hasExImmediateEffect()) || ((Config.HERB_AUTO_DESTROY_TIME > 0) && item.getItem().hasExImmediateEffect())))
+			if (!Config.LIST_PROTECTED_ITEMS.contains(itemId) && (((Config.AUTODESTROY_ITEM_AFTER > 0) && !item.getTemplate().hasExImmediateEffect()) || ((Config.HERB_AUTO_DESTROY_TIME > 0) && item.getTemplate().hasExImmediateEffect())))
 			{
 				ItemsAutoDestroyTaskManager.getInstance().addItem(item);
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java

@@ -2070,7 +2070,7 @@ public class Player extends Playable
 		{
 			if ((item != null) && item.isEquipped() && (item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT))
 			{
-				crystaltype = item.getItem().getCrystalType().getLevel();
+				crystaltype = item.getTemplate().getCrystalType().getLevel();
 				if (crystaltype > expertiseLevel)
 				{
 					if (item.isWeapon() && (crystaltype > weaponPenalty))
@@ -2198,13 +2198,13 @@ public class Player extends Playable
 				// Consume mana - will start a task if required; returns if item is not a shadow item
 				item.decreaseMana(false);
 				
-				if ((item.getItem().getBodyPart() & ItemTemplate.SLOT_MULTI_ALLWEAPON) != 0)
+				if ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_MULTI_ALLWEAPON) != 0)
 				{
 					rechargeShots(true, true);
 				}
 				
 				// Notify to scripts
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate());
 				
 			}
 			else
@@ -4441,7 +4441,7 @@ public class Player extends Playable
 		}
 		
 		// Auto use herbs - pick up
-		if (target.getItem().hasExImmediateEffect())
+		if (target.getTemplate().hasExImmediateEffect())
 		{
 			final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler != null)
@@ -4831,7 +4831,7 @@ public class Player extends Playable
 	public Weapon getActiveWeaponItem()
 	{
 		final Item weapon = getActiveWeaponInstance();
-		return weapon == null ? _fistsWeaponItem : (Weapon) weapon.getItem();
+		return weapon == null ? _fistsWeaponItem : (Weapon) weapon.getTemplate();
 	}
 	
 	public Item getChestArmorInstance()
@@ -4847,13 +4847,13 @@ public class Player extends Playable
 	public Armor getActiveChestArmorItem()
 	{
 		final Item armor = getChestArmorInstance();
-		return armor == null ? null : (Armor) armor.getItem();
+		return armor == null ? null : (Armor) armor.getTemplate();
 	}
 	
 	public Armor getActiveLegsArmorItem()
 	{
 		final Item legs = getLegsArmorInstance();
-		return legs == null ? null : (Armor) legs.getItem();
+		return legs == null ? null : (Armor) legs.getTemplate();
 	}
 	
 	public boolean isWearingHeavyArmor()
@@ -4864,7 +4864,7 @@ public class Player extends Playable
 		{
 			return true;
 		}
-		if ((armor != null) && (getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))
+		if ((armor != null) && (getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))
 		{
 			return true;
 		}
@@ -4879,7 +4879,7 @@ public class Player extends Playable
 		{
 			return true;
 		}
-		if ((armor != null) && (_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))
+		if ((armor != null) && (_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))
 		{
 			return true;
 		}
@@ -4894,7 +4894,7 @@ public class Player extends Playable
 		{
 			return true;
 		}
-		if ((armor != null) && (_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))
+		if ((armor != null) && (_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))
 		{
 			return true;
 		}
@@ -5007,7 +5007,7 @@ public class Player extends Playable
 	public ItemTemplate getSecondaryWeaponItem()
 	{
 		final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND);
-		return item != null ? item.getItem() : null;
+		return item != null ? item.getTemplate() : null;
 	}
 	
 	/**
@@ -5273,7 +5273,7 @@ public class Player extends Playable
 					if (itemDrop.isShadowItem() || // Dont drop Shadow Items
 						itemDrop.isTimeLimitedItem() || // Dont drop Time Limited Items
 						!itemDrop.isDropable() || (itemDrop.getId() == Inventory.ADENA_ID) || // Adena
-						(itemDrop.getItem().getType2() == ItemTemplate.TYPE2_QUEST) || // Quest Items
+						(itemDrop.getTemplate().getType2() == ItemTemplate.TYPE2_QUEST) || // Quest Items
 						(hasSummon() && (_summon.getControlObjectId() == itemDrop.getId())) || // Control Item of active pet
 						(Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_ITEMS, itemDrop.getId()) >= 0) || // Item listed in the non droppable item list
 						(Arrays.binarySearch(Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS, itemDrop.getId()) >= 0 // Item listed in the non droppable pet item list
@@ -5285,7 +5285,7 @@ public class Player extends Playable
 					if (itemDrop.isEquipped())
 					{
 						// Set proper chance according to Item type of equipped Item
-						itemDropPercent = itemDrop.getItem().getType2() == ItemTemplate.TYPE2_WEAPON ? dropEquipWeapon : dropEquip;
+						itemDropPercent = itemDrop.getTemplate().getType2() == ItemTemplate.TYPE2_WEAPON ? dropEquipWeapon : dropEquip;
 						_inventory.unEquipItemInSlot(itemDrop.getLocationSlot());
 					}
 					else
@@ -6196,7 +6196,7 @@ public class Player extends Playable
 			return false;
 		}
 		
-		final List<Item> unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
+		final List<Item> unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart());
 		final InventoryUpdate iu = new InventoryUpdate();
 		for (Item itm : unequipped)
 		{
@@ -6236,7 +6236,7 @@ public class Player extends Playable
 		final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND);
 		if (sld != null)
 		{
-			final List<Item> unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart());
+			final List<Item> unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart());
 			final InventoryUpdate iu = new InventoryUpdate();
 			for (Item itm : unequipped)
 			{
@@ -9273,7 +9273,7 @@ public class Player extends Playable
 			item = _inventory.getItemByItemId(itemId);
 			if (item != null)
 			{
-				if (magic && (item.getItem().getDefaultAction() == ActionType.SPIRITSHOT))
+				if (magic && (item.getTemplate().getDefaultAction() == ActionType.SPIRITSHOT))
 				{
 					handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 					if (handler != null)
@@ -9282,7 +9282,7 @@ public class Player extends Playable
 					}
 				}
 				
-				if (physical && (item.getItem().getDefaultAction() == ActionType.SOULSHOT))
+				if (physical && (item.getTemplate().getDefaultAction() == ActionType.SOULSHOT))
 				{
 					handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 					if (handler != null)
@@ -12477,7 +12477,7 @@ public class Player extends Playable
 		for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++)
 		{
 			final Item equippedItem = _inventory.getPaperdollItem(i);
-			if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false))
+			if ((equippedItem != null) && !equippedItem.getTemplate().checkCondition(this, this, false))
 			{
 				_inventory.unEquipItemInSlot(i);
 				
@@ -12486,7 +12486,7 @@ public class Player extends Playable
 				sendPacket(iu);
 				
 				SystemMessage sm = null;
-				if (equippedItem.getItem().getBodyPart() == ItemTemplate.SLOT_BACK)
+				if (equippedItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_BACK)
 				{
 					sendPacket(SystemMessageId.YOUR_CLOAK_HAS_BEEN_UNEQUIPPED_BECAUSE_YOUR_ARMOR_SET_IS_NO_LONGER_COMPLETE);
 					return;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Summon.java

@@ -1107,7 +1107,7 @@ public abstract class Summon extends Playable
 			item = _owner.getInventory().getItemByItemId(itemId);
 			if (item != null)
 			{
-				if (magic && (item.getItem().getDefaultAction() == ActionType.SUMMON_SPIRITSHOT))
+				if (magic && (item.getTemplate().getDefaultAction() == ActionType.SUMMON_SPIRITSHOT))
 				{
 					handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 					if (handler != null)
@@ -1116,7 +1116,7 @@ public abstract class Summon extends Playable
 					}
 				}
 				
-				if (physical && (item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT))
+				if (physical && (item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT))
 				{
 					handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
 					if (handler != null)

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java

@@ -315,7 +315,7 @@ public class Pet extends Summon
 	{
 		for (Item item : _inventory.getItems())
 		{
-			if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND))
+			if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND))
 			{
 				return item;
 			}
@@ -330,7 +330,7 @@ public class Pet extends Summon
 	public Weapon getActiveWeaponItem()
 	{
 		final Item weapon = getActiveWeaponInstance();
-		return weapon == null ? null : (Weapon) weapon.getItem();
+		return weapon == null ? null : (Weapon) weapon.getTemplate();
 	}
 	
 	@Override
@@ -544,7 +544,7 @@ public class Pet extends Summon
 		}
 		
 		// Herbs
-		if (target.getItem().hasExImmediateEffect())
+		if (target.getTemplate().hasExImmediateEffect())
 		{
 			final IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
 			if (handler == null)

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java

@@ -49,6 +49,6 @@ public class ConditionSlotItemType extends ConditionInventory
 		}
 		
 		final Item itemSlot = effector.getInventory().getPaperdollItem(_slot);
-		return (itemSlot != null) && ((itemSlot.getItem().getItemMask() & _mask) != 0);
+		return (itemSlot != null) && ((itemSlot.getTemplate().getItemMask() & _mask) != 0);
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java

@@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition
 			{
 				return false;
 			}
-			final int chestMask = chest.getItem().getItemMask();
+			final int chestMask = chest.getTemplate().getItemMask();
 			
 			// If chest armor is different from the condition one return false
 			if ((_mask & chestMask) == 0)
@@ -75,7 +75,7 @@ public class ConditionUsingItemType extends Condition
 			
 			// So from here, chest armor matches conditions
 			
-			final int chestBodyPart = chest.getItem().getBodyPart();
+			final int chestBodyPart = chest.getTemplate().getBodyPart();
 			// return True if chest armor is a Full Armor
 			if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR)
 			{
@@ -87,7 +87,7 @@ public class ConditionUsingItemType extends Condition
 			{
 				return false;
 			}
-			final int legMask = legs.getItem().getItemMask();
+			final int legMask = legs.getTemplate().getItemMask();
 			// return true if legs armor matches too
 			return (_mask & legMask) != 0;
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/events/AbstractScript.java

@@ -2575,7 +2575,7 @@ public abstract class AbstractScript extends ManagedScript
 		if (item.isEquipped())
 		{
 			final InventoryUpdate iu = new InventoryUpdate();
-			for (Item itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()))
+			for (Item itm : player.getInventory().unEquipItemInBodySlotAndRecord(item.getTemplate().getBodyPart()))
 			{
 				iu.addModifiedItem(itm);
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java

@@ -64,7 +64,7 @@ public class WarehouseItem
 	
 	public WarehouseItem(Item item)
 	{
-		_item = item.getItem();
+		_item = item.getTemplate();
 		_object = item.getObjectId();
 		_count = item.getCount();
 		_owner = item.getOwnerId();
@@ -72,7 +72,7 @@ public class WarehouseItem
 		_enchant = item.getEnchantLevel();
 		_customType1 = item.getCustomType1();
 		_customType2 = item.getCustomType2();
-		_grade = item.getItem().getCrystalType();
+		_grade = item.getTemplate().getCrystalType();
 		if (item.isAugmented())
 		{
 			_isAugmented = true;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java

@@ -127,7 +127,7 @@ public abstract class AbstractEnchantItem
 		{
 			return false;
 		}
-		else if (!isValidItemType(itemToEnchant.getItem().getType2()))
+		else if (!isValidItemType(itemToEnchant.getTemplate().getType2()))
 		{
 			return false;
 		}
@@ -135,7 +135,7 @@ public abstract class AbstractEnchantItem
 		{
 			return false;
 		}
-		else if (_grade != itemToEnchant.getItem().getCrystalTypePlus())
+		else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus())
 		{
 			return false;
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java

@@ -157,7 +157,7 @@ public class EnchantScroll extends AbstractEnchantItem
 			return -1;
 		}
 		
-		final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId);
+		final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getTemplate(), _scrollGroupId);
 		if (group == null)
 		{
 			LOGGER.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player);

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java

@@ -109,7 +109,7 @@ public class Item extends WorldObject
 	private final int _itemId;
 	
 	/** ItemTemplate associated to the item */
-	private final ItemTemplate _item;
+	private final ItemTemplate _itemTemplate;
 	
 	/** Location of the item : Inventory, PaperDoll, WareHouse */
 	private ItemLocation _loc;
@@ -175,19 +175,19 @@ public class Item extends WorldObject
 		super(objectId);
 		setInstanceType(InstanceType.Item);
 		_itemId = itemId;
-		_item = ItemTable.getInstance().getTemplate(itemId);
-		if ((_itemId == 0) || (_item == null))
+		_itemTemplate = ItemTable.getInstance().getTemplate(itemId);
+		if ((_itemId == 0) || (_itemTemplate == null))
 		{
 			throw new IllegalArgumentException();
 		}
-		super.setName(_item.getName());
+		super.setName(_itemTemplate.getName());
 		setCount(1);
 		_loc = ItemLocation.VOID;
 		_type1 = 0;
 		_type2 = 0;
 		_dropTime = 0;
-		_mana = _item.getDuration();
-		_time = _item.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_item.getTime() * 60 * 1000);
+		_mana = _itemTemplate.getDuration();
+		_time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000);
 		_enchantLevel = 0;
 		scheduleLifeTimeTask();
 	}
@@ -195,23 +195,23 @@ public class Item extends WorldObject
 	/**
 	 * Constructor of the Item from the objetId and the description of the item given by the Item.
 	 * @param objectId : int designating the ID of the object in the world
-	 * @param item : Item containing informations of the item
+	 * @param itemTemplate : Item containing informations of the item
 	 */
-	public Item(int objectId, ItemTemplate item)
+	public Item(int objectId, ItemTemplate itemTemplate)
 	{
 		super(objectId);
 		setInstanceType(InstanceType.Item);
-		_itemId = item.getId();
-		_item = item;
+		_itemId = itemTemplate.getId();
+		_itemTemplate = itemTemplate;
 		if (_itemId == 0)
 		{
 			throw new IllegalArgumentException();
 		}
-		super.setName(_item.getName());
+		super.setName(_itemTemplate.getName());
 		setCount(1);
 		_loc = ItemLocation.VOID;
-		_mana = _item.getDuration();
-		_time = _item.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_item.getTime() * 60 * 1000);
+		_mana = _itemTemplate.getDuration();
+		_time = _itemTemplate.getTime() == -1 ? -1 : Chronos.currentTimeMillis() + (_itemTemplate.getTime() * 60 * 1000);
 		scheduleLifeTimeTask();
 	}
 	
@@ -278,7 +278,7 @@ public class Item extends WorldObject
 		if (creature.isPlayer())
 		{
 			// Notify to scripts
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemPickup(creature.getActingPlayer(), this), getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemPickup(creature.getActingPlayer(), this), getTemplate());
 		}
 	}
 	
@@ -295,14 +295,14 @@ public class Item extends WorldObject
 		
 		if (Config.LOG_ITEMS)
 		{
-			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
+			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))
 			{
 				if (_enchantLevel > 0)
 				{
 					LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null
 						+ ", item " + getObjectId() //
 						+ ":+" + _enchantLevel //
-						+ " " + _item.getName() //
+						+ " " + _itemTemplate.getName() //
 						+ "(" + _count + "), " //
 						+ String.valueOf(creator) + ", " // in case of null
 						+ String.valueOf(reference)); // in case of null
@@ -311,7 +311,7 @@ public class Item extends WorldObject
 				{
 					LOG_ITEMS.info("SETOWNER:" + String.valueOf(process) // in case of null
 						+ ", item " + getObjectId() //
-						+ ":" + _item.getName() //
+						+ ":" + _itemTemplate.getName() //
 						+ "(" + _count + "), " //
 						+ String.valueOf(creator) + ", " // in case of null
 						+ String.valueOf(reference)); // in case of null
@@ -467,14 +467,14 @@ public class Item extends WorldObject
 		
 		if (Config.LOG_ITEMS && (process != null))
 		{
-			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_item.isEquipable() || (_item.getId() == ADENA_ID))))
+			if (!Config.LOG_ITEMS_SMALL_LOG || (Config.LOG_ITEMS_SMALL_LOG && (_itemTemplate.isEquipable() || (_itemTemplate.getId() == ADENA_ID))))
 			{
 				if (_enchantLevel > 0)
 				{
 					LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null
 						+ ", item " + getObjectId() //
 						+ ":+" + _enchantLevel //
-						+ " " + _item.getName() //
+						+ " " + _itemTemplate.getName() //
 						+ "(" + _count + "), PrevCount(" //
 						+ String.valueOf(old) + "), " // in case of null
 						+ String.valueOf(creator) + ", " // in case of null
@@ -484,7 +484,7 @@ public class Item extends WorldObject
 				{
 					LOG_ITEMS.info("CHANGE:" + String.valueOf(process) // in case of null
 						+ ", item " + getObjectId() //
-						+ ":" + _item.getName() //
+						+ ":" + _itemTemplate.getName() //
 						+ "(" + _count + "), PrevCount(" //
 						+ String.valueOf(old) + "), " // in case of null
 						+ String.valueOf(creator) + ", " // in case of null
@@ -524,7 +524,7 @@ public class Item extends WorldObject
 	 */
 	public boolean isEnchantable()
 	{
-		return (_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL) ? _item.isEnchantable() : false;
+		return (_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL) ? _itemTemplate.isEnchantable() : false;
 	}
 	
 	/**
@@ -533,7 +533,7 @@ public class Item extends WorldObject
 	 */
 	public boolean isEquipable()
 	{
-		return (_item.getBodyPart() != 0) && (_item.getItemType() != EtcItemType.ARROW) && (_item.getItemType() != EtcItemType.BOLT) && (_item.getItemType() != EtcItemType.LURE);
+		return (_itemTemplate.getBodyPart() != 0) && (_itemTemplate.getItemType() != EtcItemType.ARROW) && (_itemTemplate.getItemType() != EtcItemType.BOLT) && (_itemTemplate.getItemType() != EtcItemType.LURE);
 	}
 	
 	/**
@@ -555,12 +555,12 @@ public class Item extends WorldObject
 	}
 	
 	/**
-	 * Returns the characteristics of the item
-	 * @return Item
+	 * Returns the characteristics of the item.
+	 * @return ItemTemplate
 	 */
-	public ItemTemplate getItem()
+	public ItemTemplate getTemplate()
 	{
-		return _item;
+		return _itemTemplate;
 	}
 	
 	public int getCustomType1()
@@ -598,7 +598,7 @@ public class Item extends WorldObject
 	 */
 	public ItemType getItemType()
 	{
-		return _item.getItemType();
+		return _itemTemplate.getItemType();
 	}
 	
 	/**
@@ -616,7 +616,7 @@ public class Item extends WorldObject
 	 */
 	public int getDisplayId()
 	{
-		return _item.getDisplayId();
+		return _itemTemplate.getDisplayId();
 	}
 	
 	/**
@@ -624,7 +624,7 @@ public class Item extends WorldObject
 	 */
 	public boolean isEtcItem()
 	{
-		return _item instanceof EtcItem;
+		return _itemTemplate instanceof EtcItem;
 	}
 	
 	/**
@@ -632,7 +632,7 @@ public class Item extends WorldObject
 	 */
 	public boolean isWeapon()
 	{
-		return _item instanceof Weapon;
+		return _itemTemplate instanceof Weapon;
 	}
 	
 	/**
@@ -640,7 +640,7 @@ public class Item extends WorldObject
 	 */
 	public boolean isArmor()
 	{
-		return _item instanceof Armor;
+		return _itemTemplate instanceof Armor;
 	}
 	
 	/**
@@ -648,7 +648,7 @@ public class Item extends WorldObject
 	 */
 	public EtcItem getEtcItem()
 	{
-		return _item instanceof EtcItem ? (EtcItem) _item : null;
+		return _itemTemplate instanceof EtcItem ? (EtcItem) _itemTemplate : null;
 	}
 	
 	/**
@@ -656,7 +656,7 @@ public class Item extends WorldObject
 	 */
 	public Weapon getWeaponItem()
 	{
-		return _item instanceof Weapon ? (Weapon) _item : null;
+		return _itemTemplate instanceof Weapon ? (Weapon) _itemTemplate : null;
 	}
 	
 	/**
@@ -664,7 +664,7 @@ public class Item extends WorldObject
 	 */
 	public Armor getArmorItem()
 	{
-		return _item instanceof Armor ? (Armor) _item : null;
+		return _itemTemplate instanceof Armor ? (Armor) _itemTemplate : null;
 	}
 	
 	/**
@@ -672,7 +672,7 @@ public class Item extends WorldObject
 	 */
 	public int getCrystalCount()
 	{
-		return _item.getCrystalCount(_enchantLevel);
+		return _itemTemplate.getCrystalCount(_enchantLevel);
 	}
 	
 	/**
@@ -680,7 +680,7 @@ public class Item extends WorldObject
 	 */
 	public int getReferencePrice()
 	{
-		return _item.getReferencePrice();
+		return _itemTemplate.getReferencePrice();
 	}
 	
 	/**
@@ -688,7 +688,7 @@ public class Item extends WorldObject
 	 */
 	public String getItemName()
 	{
-		return _item.getName();
+		return _itemTemplate.getName();
 	}
 	
 	/**
@@ -696,7 +696,7 @@ public class Item extends WorldObject
 	 */
 	public int getReuseDelay()
 	{
-		return _item.getReuseDelay();
+		return _itemTemplate.getReuseDelay();
 	}
 	
 	/**
@@ -704,7 +704,7 @@ public class Item extends WorldObject
 	 */
 	public int getSharedReuseGroup()
 	{
-		return _item.getSharedReuseGroup();
+		return _itemTemplate.getSharedReuseGroup();
 	}
 	
 	/**
@@ -730,7 +730,7 @@ public class Item extends WorldObject
 	 */
 	public boolean isStackable()
 	{
-		return _item.isStackable();
+		return _itemTemplate.isStackable();
 	}
 	
 	/**
@@ -743,7 +743,7 @@ public class Item extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isDropable();
+		return !isAugmented() && _itemTemplate.isDropable();
 	}
 	
 	/**
@@ -756,7 +756,7 @@ public class Item extends WorldObject
 		{
 			return false;
 		}
-		return _item.isDestroyable();
+		return _itemTemplate.isDestroyable();
 	}
 	
 	/**
@@ -769,7 +769,7 @@ public class Item extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isTradeable();
+		return !isAugmented() && _itemTemplate.isTradeable();
 	}
 	
 	/**
@@ -782,7 +782,7 @@ public class Item extends WorldObject
 		{
 			return true;
 		}
-		return !isAugmented() && _item.isSellable();
+		return !isAugmented() && _itemTemplate.isSellable();
 	}
 	
 	/**
@@ -791,32 +791,32 @@ public class Item extends WorldObject
 	 */
 	public boolean isDepositable(boolean isPrivateWareHouse)
 	{
-		return !isEquipped() && _item.isDepositable() && (isPrivateWareHouse || (isTradeable() && !isShadowItem()));
+		return !isEquipped() && _itemTemplate.isDepositable() && (isPrivateWareHouse || (isTradeable() && !isShadowItem()));
 	}
 	
 	public boolean isPotion()
 	{
-		return _item.isPotion();
+		return _itemTemplate.isPotion();
 	}
 	
 	public boolean isElixir()
 	{
-		return _item.isElixir();
+		return _itemTemplate.isElixir();
 	}
 	
 	public boolean isScroll()
 	{
-		return _item.isScroll();
+		return _itemTemplate.isScroll();
 	}
 	
 	public boolean isHeroItem()
 	{
-		return _item.isHeroItem();
+		return _itemTemplate.isHeroItem();
 	}
 	
 	public boolean isCommonItem()
 	{
-		return _item.isCommon();
+		return _itemTemplate.isCommon();
 	}
 	
 	/**
@@ -825,12 +825,12 @@ public class Item extends WorldObject
 	 */
 	public boolean isPvp()
 	{
-		return _item.isPvpItem();
+		return _itemTemplate.isPvpItem();
 	}
 	
 	public boolean isOlyRestrictedItem()
 	{
-		return _item.isOlyRestrictedItem();
+		return _itemTemplate.isOlyRestrictedItem();
 	}
 	
 	/**
@@ -842,14 +842,14 @@ public class Item extends WorldObject
 	public boolean isAvailable(Player player, boolean allowAdena, boolean allowNonTradeable)
 	{
 		return ((!isEquipped()) // Not equipped
-			&& (_item.getType2() != ItemTemplate.TYPE2_QUEST) // Not Quest Item
-			&& ((_item.getType2() != ItemTemplate.TYPE2_MONEY) || (_item.getType1() != ItemTemplate.TYPE1_SHIELD_ARMOR)) // not money, not shield
+			&& (_itemTemplate.getType2() != ItemTemplate.TYPE2_QUEST) // Not Quest Item
+			&& ((_itemTemplate.getType2() != ItemTemplate.TYPE2_MONEY) || (_itemTemplate.getType1() != ItemTemplate.TYPE1_SHIELD_ARMOR)) // not money, not shield
 			&& (!player.hasSummon() || (getObjectId() != player.getSummon().getControlObjectId())) // Not Control item of currently summoned pet
 			&& (player.getActiveEnchantItemId() != getObjectId()) // Not momentarily used enchant scroll
 			&& (player.getActiveEnchantSupportItemId() != getObjectId()) // Not momentarily used enchant support item
 			&& (player.getActiveEnchantAttrItemId() != getObjectId()) // Not momentarily used enchant attribute item
 			&& (allowAdena || (_itemId != ADENA_ID)) // Not Adena
-			&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != _itemId)) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
+			&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != _itemId)) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
 	}
 	
 	/**
@@ -919,7 +919,7 @@ public class Item extends WorldObject
 		}
 		
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerAugment(getActingPlayer(), this, augmentation, true), getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerAugment(getActingPlayer(), this, augmentation, true), getTemplate());
 		return true;
 	}
 	
@@ -949,7 +949,7 @@ public class Item extends WorldObject
 		}
 		
 		// Notify to scripts.
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerAugment(getActingPlayer(), this, augment, false), getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerAugment(getActingPlayer(), this, augment, false), getTemplate());
 	}
 	
 	public void restoreAttributes()
@@ -1066,9 +1066,9 @@ public class Item extends WorldObject
 		{
 			return -2;
 		}
-		else if (_item.getElementals() != null)
+		else if (_itemTemplate.getElementals() != null)
 		{
-			return _item.getElementals()[0].getElement();
+			return _itemTemplate.getElementals()[0].getElement();
 		}
 		else if (_elementals != null)
 		{
@@ -1083,9 +1083,9 @@ public class Item extends WorldObject
 		{
 			return 0;
 		}
-		else if (_item.getElementals() != null)
+		else if (_itemTemplate.getElementals() != null)
 		{
-			return _item.getElementals()[0].getValue();
+			return _itemTemplate.getElementals()[0].getValue();
 		}
 		else if (_elementals != null)
 		{
@@ -1100,9 +1100,9 @@ public class Item extends WorldObject
 		{
 			return 0;
 		}
-		else if (_item.getElementals() != null)
+		else if (_itemTemplate.getElementals() != null)
 		{
-			final Elementals elm = _item.getElemental(element);
+			final Elementals elm = _itemTemplate.getElemental(element);
 			if (elm != null)
 			{
 				return elm.getValue();
@@ -1276,21 +1276,21 @@ public class Item extends WorldObject
 			case 10:
 			{
 				sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_10);
-				sm.addItemName(_item);
+				sm.addItemName(_itemTemplate);
 				player.sendPacket(sm);
 				break;
 			}
 			case 5:
 			{
 				sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_5);
-				sm.addItemName(_item);
+				sm.addItemName(_itemTemplate);
 				player.sendPacket(sm);
 				break;
 			}
 			case 1:
 			{
 				sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_1_IT_WILL_DISAPPEAR_SOON);
-				sm.addItemName(_item);
+				sm.addItemName(_itemTemplate);
 				player.sendPacket(sm);
 				break;
 			}
@@ -1299,7 +1299,7 @@ public class Item extends WorldObject
 		if (_mana == 0) // The life time has expired
 		{
 			sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_0_AND_THE_ITEM_HAS_DISAPPEARED);
-			sm.addItemName(_item);
+			sm.addItemName(_itemTemplate);
 			player.sendPacket(sm);
 			
 			// unequip
@@ -1381,7 +1381,7 @@ public class Item extends WorldObject
 	 */
 	public List<AbstractFunction> getStatFuncs(Creature creature)
 	{
-		return _item.getStatFuncs(this, creature);
+		return _itemTemplate.getStatFuncs(this, creature);
 	}
 	
 	/**
@@ -1555,7 +1555,7 @@ public class Item extends WorldObject
 			_owner = null;
 			
 			// Notify to scripts
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(dropper.getActingPlayer(), this, new Location(x, y, z)), getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(dropper.getActingPlayer(), this, new Location(x, y, z)), getTemplate());
 		}
 	}
 	
@@ -1681,7 +1681,7 @@ public class Item extends WorldObject
 	@Override
 	public String toString()
 	{
-		return _item + "[" + getObjectId() + "]";
+		return _itemTemplate + "[" + getObjectId() + "]";
 	}
 	
 	public void resetOwnerTimer()
@@ -1895,22 +1895,22 @@ public class Item extends WorldObject
 	
 	public boolean isQuestItem()
 	{
-		return _item.isQuestItem();
+		return _itemTemplate.isQuestItem();
 	}
 	
 	public boolean isElementable()
 	{
-		return ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) && _item.isElementable();
+		return ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) && _itemTemplate.isElementable();
 	}
 	
 	public boolean isFreightable()
 	{
-		return _item.isFreightable();
+		return _itemTemplate.isFreightable();
 	}
 	
 	public int useSkillDisTime()
 	{
-		return _item.useSkillDisTime();
+		return _itemTemplate.useSkillDisTime();
 	}
 	
 	public int getOlyEnchantLevel()
@@ -1933,12 +1933,12 @@ public class Item extends WorldObject
 	
 	public int getDefaultEnchantLevel()
 	{
-		return _item.getDefaultEnchantLevel();
+		return _itemTemplate.getDefaultEnchantLevel();
 	}
 	
 	public boolean hasPassiveSkills()
 	{
-		return (_item.getItemType() == EtcItemType.RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && _item.hasSkills();
+		return (_itemTemplate.getItemType() == EtcItemType.RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && _itemTemplate.hasSkills();
 	}
 	
 	public void giveSkillsToOwner()
@@ -1952,7 +1952,7 @@ public class Item extends WorldObject
 		
 		if (player != null)
 		{
-			for (SkillHolder sh : _item.getSkills())
+			for (SkillHolder sh : _itemTemplate.getSkills())
 			{
 				if (sh.getSkill().isPassive())
 				{
@@ -1973,7 +1973,7 @@ public class Item extends WorldObject
 		
 		if (player != null)
 		{
-			for (SkillHolder sh : _item.getSkills())
+			for (SkillHolder sh : _itemTemplate.getSkills())
 			{
 				if (sh.getSkill().isPassive())
 				{
@@ -2001,7 +2001,7 @@ public class Item extends WorldObject
 	
 	public int getEquipReuseDelay()
 	{
-		return _item.getEquipReuseDelay();
+		return _itemTemplate.getEquipReuseDelay();
 	}
 	
 	/**
@@ -2025,11 +2025,11 @@ public class Item extends WorldObject
 		
 		if (event != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemBypassEvent(this, player, event), getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnItemBypassEvent(this, player, event), getTemplate());
 		}
 		else
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnItemTalk(this, player), getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnItemTalk(this, player), getTemplate());
 		}
 	}
 	

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java

@@ -85,7 +85,7 @@ public class ClanWarehouse extends Warehouse
 		final Item item = super.addItem(process, itemId, count, actor, reference);
 		
 		// Notify to scripts
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemAdd(process, actor, item, this), item.getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemAdd(process, actor, item, this), item.getTemplate());
 		return item;
 	}
 	
@@ -93,7 +93,7 @@ public class ClanWarehouse extends Warehouse
 	public Item addItem(String process, Item item, Player actor, Object reference)
 	{
 		// Notify to scripts
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemAdd(process, actor, item, this), item.getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemAdd(process, actor, item, this), item.getTemplate());
 		return super.addItem(process, item, actor, reference);
 	}
 	
@@ -101,7 +101,7 @@ public class ClanWarehouse extends Warehouse
 	public Item destroyItem(String process, Item item, long count, Player actor, Object reference)
 	{
 		// Notify to scripts
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemDestroy(process, actor, item, count, this), item.getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemDestroy(process, actor, item, count, this), item.getTemplate());
 		return super.destroyItem(process, item, count, actor, reference);
 	}
 	
@@ -111,7 +111,7 @@ public class ClanWarehouse extends Warehouse
 		final Item item = getItemByObjectId(objectId);
 		
 		// Notify to scripts
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemTransfer(process, actor, item, count, target), item.getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerClanWHItemTransfer(process, actor, item, count, target), item.getTemplate());
 		return super.transferItem(process, objectId, count, target, actor, reference);
 	}
 }

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java

@@ -210,7 +210,7 @@ public abstract class Inventory extends ItemContainer
 			
 			if (item.getItemType() == WeaponType.BOW)
 			{
-				final Item arrow = inventory.findArrowForBow(item.getItem());
+				final Item arrow = inventory.findArrowForBow(item.getTemplate());
 				if (arrow != null)
 				{
 					inventory.setPaperdollItem(PAPERDOLL_LHAND, arrow);
@@ -218,7 +218,7 @@ public abstract class Inventory extends ItemContainer
 			}
 			else if (item.getItemType() == WeaponType.CROSSBOW)
 			{
-				final Item bolts = inventory.findBoltForCrossBow(item.getItem());
+				final Item bolts = inventory.findBoltForCrossBow(item.getTemplate());
 				if (bolts != null)
 				{
 					inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts);
@@ -269,7 +269,7 @@ public abstract class Inventory extends ItemContainer
 			final Player player = (Player) inventory.getOwner();
 			Skill enchant4Skill;
 			Skill itemSkill;
-			final ItemTemplate it = item.getItem();
+			final ItemTemplate it = item.getTemplate();
 			boolean update = false;
 			boolean updateTimeStamp = false;
 			
@@ -321,11 +321,11 @@ public abstract class Inventory extends ItemContainer
 			{
 				for (Item itm : inventory.getItems())
 				{
-					if (!itm.isEquipped() || (itm.getItem().getSkills() == null) || itm.equals(item))
+					if (!itm.isEquipped() || (itm.getTemplate().getSkills() == null) || itm.equals(item))
 					{
 						continue;
 					}
-					for (SkillHolder sk : itm.getItem().getSkills())
+					for (SkillHolder sk : itm.getTemplate().getSkills())
 					{
 						if (player.getSkillLevel(sk.getSkillId()) != 0)
 						{
@@ -384,7 +384,7 @@ public abstract class Inventory extends ItemContainer
 			final Player player = (Player) inventory.getOwner();
 			Skill enchant4Skill;
 			Skill itemSkill;
-			final ItemTemplate it = item.getItem();
+			final ItemTemplate it = item.getTemplate();
 			boolean update = false;
 			boolean updateTimeStamp = false;
 			
@@ -717,7 +717,7 @@ public abstract class Inventory extends ItemContainer
 				return;
 			}
 			
-			if (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_BRACELET)
+			if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_BRACELET)
 			{
 				inventory.unEquipItemInSlot(PAPERDOLL_DECO1);
 				inventory.unEquipItemInSlot(PAPERDOLL_DECO2);
@@ -1088,7 +1088,7 @@ public abstract class Inventory extends ItemContainer
 					final Item pi = _paperdoll[i];
 					if (pi != null)
 					{
-						mask |= pi.getItem().getItemMask();
+						mask |= pi.getTemplate().getItemMask();
 					}
 				}
 				_wearedMask = mask;
@@ -1110,7 +1110,7 @@ public abstract class Inventory extends ItemContainer
 				_paperdoll[slot] = item;
 				item.setItemLocation(getEquipLocation(), slot);
 				item.setLastChange(Item.MODIFIED);
-				_wearedMask |= item.getItem().getItemMask();
+				_wearedMask |= item.getTemplate().getItemMask();
 				for (PaperdollListener listener : _paperdollListeners)
 				{
 					if (listener == null)
@@ -1130,7 +1130,7 @@ public abstract class Inventory extends ItemContainer
 			final Creature owner = getOwner();
 			if ((owner != null) && owner.isPlayer())
 			{
-				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemUnequip(owner.getActingPlayer(), old), old.getItem());
+				EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemUnequip(owner.getActingPlayer(), old), old.getTemplate());
 			}
 		}
 		
@@ -1213,7 +1213,7 @@ public abstract class Inventory extends ItemContainer
 			}
 			case PAPERDOLL_CHEST:
 			{
-				slot = item.getItem().getBodyPart();
+				slot = item.getTemplate().getBodyPart();
 				break;
 			}
 			case PAPERDOLL_LEGS:
@@ -1492,11 +1492,11 @@ public abstract class Inventory extends ItemContainer
 			}
 		}
 		
-		final int targetSlot = item.getItem().getBodyPart();
+		final int targetSlot = item.getTemplate().getBodyPart();
 		
 		// Check if player is using Formal Wear and item isn't Wedding Bouquet.
 		final Item formal = getPaperdollItem(PAPERDOLL_CHEST);
-		if ((item.getId() != 21163) && (formal != null) && (formal.getItem().getBodyPart() == ItemTemplate.SLOT_ALLDRESS))
+		if ((item.getId() != 21163) && (formal != null) && (formal.getTemplate().getBodyPart() == ItemTemplate.SLOT_ALLDRESS))
 		{
 			// only chest target can pass this
 			switch (targetSlot)
@@ -1525,7 +1525,7 @@ public abstract class Inventory extends ItemContainer
 			case ItemTemplate.SLOT_L_HAND:
 			{
 				final Item rh = getPaperdollItem(PAPERDOLL_RHAND);
-				if ((rh != null) && (rh.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !(((rh.getItemType() == WeaponType.BOW) && (item.getItemType() == EtcItemType.ARROW)) || ((rh.getItemType() == WeaponType.CROSSBOW) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))))
+				if ((rh != null) && (rh.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !(((rh.getItemType() == WeaponType.BOW) && (item.getItemType() == EtcItemType.ARROW)) || ((rh.getItemType() == WeaponType.CROSSBOW) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))))
 				{
 					setPaperdollItem(PAPERDOLL_RHAND, null);
 				}
@@ -1594,7 +1594,7 @@ public abstract class Inventory extends ItemContainer
 			{
 				// handle full armor
 				final Item chest = getPaperdollItem(PAPERDOLL_CHEST);
-				if ((chest != null) && (chest.getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))
+				if ((chest != null) && (chest.getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))
 				{
 					setPaperdollItem(PAPERDOLL_CHEST, null);
 				}
@@ -1619,7 +1619,7 @@ public abstract class Inventory extends ItemContainer
 			case ItemTemplate.SLOT_HAIR:
 			{
 				final Item hair = getPaperdollItem(PAPERDOLL_HAIR);
-				if ((hair != null) && (hair.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))
+				if ((hair != null) && (hair.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))
 				{
 					setPaperdollItem(PAPERDOLL_HAIR2, null);
 				}
@@ -1633,7 +1633,7 @@ public abstract class Inventory extends ItemContainer
 			case ItemTemplate.SLOT_HAIR2:
 			{
 				final Item hair2 = getPaperdollItem(PAPERDOLL_HAIR);
-				if ((hair2 != null) && (hair2.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))
+				if ((hair2 != null) && (hair2.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))
 				{
 					setPaperdollItem(PAPERDOLL_HAIR, null);
 				}
@@ -1708,9 +1708,9 @@ public abstract class Inventory extends ItemContainer
 		long weight = 0;
 		for (Item item : _items)
 		{
-			if ((item != null) && (item.getItem() != null))
+			if ((item != null) && (item.getTemplate() != null))
 			{
-				weight += item.getItem().getWeight() * item.getCount();
+				weight += item.getTemplate().getWeight() * item.getCount();
 			}
 		}
 		_totalWeight = (int) Math.min(weight, Integer.MAX_VALUE);
@@ -1739,7 +1739,7 @@ public abstract class Inventory extends ItemContainer
 		Item arrow = null;
 		for (Item item : _items)
 		{
-			if (item.isEtcItem() && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus()) && (item.getEtcItem().getItemType() == EtcItemType.ARROW))
+			if (item.isEtcItem() && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus()) && (item.getEtcItem().getItemType() == EtcItemType.ARROW))
 			{
 				arrow = item;
 				break;
@@ -1760,7 +1760,7 @@ public abstract class Inventory extends ItemContainer
 		Item bolt = null;
 		for (Item item : _items)
 		{
-			if (item.isEtcItem() && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus()) && (item.getEtcItem().getItemType() == EtcItemType.BOLT))
+			if (item.isEtcItem() && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus()) && (item.getEtcItem().getItemType() == EtcItemType.BOLT))
 			{
 				bolt = item;
 				break;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java

@@ -107,7 +107,7 @@ public abstract class ItemContainer
 	{
 		for (Item item : _items)
 		{
-			if ((item != null) && item.getItem().isAllowSelfResurrection())
+			if ((item != null) && item.getTemplate().isAllowSelfResurrection())
 			{
 				return true;
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java

@@ -66,7 +66,7 @@ public class PetInventory extends Inventory
 	public boolean validateCapacity(Item item)
 	{
 		int slots = 0;
-		if ((!item.isStackable() || (getItemByItemId(item.getId()) == null)) && !item.getItem().hasExImmediateEffect())
+		if ((!item.isStackable() || (getItemByItemId(item.getId()) == null)) && !item.getTemplate().hasExImmediateEffect())
 		{
 			slots++;
 		}
@@ -116,7 +116,7 @@ public class PetInventory extends Inventory
 		// check for equipped items from other pets
 		for (Item item : _items)
 		{
-			if (item.isEquipped() && !item.getItem().checkCondition(_owner, _owner, false))
+			if (item.isEquipped() && !item.getTemplate().checkCondition(_owner, _owner, false))
 			{
 				unEquipItemInSlot(item.getLocationSlot());
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java

@@ -530,7 +530,7 @@ public class PlayerInventory extends Inventory
 		}
 		
 		// Notify to scripts
-		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getItem());
+		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemTransfer(actor, item, target), item.getTemplate());
 		return item;
 	}
 	
@@ -574,7 +574,7 @@ public class PlayerInventory extends Inventory
 		// Notify to scripts
 		if (destroyedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDestroy(actor, destroyedItem), destroyedItem.getTemplate());
 		}
 		
 		return destroyedItem;
@@ -647,7 +647,7 @@ public class PlayerInventory extends Inventory
 		// Notify to scripts
 		if (droppedItem != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, droppedItem, droppedItem.getLocation()), droppedItem.getTemplate());
 		}
 		
 		return droppedItem;
@@ -680,7 +680,7 @@ public class PlayerInventory extends Inventory
 		// Notify to scripts
 		if (item != null)
 		{
-			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+			EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemDrop(actor, item, item.getLocation()), item.getTemplate());
 		}
 		return item;
 	}
@@ -841,7 +841,7 @@ public class PlayerInventory extends Inventory
 	public boolean validateCapacity(Item item)
 	{
 		int slots = 0;
-		if (!item.isStackable() || ((getInventoryItemCount(item.getId(), -1) <= 0) && !item.getItem().hasExImmediateEffect()))
+		if (!item.isStackable() || ((getInventoryItemCount(item.getId(), -1) <= 0) && !item.getTemplate().hasExImmediateEffect()))
 		{
 			slots++;
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/FuncEnchant.java

@@ -75,7 +75,7 @@ public class FuncEnchant extends AbstractFunction
 		
 		if (getStat() == Stat.MAGIC_ATTACK)
 		{
-			switch (item.getItem().getCrystalTypePlus())
+			switch (item.getTemplate().getCrystalTypePlus())
 			{
 				case S:
 				{
@@ -108,7 +108,7 @@ public class FuncEnchant extends AbstractFunction
 		if (item.isWeapon())
 		{
 			final WeaponType type = (WeaponType) item.getItemType();
-			switch (item.getItem().getCrystalTypePlus())
+			switch (item.getTemplate().getCrystalTypePlus())
 			{
 				case S:
 				{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/stats/functions/formulas/FuncPDefMod.java

@@ -52,7 +52,7 @@ public class FuncPDefMod extends AbstractFunction
 			{
 				value -= p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_CHEST) : p.getTemplate().getBaseDefBySlot(Inventory.PAPERDOLL_CHEST);
 			}
-			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_LEGS) || (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (p.getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)))
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_LEGS) || (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (p.getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)))
 			{
 				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_LEGS) : Inventory.PAPERDOLL_LEGS);
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java

@@ -225,7 +225,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
 			return false;
 		}
 		
-		final CrystalType grade = item.getItem().getCrystalType();
+		final CrystalType grade = item.getTemplate().getCrystalType();
 		final LifeStone ls = _lifeStones.get(refinerItem.getId());
 		
 		// Check for item id
@@ -273,12 +273,12 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
 			return false;
 		}
 		// weapons can't be augmented with accessory ls
-		if ((item.getItem() instanceof Weapon) && (ls.getGrade() == GRADE_ACC))
+		if ((item.getTemplate() instanceof Weapon) && (ls.getGrade() == GRADE_ACC))
 		{
 			return false;
 		}
 		// and accessory can't be augmented with weapon ls
-		if ((item.getItem() instanceof Armor) && (ls.getGrade() != GRADE_ACC))
+		if ((item.getTemplate() instanceof Armor) && (ls.getGrade() != GRADE_ACC))
 		{
 			return false;
 		}
@@ -337,7 +337,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
 		{
 			return false;
 		}
-		if (item.getItem().getCrystalType().isLesser(CrystalType.C))
+		if (item.getTemplate().getCrystalType().isLesser(CrystalType.C))
 		{
 			return false;
 		}
@@ -356,9 +356,9 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
 			}
 		}
 		
-		if (item.getItem() instanceof Weapon)
+		if (item.getTemplate() instanceof Weapon)
 		{
-			switch (((Weapon) item.getItem()).getItemType())
+			switch (((Weapon) item.getTemplate()).getItemType())
 			{
 				case NONE:
 				case FISHINGROD:
@@ -371,10 +371,10 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket
 				}
 			}
 		}
-		else if (item.getItem() instanceof Armor)
+		else if (item.getTemplate() instanceof Armor)
 		{
 			// only accessories can be augmented
-			switch (item.getItem().getBodyPart())
+			switch (item.getTemplate().getBodyPart())
 			{
 				case ItemTemplate.SLOT_LR_FINGER:
 				case ItemTemplate.SLOT_LR_EAR:

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java

@@ -109,7 +109,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
 					}
 					else
 					{
-						if ((player.getActiveWeaponItem() != player.getFistsWeaponItem()) && (item.getItem().getCrystalType() == player.getActiveWeaponItem().getCrystalTypePlus()))
+						if ((player.getActiveWeaponItem() != player.getFistsWeaponItem()) && (item.getTemplate().getCrystalType() == player.getActiveWeaponItem().getCrystalTypePlus()))
 						{
 							player.addAutoSoulShot(_itemId);
 							player.sendPacket(new ExAutoSoulShot(_itemId, _type));

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java

@@ -139,7 +139,7 @@ public class RequestCancelPostAttachment implements IClientIncomingPacket
 				return;
 			}
 			
-			weight += item.getCount() * item.getItem().getWeight();
+			weight += item.getCount() * item.getTemplate().getWeight();
 			if (!item.isStackable())
 			{
 				slots += item.getCount();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java

@@ -73,7 +73,7 @@ public class RequestConfirmCancelItem implements IClientIncomingPacket
 		}
 		
 		int price = 0;
-		switch (item.getItem().getCrystalType())
+		switch (item.getTemplate().getCrystalType())
 		{
 			case C:
 			{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java

@@ -82,7 +82,7 @@ public class RequestConfirmGemStone extends AbstractRefinePacket
 			return;
 		}
 		
-		if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getCrystalType(), ls.getGrade()))
+		if (_gemStoneCount != getGemStoneCount(targetItem.getTemplate().getCrystalType(), ls.getGrade()))
 		{
 			player.sendPacket(SystemMessageId.GEMSTONE_QUANTITY_IS_INCORRECT);
 			return;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java

@@ -68,8 +68,8 @@ public class RequestConfirmRefinerItem extends AbstractRefinePacket
 			return;
 		}
 		
-		final int refinerItemId = refinerItem.getItem().getId();
-		final CrystalType grade = targetItem.getItem().getCrystalType();
+		final int refinerItemId = refinerItem.getTemplate().getId();
+		final CrystalType grade = targetItem.getTemplate().getCrystalType();
 		final LifeStone ls = getLifeStone(refinerItemId);
 		final int gemStoneId = getGemStoneId(grade);
 		final int gemStoneCount = getGemStoneCount(grade, ls.getGrade());

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -112,9 +112,9 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == CrystalType.NONE))
+		if (!itemToRemove.getTemplate().isCrystallizable() || (itemToRemove.getTemplate().getCrystalCount() <= 0) || (itemToRemove.getTemplate().getCrystalType() == CrystalType.NONE))
 		{
-			PacketLogger.warning(player.getName() + " (" + player.getObjectId() + ") tried to crystallize " + itemToRemove.getItem().getId());
+			PacketLogger.warning(player.getName() + " (" + player.getObjectId() + ") tried to crystallize " + itemToRemove.getTemplate().getId());
 			return;
 		}
 		
@@ -127,7 +127,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
 		// Check if the char can crystallize items and return if false;
 		boolean canCrystallize = true;
 		
-		switch (itemToRemove.getItem().getCrystalTypePlus())
+		switch (itemToRemove.getTemplate().getCrystalTypePlus())
 		{
 			case C:
 			{
@@ -204,7 +204,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
 		player.sendPacket(iu);
 		
 		// add crystals
-		final int crystalId = itemToRemove.getItem().getCrystalItemId();
+		final int crystalId = itemToRemove.getTemplate().getCrystalItemId();
 		final int crystalAmount = itemToRemove.getCrystalCount();
 		final Item createditem = player.getInventory().addItem("Crystalize", crystalId, crystalAmount, player, player);
 		sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_CRYSTALLIZED);

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java

@@ -136,7 +136,7 @@ public class RequestDestroyItem implements IClientIncomingPacket
 			count = itemToRemove.getCount();
 		}
 		
-		if (itemToRemove.getItem().isPetItem())
+		if (itemToRemove.getTemplate().isPetItem())
 		{
 			if (player.hasSummon() && (player.getSummon().getControlObjectId() == _objectId))
 			{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java

@@ -183,7 +183,7 @@ public class RequestDropItem implements IClientIncomingPacket
 			}
 		}
 		
-		if ((ItemTemplate.TYPE2_QUEST == item.getItem().getType2()) && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS))
+		if ((ItemTemplate.TYPE2_QUEST == item.getTemplate().getType2()) && !player.canOverrideCond(PlayerCondOverride.DROP_ALL_ITEMS))
 		{
 			player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED);
 			return;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java

@@ -176,7 +176,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
 				case SUCCESS:
 				{
 					Skill enchant4Skill = null;
-					final ItemTemplate it = item.getItem();
+					final ItemTemplate it = item.getTemplate();
 					// Increase enchant level only if scroll's base template has chance, some armors can success over +20 but they shouldn't have increased.
 					if (scrollTemplate.getChance(player, item) > 0)
 					{
@@ -361,10 +361,10 @@ public class RequestEnchantItem implements IClientIncomingPacket
 							
 							World.getInstance().removeObject(item);
 							
-							final int crystalId = item.getItem().getCrystalItemId();
-							if ((crystalId != 0) && item.getItem().isCrystallizable())
+							final int crystalId = item.getTemplate().getCrystalItemId();
+							if ((crystalId != 0) && item.getTemplate().isCrystallizable())
 							{
-								int count = item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2);
+								int count = item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2);
 								count = count < 1 ? 1 : count;
 								player.getInventory().addItem("Enchant", crystalId, count, player, item);
 								

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

@@ -122,11 +122,11 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 	
 	private long getPrice(Item item)
 	{
-		switch (item.getItem().getCrystalType())
+		switch (item.getTemplate().getCrystalType())
 		{
 			case S:
 			{
-				if (item.getItem() instanceof Weapon)
+				if (item.getTemplate() instanceof Weapon)
 				{
 					_price = 50000;
 				}
@@ -138,7 +138,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 			}
 			case S80:
 			{
-				if (item.getItem() instanceof Weapon)
+				if (item.getTemplate() instanceof Weapon)
 				{
 					_price = 100000;
 				}
@@ -150,7 +150,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
 			}
 			case S84:
 			{
-				if (item.getItem() instanceof Weapon)
+				if (item.getTemplate() instanceof Weapon)
 				{
 					_price = 200000;
 				}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java

@@ -63,7 +63,7 @@ public class RequestPetUseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (!item.getItem().isForNpc())
+		if (!item.getTemplate().isForNpc())
 		{
 			player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM);
 			return;
@@ -89,7 +89,7 @@ public class RequestPetUseItem implements IClientIncomingPacket
 			}
 		}
 		
-		if (!item.isEquipped() && !item.getItem().checkCondition(pet, pet, true))
+		if (!item.isEquipped() && !item.getTemplate().checkCondition(pet, pet, true))
 		{
 			return;
 		}
@@ -101,7 +101,7 @@ public class RequestPetUseItem implements IClientIncomingPacket
 	{
 		if (item.isEquipable())
 		{
-			if (!item.getItem().isConditionAttached())
+			if (!item.getTemplate().isConditionAttached())
 			{
 				player.sendPacket(SystemMessageId.THIS_PET_CANNOT_USE_THIS_ITEM);
 				return;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java

@@ -153,7 +153,7 @@ public class RequestPostAttachment implements IClientIncomingPacket
 				return;
 			}
 			
-			weight += item.getCount() * item.getItem().getWeight();
+			weight += item.getCount() * item.getTemplate().getWeight();
 			if (!item.isStackable())
 			{
 				slots += item.getCount();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java

@@ -87,7 +87,7 @@ public class RequestRefine extends AbstractRefinePacket
 		
 		final int lifeStoneLevel = ls.getLevel();
 		final int lifeStoneGrade = ls.getGrade();
-		if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getCrystalType(), lifeStoneGrade))
+		if (_gemStoneCount != getGemStoneCount(targetItem.getTemplate().getCrystalType(), lifeStoneGrade))
 		{
 			player.sendPacket(new ExVariationResult(0, 0, 0));
 			player.sendPacket(SystemMessageId.AUGMENTATION_FAILED_DUE_TO_INAPPROPRIATE_CONDITIONS);
@@ -118,7 +118,7 @@ public class RequestRefine extends AbstractRefinePacket
 			return;
 		}
 		
-		final Augmentation aug = AugmentationData.getInstance().generateRandomAugmentation(lifeStoneLevel, lifeStoneGrade, targetItem.getItem().getBodyPart(), refinerItem.getId(), targetItem);
+		final Augmentation aug = AugmentationData.getInstance().generateRandomAugmentation(lifeStoneLevel, lifeStoneGrade, targetItem.getTemplate().getBodyPart(), refinerItem.getId(), targetItem);
 		targetItem.setAugmentation(aug);
 		
 		final int stat12 = 0x0000FFFF & aug.getAugmentationId();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java

@@ -71,7 +71,7 @@ public class RequestRefineCancel implements IClientIncomingPacket
 		
 		// get the price
 		int price = 0;
-		switch (targetItem.getItem().getCrystalType())
+		switch (targetItem.getTemplate().getCrystalType())
 		{
 			case C:
 			{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java

@@ -143,7 +143,7 @@ public class RequestRefundItem implements IClientIncomingPacket
 			}
 			
 			final Item item = refund[idx];
-			final ItemTemplate template = item.getItem();
+			final ItemTemplate template = item.getTemplate();
 			objectIds[i] = item.getObjectId();
 			
 			// second check for duplicates - object ids

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java

@@ -70,7 +70,7 @@ public class RequestUnEquipItem implements IClientIncomingPacket
 		}
 		
 		// Arrows and bolts.
-		if ((_slot == ItemTemplate.SLOT_L_HAND) && (item.getItem() instanceof EtcItem))
+		if ((_slot == ItemTemplate.SLOT_L_HAND) && (item.getTemplate() instanceof EtcItem))
 		{
 			return;
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java

@@ -139,7 +139,7 @@ public class SendWareHouseWithDrawList implements IClientIncomingPacket
 				return;
 			}
 			
-			weight += i.getCount() * item.getItem().getWeight();
+			weight += i.getCount() * item.getTemplate().getWeight();
 			if (!item.isStackable())
 			{
 				slots += i.getCount();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java

@@ -103,7 +103,7 @@ public class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (item.getItem().getType2() == ItemTemplate.TYPE2_QUEST)
+		if (item.getTemplate().getType2() == ItemTemplate.TYPE2_QUEST)
 		{
 			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS);
 			return;
@@ -126,7 +126,7 @@ public class UseItem implements IClientIncomingPacket
 			return;
 		}
 		
-		if (!item.isEquipped() && !item.getItem().checkCondition(player, player, true))
+		if (!item.isEquipped() && !item.getTemplate().checkCondition(player, player, true))
 		{
 			return;
 		}
@@ -140,7 +140,7 @@ public class UseItem implements IClientIncomingPacket
 		
 		if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getKarma() > 0))
 		{
-			final SkillHolder[] skills = item.getItem().getSkills();
+			final SkillHolder[] skills = item.getTemplate().getSkills();
 			if (skills != null)
 			{
 				for (SkillHolder sHolder : skills)
@@ -198,7 +198,7 @@ public class UseItem implements IClientIncomingPacket
 				return;
 			}
 			
-			switch (item.getItem().getBodyPart())
+			switch (item.getTemplate().getBodyPart())
 			{
 				case ItemTemplate.SLOT_LR_HAND:
 				case ItemTemplate.SLOT_L_HAND:
@@ -231,7 +231,7 @@ public class UseItem implements IClientIncomingPacket
 					// Don't allow other Race to Wear Kamael exclusive Weapons.
 					if (!item.isEquipped() && item.isWeapon() && !player.canOverrideCond(PlayerCondOverride.ITEM_CONDITIONS))
 					{
-						final Weapon wpn = (Weapon) item.getItem();
+						final Weapon wpn = (Weapon) item.getTemplate();
 						
 						switch (player.getRace())
 						{
@@ -277,7 +277,7 @@ public class UseItem implements IClientIncomingPacket
 				case ItemTemplate.SLOT_FULL_ARMOR:
 				case ItemTemplate.SLOT_LEGS:
 				{
-					if ((player.getRace() == Race.KAMAEL) && ((item.getItem().getItemType() == ArmorType.HEAVY) || (item.getItem().getItemType() == ArmorType.MAGIC)))
+					if ((player.getRace() == Race.KAMAEL) && ((item.getTemplate().getItemType() == ArmorType.HEAVY) || (item.getTemplate().getItemType() == ArmorType.MAGIC)))
 					{
 						player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM);
 						return;

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java

@@ -39,7 +39,7 @@ public class EquipUpdate implements IClientOutgoingPacket
 		OutgoingPackets.EQUIP_UPDATE.writeId(packet);
 		packet.writeD(_change);
 		packet.writeD(_item.getObjectId());
-		switch (_item.getItem().getBodyPart())
+		switch (_item.getTemplate().getBodyPart())
 		{
 			case ItemTemplate.SLOT_L_EAR:
 			{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java

@@ -54,7 +54,7 @@ public class ExBuySellList extends AbstractItemPacket
 			for (Item item : _sellList)
 			{
 				writeItem(packet, item);
-				packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getItem().getReferencePrice() / 2);
+				packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getTemplate().getReferencePrice() / 2);
 			}
 		}
 		else
@@ -69,7 +69,7 @@ public class ExBuySellList extends AbstractItemPacket
 			{
 				writeItem(packet, item);
 				packet.writeD(i++);
-				packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : (item.getItem().getReferencePrice() / 2) * item.getCount());
+				packet.writeQ(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : (item.getTemplate().getReferencePrice() / 2) * item.getCount());
 			}
 		}
 		else

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExRpItemLink.java

@@ -40,10 +40,10 @@ public class ExRpItemLink implements IClientOutgoingPacket
 		packet.writeD(_item.getDisplayId());
 		packet.writeD(_item.getLocationSlot());
 		packet.writeQ(_item.getCount());
-		packet.writeH(_item.getItem().getType2());
+		packet.writeH(_item.getTemplate().getType2());
 		packet.writeH(_item.getCustomType1());
 		packet.writeH(_item.isEquipped() ? 1 : 0);
-		packet.writeD(_item.getItem().getBodyPart());
+		packet.writeD(_item.getTemplate().getBodyPart());
 		packet.writeH(_item.getEnchantLevel());
 		packet.writeH(_item.getCustomType2());
 		if (_item.isAugmented())

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java

@@ -54,11 +54,11 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket
 	 */
 	private long getPrice(Item item)
 	{
-		switch (item.getItem().getCrystalType())
+		switch (item.getTemplate().getCrystalType())
 		{
 			case S:
 			{
-				if (item.getItem() instanceof Weapon)
+				if (item.getTemplate() instanceof Weapon)
 				{
 					_price = 50000;
 				}
@@ -70,7 +70,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket
 			}
 			case S80:
 			{
-				if (item.getItem() instanceof Weapon)
+				if (item.getTemplate() instanceof Weapon)
 				{
 					_price = 100000;
 				}
@@ -82,7 +82,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket
 			}
 			case S84:
 			{
-				if (item.getItem() instanceof Weapon)
+				if (item.getTemplate() instanceof Weapon)
 				{
 					_price = 200000;
 				}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java

@@ -51,7 +51,7 @@ public class PrivateStoreManageListBuy extends AbstractItemPacket
 		for (Item item : _itemList)
 		{
 			writeItem(packet, item);
-			packet.writeQ(item.getItem().getReferencePrice() * 2);
+			packet.writeQ(item.getTemplate().getReferencePrice() * 2);
 		}
 		// section 3
 		packet.writeD(_buyList.size()); // count for all items already added for buy

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java

@@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket
 		for (Entry<Item, Long> entry : _sellList.entrySet())
 		{
 			final Item item = entry.getKey();
-			packet.writeH(item.getItem().getType1());
+			packet.writeH(item.getTemplate().getType1());
 			packet.writeD(item.getObjectId());
 			packet.writeD(item.getDisplayId());
 			packet.writeQ(entry.getValue()); // count
-			packet.writeH(item.getItem().getType2());
+			packet.writeH(item.getTemplate().getType2());
 			packet.writeH(0); // unknown
 			packet.writeQ(0); // price, you shouldnt get any adena for crops, only raw materials
 		}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java

@@ -436,7 +436,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if ((item.isWeapon() || (item.getItem().getType2() == ItemTemplate.TYPE2_WEAPON) || (item.isEtcItem() && (item.getItemType() == EtcItemType.ARROW)) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if ((item.isWeapon() || (item.getTemplate().getType2() == ItemTemplate.TYPE2_WEAPON) || (item.isEtcItem() && (item.getItemType() == EtcItemType.ARROW)) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -456,7 +456,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if ((item.isArmor() || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if ((item.isArmor() || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -476,7 +476,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if ((item.isEtcItem() || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if ((item.isEtcItem() || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -496,7 +496,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.MATERIAL)) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.MATERIAL)) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -516,7 +516,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.RECIPE)) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.RECIPE)) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -536,7 +536,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -556,7 +556,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -576,7 +576,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && ((item.getEtcItem().getItemType() == EtcItemType.SCROLL) || (item.getEtcItem().getItemType() == EtcItemType.SHOT))) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && ((item.getEtcItem().getItemType() == EtcItemType.SCROLL) || (item.getEtcItem().getItemType() == EtcItemType.SHOT))) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -596,7 +596,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SHOT)) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SHOT)) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -616,7 +616,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SCROLL)) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SCROLL)) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -636,7 +636,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SEED)) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SEED)) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}
@@ -656,7 +656,7 @@ public class SortedWareHouseWithdrawalList implements IClientOutgoingPacket
 		final List<WarehouseItem> list = new ArrayList<>();
 		for (Item item : items)
 		{
-			if (((item.isEtcItem() && ((item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT))) || (item.getItem().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
+			if (((item.isEtcItem() && ((item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT))) || (item.getTemplate().getType2() == ItemTemplate.TYPE2_MONEY)) && (list.size() < MAX_SORT_LIST_ITEMS))
 			{
 				list.add(new WarehouseItem(item));
 			}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java

@@ -53,11 +53,11 @@ public class ItemsAutoDestroyTaskManager implements Runnable
 			else
 			{
 				final long autoDestroyTime;
-				if (item.getItem().getAutoDestroyTime() > 0)
+				if (item.getTemplate().getAutoDestroyTime() > 0)
 				{
-					autoDestroyTime = item.getItem().getAutoDestroyTime();
+					autoDestroyTime = item.getTemplate().getAutoDestroyTime();
 				}
-				else if (item.getItem().hasExImmediateEffect())
+				else if (item.getTemplate().hasExImmediateEffect())
 				{
 					autoDestroyTime = Config.HERB_AUTO_DESTROY_TIME;
 				}

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/EnchantFormatter.java

@@ -64,7 +64,7 @@ public class EnchantFormatter extends Formatter
 					{
 						StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
 					}
-					StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
+					StringUtil.append(output, item.getTemplate().getName(), "(", String.valueOf(item.getCount()), ")");
 					StringUtil.append(output, " [", String.valueOf(item.getObjectId()), "]");
 				}
 				else if (p instanceof Skill)

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/log/formatter/ItemLogFormatter.java

@@ -56,7 +56,7 @@ public class ItemLogFormatter extends Formatter
 						StringUtil.append(output, "+", String.valueOf(item.getEnchantLevel()), " ");
 					}
 					
-					StringUtil.append(output, item.getItem().getName(), "(", String.valueOf(item.getCount()), ")");
+					StringUtil.append(output, item.getTemplate().getName(), "(", String.valueOf(item.getCount()), ")");
 				}
 				else
 				{