diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index cc602e09a6..05164d2b60 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -203,8 +203,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 + "."); } } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index daaa20e832..fcea73c982 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index b52edb27a1..f3d022ed6f 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -69,7 +69,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_01.0_Ertheia/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; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 0ad488d187..ade1c2018b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index db39fd9a60..01e52eb2f4 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -78,7 +78,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 322d2e3d19..f5bb005445 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index edea265390..921a62c93e 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // 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) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_01.0_Ertheia/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; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java index 914259543f..99f3156379 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -307,7 +307,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 @@ -316,7 +316,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 @@ -350,7 +350,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; } @@ -395,7 +395,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 @@ -405,7 +405,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 @@ -440,7 +440,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=?")) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index 651d722d20..77126b658c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -153,7 +153,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index af08fba9a6..d4d98581fb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1573,7 +1573,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0669f2ed6f..0fc96c33c7 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_01.0_Ertheia/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); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java index be9f4aed00..48c6ce61eb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -94,7 +94,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_01.0_Ertheia/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(); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java index ffaddf73a1..42aa0f150f 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -53,7 +53,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java index d5b015edc0..13275178e3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index 7420babf23..c0400c67d4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2137,7 +2137,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)) @@ -2268,13 +2268,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4504,7 +4504,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) @@ -4788,7 +4788,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4808,7 +4808,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4818,7 +4818,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4829,7 +4829,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4840,7 +4840,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4851,7 +4851,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4873,7 +4873,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5112,7 +5112,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 ((_pet != null) && (_pet.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 @@ -5124,7 +5124,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 @@ -5918,7 +5918,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5959,7 +5959,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8832,7 +8832,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11737,7 +11737,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); @@ -11746,7 +11746,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 9bde63c8f1..d80071ca22 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 602a9433ef..37e077707c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -126,9 +126,9 @@ public class PlayerStat extends PlayableStat { // rod fishing skills final Item rod = player.getActiveWeaponInstance(); - if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getItem().getAllSkills() != null)) + if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getTemplate().getAllSkills() != null)) { - for (ItemSkillHolder s : rod.getItem().getAllSkills()) + for (ItemSkillHolder s : rod.getTemplate().getAllSkills()) { if (s.getSkill().getId() == FANCY_FISHING_ROD_SKILL) { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 57e7410493..9f62a57872 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 3165db0756..e8e54c1c14 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2959,7 +2959,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index f3f56d7985..c2f79de02d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -68,7 +68,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -76,7 +76,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 4736db96a7..18d7b61ca2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 8890655085..5d3a79d524 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -172,11 +172,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -184,7 +184,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 28206a00fe..f217830d8e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -183,7 +183,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -217,7 +217,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 5c288c04fb..f58ca404fb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -120,7 +120,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; @@ -184,18 +184,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -203,22 +203,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -297,7 +297,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()); } } @@ -314,14 +314,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 @@ -330,7 +330,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 @@ -486,14 +486,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 @@ -503,7 +503,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 @@ -545,7 +545,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -556,7 +556,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -578,12 +578,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() @@ -621,7 +621,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -639,7 +639,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -647,7 +647,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -655,7 +655,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -663,7 +663,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -671,9 +671,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -707,7 +707,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -715,7 +715,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -723,7 +723,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -731,7 +731,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -739,7 +739,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -765,7 +765,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -778,7 +778,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -791,7 +791,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -804,7 +804,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -817,7 +817,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -827,7 +827,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -841,27 +841,27 @@ public class Item extends WorldObject 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(); } /** @@ -870,12 +870,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -889,12 +889,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -972,7 +972,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; } @@ -1002,7 +1002,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() @@ -1139,9 +1139,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1167,9 +1167,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1341,21 +1341,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; } @@ -1364,7 +1364,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 @@ -1532,7 +1532,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()); } } @@ -1682,7 +1682,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1716,7 +1716,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1728,14 +1728,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1887,26 +1887,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1921,7 +1921,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -1942,7 +1942,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -1955,7 +1955,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -1976,7 +1976,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2005,7 +2005,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2026,11 +2026,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()); } } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 448e98e0e6..f9c87f7233 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -246,7 +246,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); @@ -254,7 +254,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -303,7 +303,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -365,7 +365,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -416,12 +416,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -499,7 +499,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel()) + if (item.getTemplate().getCrystalType().getLevel() > player.getExpertiseLevel()) { return; } @@ -519,9 +519,9 @@ public abstract class Inventory extends ItemContainer // Apply enchant stats item.applyEnchantStats(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -563,7 +563,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -615,12 +615,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -666,7 +666,7 @@ public abstract class Inventory extends ItemContainer } // Apply skill, if weapon have "skills on equip" - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); if (!addedSkills.isEmpty()) { @@ -727,7 +727,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -872,7 +872,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -897,7 +897,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); @@ -933,7 +933,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1331,7 +1331,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1350,7 +1350,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; @@ -1372,7 +1372,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1385,7 +1385,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1413,7 +1413,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()); } } @@ -1515,7 +1515,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1823,7 +1823,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -1837,11 +1837,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) @@ -1870,7 +1870,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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -1939,7 +1939,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); } @@ -1964,7 +1964,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); } @@ -1978,7 +1978,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); } @@ -2063,9 +2063,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); @@ -2094,7 +2094,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2115,7 +2115,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_01.0_Ertheia/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()); } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 113ceea87e..2c496344ca 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -427,7 +427,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -502,7 +502,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -533,7 +533,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; } @@ -589,7 +589,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; @@ -662,7 +662,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; @@ -695,7 +695,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; @@ -865,7 +865,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++; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 2f35f009f9..b118a37bb6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 6b1c040b5a..bb2bc4171b 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final int bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index da29d1caa9..3450b57716 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final int bodyPart = item.getItem().getBodyPart(); + final int bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index cb994ce561..317521bf87 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index df031f1a8f..e121f47c92 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -462,7 +462,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 2d209f1612..bed8381fbe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index af7fb9e954..3954ae70e6 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 6b1a8b5d37..58ecc9d5aa 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 8c43263df9..7d22ef763e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index e997c5dd50..3dfb5af951 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 800852ad71..6547ad9bfe 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -118,7 +118,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -384,13 +384,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f35c069743..c2cde73953 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d8b2285a2d..23a8e39d37 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_01.0_Ertheia/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; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index c3a945d274..bd00745002 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 306a9b31b4..964732f210 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_01.0_Ertheia/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; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 54b59f3ea5..d8819af657 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index cd4f0c7c64..c82873c2f2 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,13 +198,13 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } - switch (item.getItem().getBodyPart()) + switch (item.getTemplate().getBodyPart()) { case ItemTemplate.SLOT_LR_HAND: case ItemTemplate.SLOT_L_HAND: diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 5e95f8b9b8..fd35348cd0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -49,7 +49,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); } packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_01.0_Ertheia/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; } diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_01.0_Ertheia/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) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_01.0_Ertheia/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 { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index cc602e09a6..05164d2b60 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -203,8 +203,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 + "."); } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index daaa20e832..fcea73c982 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_02.5_Underground/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; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f137988e26..4933104fec 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index db39fd9a60..01e52eb2f4 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -78,7 +78,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 9c33309006..48f3f52d1d 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index edea265390..921a62c93e 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // 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) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_02.5_Underground/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; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java index 914259543f..99f3156379 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -307,7 +307,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 @@ -316,7 +316,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 @@ -350,7 +350,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; } @@ -395,7 +395,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 @@ -405,7 +405,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 @@ -440,7 +440,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=?")) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index 651d722d20..77126b658c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -153,7 +153,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index af08fba9a6..d4d98581fb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1573,7 +1573,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0669f2ed6f..0fc96c33c7 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_02.5_Underground/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); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_02.5_Underground/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(); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index 88002290a3..f094fa6e3c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2139,7 +2139,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)) @@ -2270,13 +2270,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4506,7 +4506,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) @@ -4790,7 +4790,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4810,7 +4810,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4820,7 +4820,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4831,7 +4831,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4842,7 +4842,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4853,7 +4853,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4875,7 +4875,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5114,7 +5114,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 ((_pet != null) && (_pet.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 @@ -5126,7 +5126,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 @@ -5920,7 +5920,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5961,7 +5961,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8835,7 +8835,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11740,7 +11740,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); @@ -11749,7 +11749,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 9bde63c8f1..d80071ca22 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index abc5dd244b..cbe1ca8a50 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -127,9 +127,9 @@ public class PlayerStat extends PlayableStat { // rod fishing skills final Item rod = player.getActiveWeaponInstance(); - if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getItem().getAllSkills() != null)) + if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getTemplate().getAllSkills() != null)) { - for (ItemSkillHolder s : rod.getItem().getAllSkills()) + for (ItemSkillHolder s : rod.getTemplate().getAllSkills()) { if (s.getSkill().getId() == FANCY_FISHING_ROD_SKILL) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 57e7410493..9f62a57872 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 3165db0756..e8e54c1c14 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2959,7 +2959,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index e092feea62..a3f1778d8b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 4736db96a7..18d7b61ca2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 8890655085..5d3a79d524 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -172,11 +172,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -184,7 +184,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 28206a00fe..f217830d8e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -183,7 +183,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -217,7 +217,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java index a884b0c776..16c85f8ecf 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -122,7 +122,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; @@ -188,18 +188,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -207,22 +207,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -302,7 +302,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()); } } @@ -319,14 +319,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 @@ -335,7 +335,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 @@ -491,14 +491,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 @@ -508,7 +508,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 @@ -550,7 +550,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -561,7 +561,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -583,12 +583,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() @@ -626,7 +626,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -644,7 +644,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -652,7 +652,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -660,7 +660,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -668,7 +668,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -676,9 +676,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -688,9 +688,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -700,9 +700,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -712,7 +712,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -720,7 +720,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -728,7 +728,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -736,7 +736,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -744,7 +744,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -770,7 +770,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -783,7 +783,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -796,7 +796,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -809,7 +809,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -822,7 +822,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -832,7 +832,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -846,27 +846,27 @@ public class Item extends WorldObject 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(); } /** @@ -875,12 +875,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -977,7 +977,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; } @@ -1007,7 +1007,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() @@ -1144,9 +1144,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1172,9 +1172,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1346,21 +1346,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; } @@ -1369,7 +1369,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 @@ -1537,7 +1537,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()); } } @@ -1693,7 +1693,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1727,7 +1727,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1739,14 +1739,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1898,26 +1898,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1932,7 +1932,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -1953,7 +1953,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -1966,7 +1966,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -1987,7 +1987,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2016,7 +2016,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2037,11 +2037,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()); } } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index da8b3fa990..a9ae69da95 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -246,7 +246,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); @@ -254,7 +254,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -303,7 +303,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -368,7 +368,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -419,12 +419,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -502,7 +502,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel()) + if (item.getTemplate().getCrystalType().getLevel() > player.getExpertiseLevel()) { return; } @@ -525,9 +525,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -569,7 +569,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -621,12 +621,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -672,7 +672,7 @@ public abstract class Inventory extends ItemContainer } // Apply skill, if weapon have "skills on equip" - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); if (!addedSkills.isEmpty()) { @@ -733,7 +733,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -878,7 +878,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -903,7 +903,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); @@ -939,7 +939,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1337,7 +1337,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1356,7 +1356,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; @@ -1378,7 +1378,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1391,7 +1391,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1419,7 +1419,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()); } } @@ -1521,7 +1521,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1829,7 +1829,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -1843,11 +1843,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) @@ -1876,7 +1876,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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -1945,7 +1945,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); } @@ -1970,7 +1970,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); } @@ -1984,7 +1984,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); } @@ -2069,9 +2069,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); @@ -2100,7 +2100,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2121,7 +2121,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_02.5_Underground/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()); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 01b52975d0..78a89c5cd3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -427,7 +427,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -502,7 +502,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -533,7 +533,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; } @@ -589,7 +589,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; @@ -662,7 +662,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; @@ -695,7 +695,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; @@ -865,7 +865,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++; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index c992aad09b..9446924cb1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 6b1c040b5a..bb2bc4171b 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final int bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index da29d1caa9..3450b57716 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final int bodyPart = item.getItem().getBodyPart(); + final int bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index cb994ce561..317521bf87 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 4be5cd095a..8eb51bc798 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 6795fe94e2..ef9146c66d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index af7fb9e954..3954ae70e6 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 6b1a8b5d37..58ecc9d5aa 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 8c43263df9..7d22ef763e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index e997c5dd50..3dfb5af951 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 1a32c04441..d0df287db5 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -118,7 +118,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -384,13 +384,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f35c069743..c2cde73953 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d8b2285a2d..23a8e39d37 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_02.5_Underground/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; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index c3a945d274..bd00745002 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 306a9b31b4..964732f210 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_02.5_Underground/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; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 54b59f3ea5..d8819af657 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index cd4f0c7c64..c82873c2f2 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,13 +198,13 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } - switch (item.getItem().getBodyPart()) + switch (item.getTemplate().getBodyPart()) { case ItemTemplate.SLOT_LR_HAND: case ItemTemplate.SLOT_L_HAND: diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 5e95f8b9b8..fd35348cd0 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -49,7 +49,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); } packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_02.5_Underground/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; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_02.5_Underground/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) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_02.5_Underground/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 { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index cc602e09a6..05164d2b60 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -203,8 +203,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 + "."); } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index daaa20e832..fcea73c982 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_03.0_Helios/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; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f137988e26..4933104fec 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index db39fd9a60..01e52eb2f4 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -78,7 +78,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 9c33309006..48f3f52d1d 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index edea265390..921a62c93e 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // 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) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_03.0_Helios/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; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java index 914259543f..99f3156379 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -307,7 +307,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 @@ -316,7 +316,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 @@ -350,7 +350,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; } @@ -395,7 +395,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 @@ -405,7 +405,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 @@ -440,7 +440,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=?")) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index 651d722d20..77126b658c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -153,7 +153,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index af08fba9a6..d4d98581fb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1573,7 +1573,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0669f2ed6f..0fc96c33c7 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_03.0_Helios/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); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_03.0_Helios/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(); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index 036a5162dd..26cb297be0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2141,7 +2141,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)) @@ -2272,13 +2272,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4508,7 +4508,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) @@ -4792,7 +4792,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4812,7 +4812,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4822,7 +4822,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4833,7 +4833,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4844,7 +4844,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4855,7 +4855,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4877,7 +4877,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5116,7 +5116,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 ((_pet != null) && (_pet.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 @@ -5128,7 +5128,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 @@ -5922,7 +5922,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5963,7 +5963,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8837,7 +8837,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11742,7 +11742,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); @@ -11751,7 +11751,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 9bde63c8f1..d80071ca22 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index abc5dd244b..cbe1ca8a50 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -127,9 +127,9 @@ public class PlayerStat extends PlayableStat { // rod fishing skills final Item rod = player.getActiveWeaponInstance(); - if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getItem().getAllSkills() != null)) + if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getTemplate().getAllSkills() != null)) { - for (ItemSkillHolder s : rod.getItem().getAllSkills()) + for (ItemSkillHolder s : rod.getTemplate().getAllSkills()) { if (s.getSkill().getId() == FANCY_FISHING_ROD_SKILL) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 57e7410493..9f62a57872 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index e092feea62..a3f1778d8b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 4736db96a7..18d7b61ca2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 8890655085..5d3a79d524 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -172,11 +172,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -184,7 +184,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index 28206a00fe..f217830d8e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -183,7 +183,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -217,7 +217,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java index a884b0c776..16c85f8ecf 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -122,7 +122,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; @@ -188,18 +188,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -207,22 +207,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -302,7 +302,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()); } } @@ -319,14 +319,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 @@ -335,7 +335,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 @@ -491,14 +491,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 @@ -508,7 +508,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 @@ -550,7 +550,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -561,7 +561,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -583,12 +583,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() @@ -626,7 +626,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -644,7 +644,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -652,7 +652,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -660,7 +660,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -668,7 +668,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -676,9 +676,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -688,9 +688,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -700,9 +700,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -712,7 +712,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -720,7 +720,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -728,7 +728,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -736,7 +736,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -744,7 +744,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -770,7 +770,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -783,7 +783,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -796,7 +796,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -809,7 +809,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -822,7 +822,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -832,7 +832,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -846,27 +846,27 @@ public class Item extends WorldObject 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(); } /** @@ -875,12 +875,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -977,7 +977,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; } @@ -1007,7 +1007,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() @@ -1144,9 +1144,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1172,9 +1172,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1346,21 +1346,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; } @@ -1369,7 +1369,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 @@ -1537,7 +1537,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()); } } @@ -1693,7 +1693,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1727,7 +1727,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1739,14 +1739,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1898,26 +1898,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1932,7 +1932,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -1953,7 +1953,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -1966,7 +1966,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -1987,7 +1987,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2016,7 +2016,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2037,11 +2037,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()); } } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index da8b3fa990..a9ae69da95 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -246,7 +246,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); @@ -254,7 +254,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -303,7 +303,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -368,7 +368,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -419,12 +419,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -502,7 +502,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().getLevel() > player.getExpertiseLevel()) + if (item.getTemplate().getCrystalType().getLevel() > player.getExpertiseLevel()) { return; } @@ -525,9 +525,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -569,7 +569,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -621,12 +621,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -672,7 +672,7 @@ public abstract class Inventory extends ItemContainer } // Apply skill, if weapon have "skills on equip" - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); if (!addedSkills.isEmpty()) { @@ -733,7 +733,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -878,7 +878,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -903,7 +903,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); @@ -939,7 +939,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1337,7 +1337,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1356,7 +1356,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; @@ -1378,7 +1378,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1391,7 +1391,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1419,7 +1419,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()); } } @@ -1521,7 +1521,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1829,7 +1829,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -1843,11 +1843,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) @@ -1876,7 +1876,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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -1945,7 +1945,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); } @@ -1970,7 +1970,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); } @@ -1984,7 +1984,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); } @@ -2069,9 +2069,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); @@ -2100,7 +2100,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2121,7 +2121,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_03.0_Helios/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()); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 01b52975d0..78a89c5cd3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -427,7 +427,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -502,7 +502,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -533,7 +533,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; } @@ -589,7 +589,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; @@ -662,7 +662,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; @@ -695,7 +695,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; @@ -865,7 +865,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++; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index c992aad09b..9446924cb1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 6b1c040b5a..bb2bc4171b 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final int bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index da29d1caa9..3450b57716 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final int bodyPart = item.getItem().getBodyPart(); + final int bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index cb994ce561..317521bf87 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 4be5cd095a..8eb51bc798 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 6795fe94e2..ef9146c66d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index af7fb9e954..3954ae70e6 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 6b1a8b5d37..58ecc9d5aa 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 8c43263df9..7d22ef763e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index e997c5dd50..3dfb5af951 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 1a32c04441..d0df287db5 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -118,7 +118,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -384,13 +384,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f35c069743..c2cde73953 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d8b2285a2d..23a8e39d37 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_03.0_Helios/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; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index c3a945d274..bd00745002 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 306a9b31b4..964732f210 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_03.0_Helios/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; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 54b59f3ea5..d8819af657 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index cd4f0c7c64..c82873c2f2 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,13 +198,13 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } - switch (item.getItem().getBodyPart()) + switch (item.getTemplate().getBodyPart()) { case ItemTemplate.SLOT_LR_HAND: case ItemTemplate.SLOT_L_HAND: diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 5e95f8b9b8..fd35348cd0 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -49,7 +49,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); } packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_03.0_Helios/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; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_03.0_Helios/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) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_03.0_Helios/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 { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index cc602e09a6..05164d2b60 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -203,8 +203,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 + "."); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index daaa20e832..fcea73c982 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_04.0_GrandCrusade/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; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f137988e26..4933104fec 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index db39fd9a60..01e52eb2f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -78,7 +78,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 9c33309006..48f3f52d1d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index edea265390..921a62c93e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // 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) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_04.0_GrandCrusade/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; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java index 914259543f..99f3156379 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -307,7 +307,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 @@ -316,7 +316,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 @@ -350,7 +350,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; } @@ -395,7 +395,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 @@ -405,7 +405,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 @@ -440,7 +440,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=?")) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index 651d722d20..77126b658c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -153,7 +153,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index af08fba9a6..d4d98581fb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1573,7 +1573,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0669f2ed6f..0fc96c33c7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/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(); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 9a73b3aa75..44446fbfb2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2156,7 +2156,7 @@ public class Player extends Playable final CrystalType expertiseLevel = _expertiseLevel.plusLevel(_expertisePenaltyBonus); int armorPenalty = 0; int weaponPenalty = 0; - for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getItem().getCrystalType().isGreater(expertiseLevel))) + for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getTemplate().getCrystalType().isGreater(expertiseLevel))) { if (item.isArmor()) { @@ -2166,7 +2166,7 @@ public class Player extends Playable else { // Weapon penalty level increases based on grade difference. - weaponPenalty = CommonUtil.constrain(item.getItem().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); + weaponPenalty = CommonUtil.constrain(item.getTemplate().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); } } @@ -2279,13 +2279,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4504,7 +4504,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) @@ -4788,7 +4788,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4808,7 +4808,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4818,7 +4818,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4829,7 +4829,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4840,7 +4840,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4851,7 +4851,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4873,7 +4873,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5112,7 +5112,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 ((_pet != null) && (_pet.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 @@ -5124,7 +5124,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 @@ -5917,7 +5917,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5958,7 +5958,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8832,7 +8832,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11723,7 +11723,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); @@ -11732,7 +11732,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 9bde63c8f1..d80071ca22 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index f723923af0..3df3827eb7 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -127,9 +127,9 @@ public class PlayerStat extends PlayableStat { // rod fishing skills final Item rod = player.getActiveWeaponInstance(); - if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getItem().getAllSkills() != null)) + if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD) && (rod.getTemplate().getAllSkills() != null)) { - for (ItemSkillHolder s : rod.getItem().getAllSkills()) + for (ItemSkillHolder s : rod.getTemplate().getAllSkills()) { if (s.getSkill().getId() == FANCY_FISHING_ROD_SKILL) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index 57e7410493..9f62a57872 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index e092feea62..a3f1778d8b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 4736db96a7..18d7b61ca2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java index ddcb9afdf0..5bbc422ad3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -122,7 +122,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; @@ -188,18 +188,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -207,22 +207,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -302,7 +302,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()); } } @@ -319,14 +319,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 @@ -335,7 +335,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 @@ -491,14 +491,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 @@ -508,7 +508,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 @@ -550,7 +550,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -561,7 +561,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -583,12 +583,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() @@ -626,7 +626,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -644,7 +644,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -652,7 +652,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -660,7 +660,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -668,7 +668,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -676,9 +676,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -688,9 +688,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -700,9 +700,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -712,7 +712,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -720,7 +720,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -728,7 +728,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -736,7 +736,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -744,7 +744,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -770,7 +770,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -783,7 +783,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -796,7 +796,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -809,7 +809,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -822,7 +822,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -832,7 +832,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -846,27 +846,27 @@ public class Item extends WorldObject 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(); } /** @@ -875,12 +875,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -894,12 +894,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -977,7 +977,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; } @@ -1007,7 +1007,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() @@ -1144,9 +1144,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1172,9 +1172,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1346,21 +1346,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; } @@ -1369,7 +1369,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 @@ -1537,7 +1537,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()); } } @@ -1693,7 +1693,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1727,7 +1727,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1739,14 +1739,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1898,26 +1898,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1932,7 +1932,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -1953,7 +1953,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -1966,7 +1966,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -1987,7 +1987,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2016,7 +2016,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2037,11 +2037,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()); } } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 215eaf43c9..774a796220 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -246,7 +246,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); @@ -254,7 +254,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -303,7 +303,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -368,7 +368,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -419,12 +419,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -502,7 +502,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().isGreater(player.getExpertiseLevel())) + if (item.getTemplate().getCrystalType().isGreater(player.getExpertiseLevel())) { return; } @@ -525,9 +525,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -569,7 +569,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -621,12 +621,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -672,7 +672,7 @@ public abstract class Inventory extends ItemContainer } // Apply skill, if weapon have "skills on equip" - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); if (!addedSkills.isEmpty()) { @@ -733,7 +733,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -878,7 +878,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -903,7 +903,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); @@ -939,7 +939,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1337,7 +1337,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1356,7 +1356,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; @@ -1378,7 +1378,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1391,7 +1391,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1419,7 +1419,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()); } } @@ -1521,7 +1521,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1829,7 +1829,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -1843,11 +1843,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) @@ -1876,7 +1876,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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -1945,7 +1945,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); } @@ -1970,7 +1970,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); } @@ -1984,7 +1984,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); } @@ -2069,9 +2069,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); @@ -2100,7 +2100,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2121,7 +2121,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/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()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 01b52975d0..78a89c5cd3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -427,7 +427,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -502,7 +502,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -533,7 +533,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; } @@ -589,7 +589,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; @@ -662,7 +662,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; @@ -695,7 +695,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; @@ -865,7 +865,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++; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index c992aad09b..9446924cb1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 6b1c040b5a..bb2bc4171b 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final int bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index da29d1caa9..3450b57716 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final int bodyPart = item.getItem().getBodyPart(); + final int bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index cb994ce561..317521bf87 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 4be5cd095a..8eb51bc798 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 6795fe94e2..ef9146c66d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index af7fb9e954..3954ae70e6 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 6b1a8b5d37..58ecc9d5aa 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 8c43263df9..7d22ef763e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index e997c5dd50..3dfb5af951 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 00484c7b33..1384ed3e7e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -118,7 +118,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -385,13 +385,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f35c069743..c2cde73953 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index d8b2285a2d..23a8e39d37 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/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; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index c3a945d274..bd00745002 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 0ab9577343..f6d0f8bea4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 7ca2a01f2e..00c13da58d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 306a9b31b4..964732f210 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 54b59f3ea5..d8819af657 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index cd4f0c7c64..c82873c2f2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,13 +198,13 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } - switch (item.getItem().getBodyPart()) + switch (item.getTemplate().getBodyPart()) { case ItemTemplate.SLOT_LR_HAND: case ItemTemplate.SLOT_L_HAND: diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index 5e95f8b9b8..fd35348cd0 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -49,7 +49,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); } packet.writeD(_buyList.size()); // count for all items already added for buy for (TradeItem item : _buyList) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_04.0_GrandCrusade/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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_04.0_GrandCrusade/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) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_04.0_GrandCrusade/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 { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index cc602e09a6..05164d2b60 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -203,8 +203,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 + "."); } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 13a396d5b5..a24b3d9cd4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_05.0_Salvation/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; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f137988e26..4933104fec 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 0414eeb3b0..80afc492c2 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -166,12 +166,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; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 1f95510e6c..07132501ce 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // return True if chest armor is a Full Armor if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_05.0_Salvation/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; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java index 4c3a4ba842..90313789b8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -308,7 +308,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 @@ -317,7 +317,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 @@ -351,7 +351,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; } @@ -396,7 +396,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 @@ -406,7 +406,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 @@ -441,7 +441,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=?")) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index 651d722d20..77126b658c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -153,7 +153,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index af08fba9a6..d4d98581fb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1573,7 +1573,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index 0669f2ed6f..0fc96c33c7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_05.0_Salvation/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); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_05.0_Salvation/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(); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index fca112f750..9d6193775d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2152,7 +2152,7 @@ public class Player extends Playable final CrystalType expertiseLevel = _expertiseLevel.plusLevel(_expertisePenaltyBonus); int armorPenalty = 0; int weaponPenalty = 0; - for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getItem().getCrystalType().isGreater(expertiseLevel))) + for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getTemplate().getCrystalType().isGreater(expertiseLevel))) { if (item.isArmor()) { @@ -2162,7 +2162,7 @@ public class Player extends Playable else { // Weapon penalty level increases based on grade difference. - weaponPenalty = CommonUtil.constrain(item.getItem().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); + weaponPenalty = CommonUtil.constrain(item.getTemplate().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); } } @@ -2275,13 +2275,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4519,7 +4519,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) @@ -4804,7 +4804,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4824,7 +4824,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4834,7 +4834,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4845,7 +4845,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4856,7 +4856,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4867,7 +4867,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4889,7 +4889,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5129,7 +5129,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 ((_pet != null) && (_pet.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 @@ -5141,7 +5141,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 @@ -5934,7 +5934,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5975,7 +5975,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8852,7 +8852,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11749,7 +11749,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); @@ -11758,7 +11758,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 66ef5e389c..a831809aef 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 9542e0688a..e05f6bf955 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -126,8 +126,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 3f57294a78..bda337fdb1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 56b975ad6e..6c36a7e422 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -253,7 +253,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); @@ -261,7 +261,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -310,7 +310,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -375,7 +375,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -426,12 +426,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -512,7 +512,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().isGreater(player.getExpertiseLevel())) + if (item.getTemplate().getCrystalType().isGreater(player.getExpertiseLevel())) { return; } @@ -535,9 +535,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -579,7 +579,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -631,12 +631,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -684,7 +684,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -746,7 +746,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -891,7 +891,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -916,7 +916,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); @@ -952,7 +952,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -988,7 +988,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1380,7 +1380,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1399,7 +1399,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; @@ -1445,7 +1445,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1458,7 +1458,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1521,7 +1521,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()); } } @@ -1623,7 +1623,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1914,7 +1914,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -1928,11 +1928,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -1952,7 +1952,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -2008,7 +2008,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2029,7 +2029,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2042,7 +2042,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2118,9 +2118,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); @@ -2149,7 +2149,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2170,7 +2170,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_05.0_Salvation/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()); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3a8cd54db1..b5983831ad 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -431,7 +431,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -506,7 +506,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -537,7 +537,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; } @@ -593,7 +593,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; @@ -666,7 +666,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; @@ -699,7 +699,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; @@ -869,7 +869,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++; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 39dc575942..f53f8fe0dd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 25f2ad84f3..be0c0758e3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 6795fe94e2..ef9146c66d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e1655c5a55..1d6a4dc9bf 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 465807cb96..b69ecfa00c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 3c7a9f7f4b..84e830cafd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 3dd8958a1d..5655808a8d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -118,7 +118,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -385,13 +385,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 300be9e640..54cb820eca 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,7 +105,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f35c069743..c2cde73953 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_05.0_Salvation/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; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 57db48ddb4..e2bf417fa1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 0ab9577343..f6d0f8bea4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 7ca2a01f2e..00c13da58d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index b882520f8c..564c0cf204 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_05.0_Salvation/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; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 647761584a..5c9ab62964 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index b1e2aa4b15..2a7b43934b 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,14 +198,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -222,7 +222,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -230,7 +230,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -240,7 +240,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_05.0_Salvation/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; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_05.0_Salvation/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) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_05.0_Salvation/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 { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index fbced8d33c..955b69bbe6 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -384,8 +384,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 + "."); } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 13a396d5b5..a24b3d9cd4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_05.5_EtinasFate/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; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f137988e26..4933104fec 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 9c33309006..48f3f52d1d 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 1f95510e6c..07132501ce 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // return True if chest armor is a Full Armor if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_05.5_EtinasFate/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; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java index 94b4547625..75a1caebad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -310,7 +310,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 @@ -319,7 +319,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 @@ -353,7 +353,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; } @@ -398,7 +398,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 @@ -408,7 +408,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 @@ -443,7 +443,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=?")) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index 651d722d20..77126b658c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -153,7 +153,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index af08fba9a6..d4d98581fb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1573,7 +1573,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index c79eea24f5..47acbd9a27 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_05.5_EtinasFate/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); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_05.5_EtinasFate/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(); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index 57be4cb92f..f63a2b2a23 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2152,7 +2152,7 @@ public class Player extends Playable final CrystalType expertiseLevel = _expertiseLevel.plusLevel(_expertisePenaltyBonus); int armorPenalty = 0; int weaponPenalty = 0; - for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getItem().getCrystalType().isGreater(expertiseLevel))) + for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getTemplate().getCrystalType().isGreater(expertiseLevel))) { if (item.isArmor()) { @@ -2162,7 +2162,7 @@ public class Player extends Playable else { // Weapon penalty level increases based on grade difference. - weaponPenalty = CommonUtil.constrain(item.getItem().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); + weaponPenalty = CommonUtil.constrain(item.getTemplate().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); } } @@ -2275,13 +2275,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4519,7 +4519,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) @@ -4804,7 +4804,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4824,7 +4824,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4834,7 +4834,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4845,7 +4845,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4856,7 +4856,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4867,7 +4867,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4889,7 +4889,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5129,7 +5129,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 ((_pet != null) && (_pet.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 @@ -5141,7 +5141,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 @@ -5934,7 +5934,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5975,7 +5975,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8852,7 +8852,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11752,7 +11752,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); @@ -11761,7 +11761,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b26e9f0e68..76d810a2d9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index a64f2bdd25..ddbbb0eb07 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -126,8 +126,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 3f57294a78..bda337fdb1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e054f654a9..00984dec3a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -276,7 +276,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); @@ -284,7 +284,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -333,7 +333,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -449,12 +449,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -535,7 +535,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().isGreater(player.getExpertiseLevel())) + if (item.getTemplate().getCrystalType().isGreater(player.getExpertiseLevel())) { return; } @@ -558,9 +558,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -602,7 +602,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -654,12 +654,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -707,7 +707,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -769,7 +769,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -914,7 +914,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -939,7 +939,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); @@ -975,7 +975,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1011,7 +1011,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1045,7 +1045,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) { inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT1); inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT2); @@ -1462,7 +1462,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1481,7 +1481,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; @@ -1527,7 +1527,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1540,7 +1540,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1603,7 +1603,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()); } } @@ -1705,7 +1705,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -2033,7 +2033,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -2047,11 +2047,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -2071,7 +2071,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -2127,7 +2127,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2148,7 +2148,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2161,7 +2161,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2245,9 +2245,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); @@ -2276,7 +2276,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2297,7 +2297,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; @@ -2409,7 +2409,7 @@ public abstract class Inventory extends ItemContainer return; } - switch (item.getItem().getArtifactSlot()) + switch (item.getTemplate().getArtifactSlot()) { case 1: // Attack { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_05.5_EtinasFate/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()); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3a8cd54db1..b5983831ad 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -431,7 +431,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -506,7 +506,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -537,7 +537,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; } @@ -593,7 +593,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; @@ -666,7 +666,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; @@ -699,7 +699,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; @@ -869,7 +869,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++; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 39dc575942..f53f8fe0dd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 25f2ad84f3..be0c0758e3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 6795fe94e2..ef9146c66d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e1655c5a55..1d6a4dc9bf 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 465807cb96..b69ecfa00c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 3c7a9f7f4b..84e830cafd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 3dd8958a1d..5655808a8d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -118,7 +118,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -385,13 +385,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 300be9e640..54cb820eca 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,7 +105,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index f35c069743..c2cde73953 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index de4256e2fa..022b73ac8c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -88,7 +88,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket return; } - final ItemTemplate item = targetItem.getItem(); + final ItemTemplate item = targetItem.getTemplate(); final int artifactSlot = item.getArtifactSlot(); if (artifactSlot <= 0) { @@ -143,7 +143,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket for (int objectId : _ingridients) { final Item ingridient = player.getInventory().getItemByObjectId(objectId); - if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getItem().getArtifactSlot() != artifactSlot)) + if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) { player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/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; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 57db48ddb4..e2bf417fa1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 0ab9577343..f6d0f8bea4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 7ca2a01f2e..00c13da58d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index b882520f8c..564c0cf204 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_05.5_EtinasFate/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; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 647761584a..5c9ab62964 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5bf5b6bcff..f417f016e4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,14 +198,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -222,7 +222,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -230,7 +230,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -240,7 +240,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { @@ -248,7 +248,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) { if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0)) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_05.5_EtinasFate/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; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_05.5_EtinasFate/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) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_05.5_EtinasFate/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 { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index fbced8d33c..955b69bbe6 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -384,8 +384,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 + "."); } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 13a396d5b5..a24b3d9cd4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 5bf7947f18..2b1ce86219 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index d80c58265b..13cb78b5f4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index edac0c4b64..3df2d7152d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index 6dcbb48f32..c43e34254c 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -68,7 +68,7 @@ public class BlessedSoulShots 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)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 0107d8e303..b358f21fe4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,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)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_06.0_Fafurion/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; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index f137988e26..4933104fec 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 9c33309006..48f3f52d1d 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index e965687e9b..f585fa11a3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -65,7 +65,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)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index d1de206b63..3edaf366e3 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot 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)) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 1f95510e6c..07132501ce 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // return True if chest armor is a Full Armor if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_06.0_Fafurion/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; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java index 94b4547625..75a1caebad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -310,7 +310,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 @@ -319,7 +319,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 @@ -353,7 +353,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; } @@ -398,7 +398,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 @@ -408,7 +408,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 @@ -443,7 +443,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=?")) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index f7568ac960..9cc27c3181 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -158,7 +158,7 @@ public class ElementalAttributeData implements IXmlReader return false; } - if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getItem().getCrystalType() != CrystalType.R110)) + if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getTemplate().getCrystalType() != CrystalType.R110)) { return false; } @@ -170,7 +170,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 8729e78d85..56f1fb2b93 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1576,7 +1576,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index c79eea24f5..47acbd9a27 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_06.0_Fafurion/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); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_06.0_Fafurion/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(); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index 14e90307df..e559cfd90d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2152,7 +2152,7 @@ public class Player extends Playable final CrystalType expertiseLevel = _expertiseLevel.plusLevel(_expertisePenaltyBonus); int armorPenalty = 0; int weaponPenalty = 0; - for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getItem().getCrystalType().isGreater(expertiseLevel))) + for (Item item : _inventory.getPaperdollItems(item -> (item != null) && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT)) && item.getTemplate().getCrystalType().isGreater(expertiseLevel))) { if (item.isArmor()) { @@ -2162,7 +2162,7 @@ public class Player extends Playable else { // Weapon penalty level increases based on grade difference. - weaponPenalty = CommonUtil.constrain(item.getItem().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); + weaponPenalty = CommonUtil.constrain(item.getTemplate().getCrystalType().getLevel() - expertiseLevel.getLevel(), 0, 4); } } @@ -2275,13 +2275,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4520,7 +4520,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) @@ -4805,7 +4805,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4825,7 +4825,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4835,7 +4835,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4846,7 +4846,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4857,7 +4857,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4868,7 +4868,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4890,7 +4890,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5130,7 +5130,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 ((_pet != null) && (_pet.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 @@ -5142,7 +5142,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 @@ -5935,7 +5935,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5976,7 +5976,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8853,7 +8853,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11758,7 +11758,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); @@ -11767,7 +11767,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java index ea0eb909af..d0de23d7c3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b26e9f0e68..76d810a2d9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index a64f2bdd25..ddbbb0eb07 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -126,8 +126,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 3f57294a78..bda337fdb1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e054f654a9..00984dec3a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -276,7 +276,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); @@ -284,7 +284,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -333,7 +333,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -449,12 +449,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -535,7 +535,7 @@ public abstract class Inventory extends ItemContainer final Player player = (Player) inventory.getOwner(); // Any items equipped that result in expertise penalty do not give any skills at all. - if (item.getItem().getCrystalType().isGreater(player.getExpertiseLevel())) + if (item.getTemplate().getCrystalType().isGreater(player.getExpertiseLevel())) { return; } @@ -558,9 +558,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -602,7 +602,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -654,12 +654,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -707,7 +707,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -769,7 +769,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -914,7 +914,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -939,7 +939,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); @@ -975,7 +975,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1011,7 +1011,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1045,7 +1045,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) { inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT1); inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT2); @@ -1462,7 +1462,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1481,7 +1481,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; @@ -1527,7 +1527,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1540,7 +1540,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1603,7 +1603,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()); } } @@ -1705,7 +1705,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -2033,7 +2033,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -2047,11 +2047,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -2071,7 +2071,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -2127,7 +2127,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2148,7 +2148,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2161,7 +2161,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2245,9 +2245,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); @@ -2276,7 +2276,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2297,7 +2297,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; @@ -2409,7 +2409,7 @@ public abstract class Inventory extends ItemContainer return; } - switch (item.getItem().getArtifactSlot()) + switch (item.getTemplate().getArtifactSlot()) { case 1: // Attack { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_06.0_Fafurion/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()); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3a8cd54db1..b5983831ad 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -431,7 +431,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -506,7 +506,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -537,7 +537,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; } @@ -593,7 +593,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; @@ -666,7 +666,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; @@ -699,7 +699,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; @@ -869,7 +869,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++; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 39dc575942..f53f8fe0dd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 25f2ad84f3..be0c0758e3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 6795fe94e2..ef9146c66d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,12 +151,12 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; final boolean isFishingshot = item.getEtcItem().getDefaultAction() == ActionType.FISHINGSHOT; - if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getItem().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) + if ((player.getActiveWeaponItem() == player.getFistsWeaponItem()) || (item.getTemplate().getCrystalType() != player.getActiveWeaponItem().getCrystalTypePlus())) { player.sendPacket(isSoulshot ? SystemMessageId.THE_SOULSHOT_YOU_ARE_ATTEMPTING_TO_USE_DOES_NOT_MATCH_THE_GRADE_OF_YOUR_EQUIPPED_WEAPON : SystemMessageId.YOUR_SPIRITSHOT_DOES_NOT_MATCH_THE_WEAPON_S_GRADE); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e1655c5a55..1d6a4dc9bf 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 465807cb96..b69ecfa00c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 3c7a9f7f4b..84e830cafd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index e1596fa4bb..feb15f90ba 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -181,7 +181,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -387,13 +387,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 122e63d6e3..baaf1b95ba 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,14 +105,14 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); return; } - if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId())) + if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getTemplate().getId())) { player.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index 1b85248a24..99d1948039 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } @@ -200,7 +200,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R110: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 6400000; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index c9b6d4dd3a..df02093863 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -88,7 +88,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket return; } - final ItemTemplate item = targetItem.getItem(); + final ItemTemplate item = targetItem.getTemplate(); final int artifactSlot = item.getArtifactSlot(); if (artifactSlot <= 0) { @@ -143,7 +143,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket for (int objectId : _ingridients) { final Item ingridient = player.getInventory().getItemByObjectId(objectId); - if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getItem().getArtifactSlot() != artifactSlot)) + if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) { player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_06.0_Fafurion/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; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 57db48ddb4..e2bf417fa1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 0ab9577343..f6d0f8bea4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 7ca2a01f2e..00c13da58d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index b882520f8c..564c0cf204 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_06.0_Fafurion/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; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 647761584a..5c9ab62964 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5bf5b6bcff..f417f016e4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,14 +198,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -222,7 +222,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -230,7 +230,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -240,7 +240,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { @@ -248,7 +248,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) { if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0)) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index d5165c28ec..c55b9c278d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 3220827fbb..a33544c3cc 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -86,7 +86,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket return; } - if ((existingItem.getItem().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) + if ((existingItem.getTemplate().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) { player.sendPacket(new ExUpgradeSystemResult(0, 0)); return; diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_06.0_Fafurion/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; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_06.0_Fafurion/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) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_06.0_Fafurion/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 { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 2d14757f79..13edacbdea 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index fbced8d33c..955b69bbe6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -384,8 +384,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 + "."); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 3c790e60e9..fa1425b34f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 8c4e066af3..955d6dacad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 3cbb8fa479..6b5703fa33 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index c1094304c9..692c30df53 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index bf5df0fee6..3af1159d1a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -69,7 +69,7 @@ public class BlessedSoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index bf2a8dbab8..910f9e5a87 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class BlessedSpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 1e0543c0ab..aa2afe1bf0 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -98,7 +98,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 0d980ba7ec..dd09e4a2c9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27292e9117..290619ff11 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -66,7 +66,7 @@ public class SoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 8d89371f56..f9f6f68d84 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 1f95510e6c..07132501ce 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -63,7 +63,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { 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 ((_armorTypesMask & chestMask) == 0) @@ -73,7 +73,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // return True if chest armor is a Full Armor if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { @@ -85,7 +85,7 @@ public class EquipArmorSkillCondition implements ISkillCondition { return false; } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_armorTypesMask & legMask) != 0; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java index 94b4547625..75a1caebad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -310,7 +310,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 @@ -319,7 +319,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 @@ -353,7 +353,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; } @@ -398,7 +398,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 @@ -408,7 +408,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 @@ -443,7 +443,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=?")) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index f7568ac960..9cc27c3181 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -158,7 +158,7 @@ public class ElementalAttributeData implements IXmlReader return false; } - if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getItem().getCrystalType() != CrystalType.R110)) + if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getTemplate().getCrystalType() != CrystalType.R110)) { return false; } @@ -170,7 +170,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 7f1eab0350..ca39c87f1d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1577,7 +1577,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index c79eea24f5..47acbd9a27 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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(); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java index 795cf7eea2..98a11e46e8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1593,7 +1593,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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index ac7e26785b..9472bf1050 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2213,13 +2213,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4457,7 +4457,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) @@ -4742,7 +4742,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4762,7 +4762,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4772,7 +4772,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4783,7 +4783,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4794,7 +4794,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4805,7 +4805,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4827,7 +4827,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5091,7 +5091,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 ((_pet != null) && (_pet.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 @@ -5103,7 +5103,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 @@ -5900,7 +5900,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -5941,7 +5941,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8868,7 +8868,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11787,7 +11787,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); @@ -11796,7 +11796,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java index d7a531a78e..dd71829d12 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index b26e9f0e68..76d810a2d9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index ee3f9d77d4..afd409f186 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -126,8 +126,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 3f57294a78..bda337fdb1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index bf89028833..9c05019fc7 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -276,7 +276,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); @@ -284,7 +284,7 @@ public abstract class Inventory extends ItemContainer } else if ((item.getItemType() == WeaponType.CROSSBOW) || (item.getItemType() == WeaponType.TWOHANDCROSSBOW)) { - final Item bolts = inventory.findBoltForCrossBow(item.getItem()); + final Item bolts = inventory.findBoltForCrossBow(item.getTemplate()); if (bolts != null) { inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts); @@ -333,7 +333,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -398,7 +398,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -449,12 +449,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -552,9 +552,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -596,7 +596,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -648,12 +648,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -701,7 +701,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -763,7 +763,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -908,7 +908,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -933,7 +933,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); @@ -969,7 +969,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -1005,7 +1005,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1039,7 +1039,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) { inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT1); inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT2); @@ -1456,7 +1456,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1475,7 +1475,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; @@ -1521,7 +1521,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1534,7 +1534,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1597,7 +1597,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()); } } @@ -1699,7 +1699,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -2018,7 +2018,7 @@ public abstract class Inventory extends ItemContainer final ItemType weaponItemType = weapon.getItemType(); if ((((weaponItemType == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) // || (((weaponItemType == WeaponType.CROSSBOW) || (weaponItemType == WeaponType.TWOHANDCROSSBOW)) && (itemType == EtcItemType.BOLT))) // - && (weapon.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + && (weapon.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return; } @@ -2032,11 +2032,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -2056,7 +2056,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (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) || (rh.getItemType() == WeaponType.TWOHANDCROSSBOW)) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) { setPaperdollItem(PAPERDOLL_RHAND, null); } @@ -2112,7 +2112,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2133,7 +2133,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2146,7 +2146,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2230,9 +2230,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); @@ -2261,7 +2261,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2282,7 +2282,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; @@ -2394,7 +2394,7 @@ public abstract class Inventory extends ItemContainer return; } - switch (item.getItem().getArtifactSlot()) + switch (item.getTemplate().getArtifactSlot()) { case 1: // Attack { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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()); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 3a8cd54db1..b5983831ad 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -431,7 +431,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -506,7 +506,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -537,7 +537,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; } @@ -593,7 +593,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; @@ -666,7 +666,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; @@ -699,7 +699,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; @@ -869,7 +869,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++; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 2902e6d0e2..0f89b9a012 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 10f189c560..4acdb16283 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -168,7 +168,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 5d3c284100..06afaf61af 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 0341d285b8..f840b482e2 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,7 +151,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e1655c5a55..1d6a4dc9bf 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 3177321420..2aad8ea34a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 3c7a9f7f4b..84e830cafd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index c42e2c57ed..a25aae077c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -181,7 +181,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -387,13 +387,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 122e63d6e3..baaf1b95ba 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,14 +105,14 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); return; } - if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId())) + if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getTemplate().getId())) { player.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index fe3c0f5057..2f0d4908cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } @@ -200,7 +200,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R110: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 6400000; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index c9b6d4dd3a..df02093863 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -88,7 +88,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket return; } - final ItemTemplate item = targetItem.getItem(); + final ItemTemplate item = targetItem.getTemplate(); final int artifactSlot = item.getArtifactSlot(); if (artifactSlot <= 0) { @@ -143,7 +143,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket for (int objectId : _ingridients) { final Item ingridient = player.getInventory().getItemByObjectId(objectId); - if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getItem().getArtifactSlot() != artifactSlot)) + if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) { player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 57db48ddb4..e2bf417fa1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 776e7f818f..94b1c7e143 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index bba86e4e86..8140ec288d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index b882520f8c..564c0cf204 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 647761584a..5c9ab62964 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -133,7 +133,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(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 5bf5b6bcff..f417f016e4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -111,7 +111,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -132,7 +132,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; } @@ -147,7 +147,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -198,14 +198,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -222,7 +222,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -230,7 +230,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -240,7 +240,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { @@ -248,7 +248,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) { if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0)) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index b8f98ff7ba..63908b0293 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 001bc08a50..f473e3eb3e 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2))) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (!itemOne.isStackable() || (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2))) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 31298a1992..3b20bb0041 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 3220827fbb..a33544c3cc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -86,7 +86,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket return; } - if ((existingItem.getItem().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) + if ((existingItem.getTemplate().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) { player.sendPacket(new ExUpgradeSystemResult(0, 0)); return; diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index b8a4b0d12f..1364eac945 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -103,7 +103,7 @@ public class AutoUseTaskManager implements Runnable continue ITEMS; } - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); if (it != null) { if (!it.checkCondition(player, player, false)) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_07.0_PreludeOfWar/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 { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 1e08a1f98d..b1ad99a4d9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index fbced8d33c..955b69bbe6 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -384,8 +384,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 + "."); } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 3c790e60e9..fa1425b34f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 8c4e066af3..955d6dacad 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 3cbb8fa479..6b5703fa33 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index c1094304c9..692c30df53 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index bf5df0fee6..3af1159d1a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -69,7 +69,7 @@ public class BlessedSoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index bf2a8dbab8..910f9e5a87 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class BlessedSpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_08.2_Homunculus/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; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index fcc423a788..b453181103 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -99,7 +99,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 0d980ba7ec..dd09e4a2c9 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27292e9117..290619ff11 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -66,7 +66,7 @@ public class SoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 8d89371f56..f9f6f68d84 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 319a2101f9..eb3dc88f1d 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -65,7 +65,7 @@ public class EquipArmorSkillCondition implements ISkillCondition } // If chest armor is different from the condition one return false - final int chestMask = chest.getItem().getItemMask(); + final int chestMask = chest.getTemplate().getItemMask(); if ((_armorTypesMask & chestMask) == 0) { return false; @@ -74,7 +74,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions // return True if chest armor is a Full Armor - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { return true; @@ -88,7 +88,7 @@ public class EquipArmorSkillCondition implements ISkillCondition } // return true if legs armor matches too - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); return (_armorTypesMask & legMask) != 0; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_08.2_Homunculus/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; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java index e43b1b96a1..dfa4df157d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -322,7 +322,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 @@ -331,7 +331,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 @@ -365,7 +365,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; } @@ -410,7 +410,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 @@ -420,7 +420,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 @@ -455,7 +455,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=?")) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index f7568ac960..9cc27c3181 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -158,7 +158,7 @@ public class ElementalAttributeData implements IXmlReader return false; } - if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getItem().getCrystalType() != CrystalType.R110)) + if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getTemplate().getCrystalType() != CrystalType.R110)) { return false; } @@ -170,7 +170,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 7f1eab0350..ca39c87f1d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1577,7 +1577,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index c79eea24f5..47acbd9a27 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_08.2_Homunculus/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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_08.2_Homunculus/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(); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java index c285618608..3e7281078e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1594,7 +1594,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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 73733cb901..f37fb8196a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2244,13 +2244,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4488,7 +4488,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) @@ -4759,7 +4759,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4779,7 +4779,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4789,7 +4789,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4800,7 +4800,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4811,7 +4811,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4822,7 +4822,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4844,7 +4844,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5112,7 +5112,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 ((_pet != null) && (_pet.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 @@ -5124,7 +5124,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 @@ -5917,7 +5917,7 @@ public class Player extends Playable removeAmmunitionSkills(); _lastAmmunitionId = currentAmmunitionId; - final List skills = ammunition.getItem().getAllSkills(); + final List skills = ammunition.getTemplate().getAllSkills(); if (skills == null) { return; @@ -5995,7 +5995,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -6036,7 +6036,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8970,7 +8970,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11903,7 +11903,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); @@ -11912,7 +11912,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java index d7a531a78e..dd71829d12 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index d1b95ebdc5..1dc8499399 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index b49f625fb6..89ed1f3f3b 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -127,8 +127,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 71585587eb..4360620a36 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c504467dbd..890e186a52 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -315,7 +315,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -380,7 +380,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -431,12 +431,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -534,9 +534,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -578,7 +578,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -630,12 +630,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -683,7 +683,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -745,7 +745,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -890,7 +890,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -915,7 +915,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); @@ -951,7 +951,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -987,7 +987,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1021,7 +1021,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) { inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT1); inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT2); @@ -1438,7 +1438,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1457,7 +1457,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; @@ -1503,7 +1503,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1516,7 +1516,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1579,7 +1579,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()); } } @@ -1681,7 +1681,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1996,11 +1996,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -2023,7 +2023,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_L_HAND) { final Item rh = getPaperdollItem(PAPERDOLL_RHAND); - if ((rh != null) && (rh.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))) + if ((rh != null) && (rh.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))) { if (!item.isArmor() || (item.getArmorItem().getItemType() != ArmorType.SIGIL)) { @@ -2082,7 +2082,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2103,7 +2103,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2116,7 +2116,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2200,9 +2200,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); @@ -2243,7 +2243,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2264,7 +2264,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; @@ -2376,7 +2376,7 @@ public abstract class Inventory extends ItemContainer return; } - switch (item.getItem().getArtifactSlot()) + switch (item.getTemplate().getArtifactSlot()) { case 1: // Attack { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_08.2_Homunculus/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()); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 769149f9c2..15b1b01577 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -432,7 +432,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -507,7 +507,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -538,7 +538,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; } @@ -594,7 +594,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; @@ -667,7 +667,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; @@ -700,7 +700,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; @@ -870,7 +870,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++; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index 2902e6d0e2..0f89b9a012 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 02c4afde37..5b48d65bbd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -172,7 +172,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 5d3c284100..06afaf61af 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -490,7 +490,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 0341d285b8..f840b482e2 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,7 +151,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e1655c5a55..1d6a4dc9bf 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 3177321420..2aad8ea34a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 3c7a9f7f4b..84e830cafd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index e6b54e37e0..d73651863e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -181,7 +181,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -387,13 +387,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 122e63d6e3..baaf1b95ba 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,14 +105,14 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); return; } - if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId())) + if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getTemplate().getId())) { player.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index fe3c0f5057..2f0d4908cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } @@ -200,7 +200,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R110: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 6400000; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index c9b6d4dd3a..df02093863 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -88,7 +88,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket return; } - final ItemTemplate item = targetItem.getItem(); + final ItemTemplate item = targetItem.getTemplate(); final int artifactSlot = item.getArtifactSlot(); if (artifactSlot <= 0) { @@ -143,7 +143,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket for (int objectId : _ingridients) { final Item ingridient = player.getInventory().getItemByObjectId(objectId); - if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getItem().getArtifactSlot() != artifactSlot)) + if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) { player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_08.2_Homunculus/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; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 57db48ddb4..e2bf417fa1 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 776e7f818f..94b1c7e143 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index bba86e4e86..8140ec288d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index b882520f8c..564c0cf204 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_08.2_Homunculus/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; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 984b90ec48..6a77cd50bc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -126,7 +126,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(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d7f0dc28ec..c01216235a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -113,7 +113,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -134,7 +134,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; } @@ -149,7 +149,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -200,14 +200,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -224,7 +224,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -232,7 +232,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -242,7 +242,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { @@ -250,7 +250,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) { if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0)) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 9ee2839dc3..6c330fb1a8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 4351404009..e986d7414d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 31298a1992..3b20bb0041 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 3220827fbb..a33544c3cc 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -86,7 +86,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket return; } - if ((existingItem.getItem().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) + if ((existingItem.getTemplate().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) { player.sendPacket(new ExUpgradeSystemResult(0, 0)); return; diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index b8a4b0d12f..1364eac945 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -103,7 +103,7 @@ public class AutoUseTaskManager implements Runnable continue ITEMS; } - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); if (it != null) { if (!it.checkCondition(player, player, false)) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_08.2_Homunculus/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; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_08.2_Homunculus/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) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_08.2_Homunculus/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 { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 1e08a1f98d..b1ad99a4d9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index fbced8d33c..955b69bbe6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -384,8 +384,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 + "."); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 3c790e60e9..fa1425b34f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java index e65302cc52..478feb8d26 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 37a485cc66..1b805a222f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 8c4e066af3..955d6dacad 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 3cbb8fa479..6b5703fa33 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index c1094304c9..692c30df53 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index bf5df0fee6..3af1159d1a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -69,7 +69,7 @@ public class BlessedSoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index bf2a8dbab8..910f9e5a87 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class BlessedSpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index fcc423a788..b453181103 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -99,7 +99,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 0d980ba7ec..dd09e4a2c9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index 27292e9117..290619ff11 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -66,7 +66,7 @@ public class SoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 8d89371f56..f9f6f68d84 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 319a2101f9..eb3dc88f1d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -65,7 +65,7 @@ public class EquipArmorSkillCondition implements ISkillCondition } // If chest armor is different from the condition one return false - final int chestMask = chest.getItem().getItemMask(); + final int chestMask = chest.getTemplate().getItemMask(); if ((_armorTypesMask & chestMask) == 0) { return false; @@ -74,7 +74,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions // return True if chest armor is a Full Armor - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { return true; @@ -88,7 +88,7 @@ public class EquipArmorSkillCondition implements ISkillCondition } // return true if legs armor matches too - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); return (_armorTypesMask & legMask) != 0; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java index e43b1b96a1..dfa4df157d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -322,7 +322,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 @@ -331,7 +331,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 @@ -365,7 +365,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; } @@ -410,7 +410,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 @@ -420,7 +420,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 @@ -455,7 +455,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=?")) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index f7568ac960..9cc27c3181 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -158,7 +158,7 @@ public class ElementalAttributeData implements IXmlReader return false; } - if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getItem().getCrystalType() != CrystalType.R110)) + if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getTemplate().getCrystalType() != CrystalType.R110)) { return false; } @@ -170,7 +170,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 7f1eab0350..ca39c87f1d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1577,7 +1577,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index c79eea24f5..47acbd9a27 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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(); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java index c285618608..3e7281078e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1594,7 +1594,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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index 5df08f72dd..40b6b1c1f3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2261,13 +2261,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4505,7 +4505,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) @@ -4776,7 +4776,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4796,7 +4796,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4806,7 +4806,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4817,7 +4817,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4828,7 +4828,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4839,7 +4839,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4861,7 +4861,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5129,7 +5129,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 ((_pet != null) && (_pet.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 @@ -5141,7 +5141,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 @@ -5934,7 +5934,7 @@ public class Player extends Playable removeAmmunitionSkills(); _lastAmmunitionId = currentAmmunitionId; - final List skills = ammunition.getItem().getAllSkills(); + final List skills = ammunition.getTemplate().getAllSkills(); if (skills == null) { return; @@ -6012,7 +6012,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -6053,7 +6053,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -8996,7 +8996,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11930,7 +11930,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); @@ -11939,7 +11939,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java index d7a531a78e..dd71829d12 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index d1b95ebdc5..1dc8499399 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index b49f625fb6..89ed1f3f3b 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -127,8 +127,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index 1dda14ae2d..b39e98a934 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 71585587eb..4360620a36 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index c504467dbd..890e186a52 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -315,7 +315,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -380,7 +380,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -431,12 +431,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -534,9 +534,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -578,7 +578,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -630,12 +630,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -683,7 +683,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -745,7 +745,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -890,7 +890,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -915,7 +915,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); @@ -951,7 +951,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -987,7 +987,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1021,7 +1021,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) { inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT1); inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT2); @@ -1438,7 +1438,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1457,7 +1457,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; @@ -1503,7 +1503,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1516,7 +1516,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1579,7 +1579,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()); } } @@ -1681,7 +1681,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -1996,11 +1996,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -2023,7 +2023,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_L_HAND) { final Item rh = getPaperdollItem(PAPERDOLL_RHAND); - if ((rh != null) && (rh.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))) + if ((rh != null) && (rh.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))) { if (!item.isArmor() || (item.getArmorItem().getItemType() != ArmorType.SIGIL)) { @@ -2082,7 +2082,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2103,7 +2103,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2116,7 +2116,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2200,9 +2200,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); @@ -2243,7 +2243,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2264,7 +2264,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; @@ -2376,7 +2376,7 @@ public abstract class Inventory extends ItemContainer return; } - switch (item.getItem().getArtifactSlot()) + switch (item.getTemplate().getArtifactSlot()) { case 1: // Attack { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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()); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 769149f9c2..15b1b01577 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -432,7 +432,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -507,7 +507,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -538,7 +538,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; } @@ -594,7 +594,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; @@ -667,7 +667,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; @@ -700,7 +700,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; @@ -870,7 +870,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++; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index a42a2d90e8..6996ee20fb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 02c4afde37..5b48d65bbd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -172,7 +172,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 3a5830bf03..a0dc1d3b55 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -499,7 +499,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 0341d285b8..f840b482e2 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,7 +151,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index e1655c5a55..1d6a4dc9bf 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 3177321420..2aad8ea34a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 3c7a9f7f4b..84e830cafd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index e6b54e37e0..d73651863e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -181,7 +181,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -387,13 +387,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index 122e63d6e3..baaf1b95ba 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,14 +105,14 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); return; } - if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId())) + if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getTemplate().getId())) { player.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index fe3c0f5057..2f0d4908cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } @@ -200,7 +200,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R110: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 6400000; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index c9b6d4dd3a..df02093863 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -88,7 +88,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket return; } - final ItemTemplate item = targetItem.getItem(); + final ItemTemplate item = targetItem.getTemplate(); final int artifactSlot = item.getArtifactSlot(); if (artifactSlot <= 0) { @@ -143,7 +143,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket for (int objectId : _ingridients) { final Item ingridient = player.getInventory().getItemByObjectId(objectId); - if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getItem().getArtifactSlot() != artifactSlot)) + if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) { player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 57db48ddb4..e2bf417fa1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 776e7f818f..94b1c7e143 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index bba86e4e86..8140ec288d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index 9c0c240bd4..64746d217e 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index b882520f8c..564c0cf204 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 984b90ec48..6a77cd50bc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -126,7 +126,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(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index d7f0dc28ec..c01216235a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -113,7 +113,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -134,7 +134,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; } @@ -149,7 +149,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -200,14 +200,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -224,7 +224,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -232,7 +232,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -242,7 +242,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { @@ -250,7 +250,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) { if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0)) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 1da5028812..7446649384 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 54ce84fa38..b0f684b59f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 31298a1992..3b20bb0041 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 3220827fbb..a33544c3cc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -86,7 +86,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket return; } - if ((existingItem.getItem().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) + if ((existingItem.getTemplate().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) { player.sendPacket(new ExUpgradeSystemResult(0, 0)); return; diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index b8a4b0d12f..1364eac945 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -103,7 +103,7 @@ public class AutoUseTaskManager implements Runnable continue ITEMS; } - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); if (it != null) { if (!it.checkCondition(player, player, false)) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/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 { diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java index 1e08a1f98d..b1ad99a4d9 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java @@ -181,10 +181,10 @@ public class AdminElement implements IAdminCommandHandler player.sendInventoryUpdate(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 + "."); } } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java index fbced8d33c..955b69bbe6 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java @@ -384,8 +384,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 + "."); } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java index 766957ac65..ccebd32761 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java @@ -86,7 +86,7 @@ public class ConvertItem extends AbstractEffect final int enchantLevel = wpn.getEnchantLevel(); final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute(); - final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item unequippedItem : unequipped) { @@ -102,7 +102,7 @@ public class ConvertItem extends AbstractEffect byte count = 0; for (Item unequippedItem : unequipped) { - if (!(unequippedItem.getItem() instanceof Weapon)) + if (!(unequippedItem.getTemplate() instanceof Weapon)) { count++; continue; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java index 384d82f36d..574e244ef4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/Heal.java @@ -99,7 +99,7 @@ public class Heal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java index 5b0f7cd8a2..ad667b49bf 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/HpCpHeal.java @@ -95,7 +95,7 @@ public class HpCpHeal extends AbstractEffect final Item weaponInst = effector.getActiveWeaponInstance(); if (weaponInst != null) { - mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1; + mAtkMul = weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getTemplate().getCrystalTypePlus() == CrystalType.S ? 2 : 1; } // shot dynamic bonus mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java index 6b4160ba14..4a4e22a307 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java @@ -132,7 +132,7 @@ public class RestorationRandom extends AbstractEffect final InventoryUpdate playerIU = new InventoryUpdate(); for (Entry entry : extractedItems.entrySet()) { - if (entry.getKey().getItem().isStackable()) + if (entry.getKey().getTemplate().isStackable()) { playerIU.addModifiedItem(entry.getKey()); } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java index 3cbb8fa479..6b5703fa33 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java @@ -77,7 +77,7 @@ public class BeastSoulShot implements IItemHandler final int itemId = item.getId(); final long shotCount = item.getCount(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(ShotType.SOULSHOTS)) { diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java index c1094304c9..692c30df53 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java @@ -77,7 +77,7 @@ public class BeastSpiritShot implements IItemHandler final int itemId = item.getId(); final boolean isBlessed = ((itemId == 6647) || (itemId == 20334)); // TODO: Unhardcode these! - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); final ShotType shotType = isBlessed ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS; short shotConsumption = 0; if ((pet != null) && !pet.isChargedShot(shotType)) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java index c4b6530d85..2b164ebf88 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSoulShots.java @@ -49,7 +49,7 @@ public class BlessedSoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -69,7 +69,7 @@ public class BlessedSoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java index 2635109217..683fbffb19 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java @@ -45,7 +45,7 @@ public class BlessedSpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class BlessedSpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java index 238d1a11bc..926c840632 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java @@ -70,7 +70,7 @@ public class ChangeAttributeCrystal implements IItemHandler final List itemList = new ArrayList<>(); for (Item i : player.getInventory().getItems()) { - if (i.isWeapon() && i.hasAttributes() && (i.getItem().getItemGrade() == ITEM_GRADES.get(item.getId()))) + if (i.isWeapon() && i.hasAttributes() && (i.getTemplate().getItemGrade() == ITEM_GRADES.get(item.getId()))) { itemList.add(new ItemInfo(i)); } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java index 589d400d6c..b260aed8b2 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java +++ b/L2J_Mobius_10.0_MasterClass/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; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java index 4249592a7c..327211b537 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java @@ -51,7 +51,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 exitems = etcitem.getExtractableItems(); if (exitems == null) { @@ -99,7 +99,7 @@ public class ExtractableItems implements IItemHandler boolean alreadyExtracted = false; for (Item i : extractedItems.keySet()) { - if (i.getItem().getId() == expi.getId()) + if (i.getTemplate().getId() == expi.getId()) { alreadyExtracted = true; break; diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java index 4c2b37690b..1665fab4c4 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/FishShots.java @@ -61,7 +61,7 @@ public class FishShots implements IItemHandler } final long count = item.getCount(); - 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); @@ -86,7 +86,7 @@ public class FishShots implements IItemHandler final WorldObject oldTarget = player.getTarget(); player.setTarget(player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java index 254021b66a..453bc5efe7 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Harvester.java @@ -48,7 +48,7 @@ public class Harvester implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java index 6c87cde454..dc13675637 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ItemSkillsTemplate.java @@ -58,7 +58,7 @@ public class ItemSkillsTemplate implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.info("Item " + item + " does not have registered any skill for handler."); @@ -122,7 +122,7 @@ public class ItemSkillsTemplate implements IItemHandler playable.doCast(itemSkill); successfulUse = true; } - else if (itemSkill.isWithoutAction() || item.getItem().hasImmediateEffect() || item.getItem().hasExImmediateEffect()) + else if (itemSkill.isWithoutAction() || item.getTemplate().hasImmediateEffect() || item.getTemplate().hasExImmediateEffect()) { SkillCaster.triggerCast(playable, null, itemSkill, item, false); successfulUse = true; @@ -163,12 +163,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; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 347e688b4d..3c5572d4ec 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -46,7 +46,7 @@ public class PetFood implements IItemHandler return false; } - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> useFood(playable, holder.getSkillId(), holder.getSkillLevel(), item)); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java index e68a2c5552..1b2ec1601b 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/Seed.java @@ -91,7 +91,7 @@ public class Seed implements IItemHandler final Player player = playable.getActingPlayer(); target.setSeeded(seed, player); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills != null) { skills.forEach(holder -> player.useMagic(holder.getSkill(), item, false, false)); diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java index ec26ef96e7..292972129d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java @@ -46,7 +46,7 @@ public class SoulShots implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -66,7 +66,7 @@ public class SoulShots implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SOULSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java index 9b0ce21961..13b5d3d3a3 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java @@ -45,7 +45,7 @@ public class SpiritShot implements IItemHandler final Player player = playable.getActingPlayer(); final Item weaponInst = player.getActiveWeaponInstance(); final Weapon weaponItem = player.getActiveWeaponItem(); - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (skills == null) { LOGGER.warning(getClass().getSimpleName() + ": is missing skills!"); @@ -71,7 +71,7 @@ public class SpiritShot implements IItemHandler } // Check for correct grade - if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getItem().getCrystalTypePlus() != item.getItem().getCrystalTypePlus())) + if (!item.isEtcItem() || (item.getEtcItem().getDefaultAction() != ActionType.SPIRITSHOT) || (weaponInst.getTemplate().getCrystalTypePlus() != item.getTemplate().getCrystalTypePlus())) { return false; } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java index 319a2101f9..eb3dc88f1d 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/EquipArmorSkillCondition.java @@ -65,7 +65,7 @@ public class EquipArmorSkillCondition implements ISkillCondition } // If chest armor is different from the condition one return false - final int chestMask = chest.getItem().getItemMask(); + final int chestMask = chest.getTemplate().getItemMask(); if ((_armorTypesMask & chestMask) == 0) { return false; @@ -74,7 +74,7 @@ public class EquipArmorSkillCondition implements ISkillCondition // So from here, chest armor matches conditions // return True if chest armor is a Full Armor - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); if (chestBodyPart == ItemTemplate.SLOT_FULL_ARMOR) { return true; @@ -88,7 +88,7 @@ public class EquipArmorSkillCondition implements ISkillCondition } // return true if legs armor matches too - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); return (_armorTypesMask & legMask) != 0; } } diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java index 55a91a9e81..711bca044a 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java +++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpTargetArmorTypeSkillCondition.java @@ -65,10 +65,10 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition } // Get the chest item type. - final ItemType chestType = chest.getItem().getItemType(); + final ItemType chestType = chest.getTemplate().getItemType(); // Get the chest body part. - final long chestBodyPart = chest.getItem().getBodyPart(); + final long chestBodyPart = chest.getTemplate().getBodyPart(); // Get the legs armor. final Item legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS); @@ -77,7 +77,7 @@ public class OpTargetArmorTypeSkillCondition implements ISkillCondition ItemType legsType = null; if (legs != null) { - legsType = legs.getItem().getItemType(); + legsType = legs.getTemplate().getItemType(); } for (ArmorType armorType : _armorTypes) diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java index 1fd9deb62c..066891e2dd 100644 --- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/telnethandlers/player/Enchant.java +++ b/L2J_Mobius_10.0_MasterClass/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; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java index 30908451f2..844255aead 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -367,9 +367,9 @@ public class AttackableAI extends CreatureAI { ItemsOnGroundManager.getInstance().removeObject(droppedItem); } - if (droppedItem.getItem().hasExImmediateEffect()) + if (droppedItem.getTemplate().hasExImmediateEffect()) { - for (SkillHolder skillHolder : droppedItem.getItem().getAllSkills()) + for (SkillHolder skillHolder : droppedItem.getTemplate().getAllSkills()) { SkillCaster.triggerCast(npc, null, skillHolder.getSkill(), null, false); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java index 00f5e77061..cccadc634c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/cache/PaperdollCache.java @@ -117,7 +117,7 @@ public final class PaperdollCache double value = 0; for (Item item : _paperdollItems) { - value += item.getItem().getStats(stat, 0); + value += item.getTemplate().getStats(stat, 0); } _statValues.put(stat, value); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java index e43b1b96a1..dfa4df157d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -322,7 +322,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 @@ -331,7 +331,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 @@ -365,7 +365,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; } @@ -410,7 +410,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 @@ -420,7 +420,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 @@ -455,7 +455,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=?")) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java index f7568ac960..9cc27c3181 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ElementalAttributeData.java @@ -158,7 +158,7 @@ public class ElementalAttributeData implements IXmlReader return false; } - if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getItem().getCrystalType() != CrystalType.R110)) + if ((ELEMENTAL_ITEMS.get(stoneId).getType() == ElementalItemType.JEWEL) && (targetItem.getTemplate().getCrystalType() != CrystalType.R110)) { return false; } @@ -170,7 +170,7 @@ public class ElementalAttributeData implements IXmlReader { int row = -1; int column = -1; - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java index ffd6eef139..b3a0c13f01 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/EnchantItemHPBonusData.java @@ -92,14 +92,14 @@ public class EnchantItemHPBonusData implements IXmlReader */ public int getHPBonus(Item item) { - final List values = _armorHPBonuses.get(item.getItem().getCrystalTypePlus()); + final List 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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java index 7e4d3ca9a8..82a4f3b07c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/ItemCrystallizationData.java @@ -208,9 +208,9 @@ public class ItemCrystallizationData implements IXmlReader if (data != null) { // If there are no crystals on the template, add such. - if (data.getItems().stream().noneMatch(i -> i.getId() == item.getItem().getCrystalItemId())) + if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) { - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } result.addAll(data.getItems()); @@ -218,7 +218,7 @@ public class ItemCrystallizationData implements IXmlReader else { // Add basic crystal reward. - result.add(new ItemChanceHolder(item.getItem().getCrystalItemId(), 100, item.getCrystalCount())); + result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); } return result; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java index 7f1eab0350..ca39c87f1d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java @@ -1577,7 +1577,7 @@ public class SkillTreeData implements IXmlReader boolean isItemSkill = false; SEARCH: for (Item item : player.getInventory().getItems()) { - final List itemSkills = item.getItem().getAllSkills(); + final List itemSkills = item.getTemplate().getAllSkills(); if (itemSkills != null) { for (ItemSkillHolder itemSkillHolder : itemSkills) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java index e58547737e..32c33c31e4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemCommissionManager.java @@ -502,7 +502,7 @@ public class ItemCommissionManager { for (CommissionItem item : _commissionItems.values()) { - if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getItem().getId() == itemId)) + if ((item.getItemInstance().getOwnerId() == player.getObjectId()) && (item.getItemInstance().getTemplate().getId() == itemId)) { return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java index 5422eeb2e0..457d7c751e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/instancemanager/ItemsOnGroundManager.java +++ b/L2J_Mobius_10.0_MasterClass/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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java index 6ca77262c5..fd570cff28 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ItemInfo.java @@ -99,7 +99,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 _enchantLevel = item.getEnchantLevel(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java index 25bb606782..35e9b7b95b 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TempItem.java +++ b/L2J_Mobius_10.0_MasterClass/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(); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java index dbb24da19f..e37b8b7a0a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/TradeItem.java @@ -58,7 +58,7 @@ public class TradeItem { Objects.requireNonNull(item); _objectId = item.getObjectId(); - _item = item.getItem(); + _item = item.getTemplate(); _location = item.getLocationSlot(); _enchant = item.getEnchantLevel(); _type1 = item.getCustomType1(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java index c285618608..3e7281078e 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Npc.java @@ -1594,7 +1594,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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 0fc4441350..ea3c16fc0c 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -2263,13 +2263,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, false); } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemEquip(this, item), item.getTemplate()); } else { @@ -4538,7 +4538,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) @@ -4809,7 +4809,7 @@ public class Player extends Playable { return _fistsWeaponItem; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } public Item getChestArmorInstance() @@ -4829,7 +4829,7 @@ public class Player extends Playable { return null; } - return (Armor) armor.getItem(); + return (Armor) armor.getTemplate(); } public Armor getActiveLegsArmorItem() @@ -4839,7 +4839,7 @@ public class Player extends Playable { return null; } - return (Armor) legs.getItem(); + return (Armor) legs.getTemplate(); } public boolean isWearingHeavyArmor() @@ -4850,7 +4850,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY)); } public boolean isWearingLightArmor() @@ -4861,7 +4861,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT)); } public boolean isWearingMagicArmor() @@ -4872,7 +4872,7 @@ public class Player extends Playable { return true; } - return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); + return (armor != null) && ((_inventory.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC)); } /** @@ -4894,7 +4894,7 @@ public class Player extends Playable final Item item = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (item != null) { - return item.getItem(); + return item.getTemplate(); } return null; } @@ -5162,7 +5162,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 ((_pet != null) && (_pet.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 @@ -5174,7 +5174,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 @@ -5967,7 +5967,7 @@ public class Player extends Playable removeAmmunitionSkills(); _lastAmmunitionId = currentAmmunitionId; - final List skills = ammunition.getItem().getAllSkills(); + final List skills = ammunition.getTemplate().getAllSkills(); if (skills == null) { return; @@ -6045,7 +6045,7 @@ public class Player extends Playable return false; } - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -6086,7 +6086,7 @@ public class Player extends Playable final Item sld = _inventory.getPaperdollItem(Inventory.PAPERDOLL_LHAND); if (sld != null) { - final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart()); + final List unequipped = _inventory.unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart()); final InventoryUpdate iu = new InventoryUpdate(); for (Item itm : unequipped) { @@ -9046,7 +9046,7 @@ public class Player extends Playable continue; } - final ActionType defaultAction = item.getItem().getDefaultAction(); + final ActionType defaultAction = item.getTemplate().getDefaultAction(); if ((magic && (defaultAction == ActionType.SPIRITSHOT)) || (physical && (defaultAction == ActionType.SOULSHOT)) || (fish && (defaultAction == ActionType.FISHINGSHOT))) { handler.useItem(this, item, false); @@ -11980,7 +11980,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); @@ -11989,7 +11989,7 @@ public class Player extends Playable sendInventoryUpdate(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; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java index 43dee2f283..16b07a0b82 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -1063,7 +1063,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) @@ -1072,7 +1072,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) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 699dbe659a..a7daff9d2a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -339,7 +339,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; } @@ -359,7 +359,7 @@ public class Pet extends Summon { return null; } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -574,7 +574,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) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java index 6a5c33538c..c8dc308d73 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java @@ -127,8 +127,8 @@ public class PlayerStat extends PlayableStat final Item rod = player.getActiveWeaponInstance(); if ((rod != null) && (rod.getItemType() == WeaponType.FISHINGROD)) { - bonusExp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getXpMultiplier(); - bonusSp *= FishingData.getInstance().getRodData(rod.getItem().getId()).getSpMultiplier(); + bonusExp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getXpMultiplier(); + bonusSp *= FishingData.getInstance().getRodData(rod.getTemplate().getId()).getSpMultiplier(); } } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java index 8fa4f1fbbd..8680e136c3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionSlotItemType.java @@ -53,6 +53,6 @@ public class ConditionSlotItemType extends ConditionInventory { return false; } - return (itemSlot.getItem().getItemMask() & _mask) != 0; + return (itemSlot.getTemplate().getItemMask() & _mask) != 0; } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java index fcd8abc3eb..408379cda5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java @@ -65,7 +65,7 @@ public class ConditionUsingItemType extends Condition { return (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - 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 long chestBodyPart = chest.getItem().getBodyPart(); + final long 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 (ArmorType.NONE.mask() & _mask) == ArmorType.NONE.mask(); } - final int legMask = legs.getItem().getItemMask(); + final int legMask = legs.getTemplate().getItemMask(); // return true if legs armor matches too return (_mask & legMask) != 0; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java index eb9223510d..d5e6b89644 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/events/AbstractScript.java @@ -2960,7 +2960,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime 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); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java index b289fa70ae..28a457d6a5 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/WarehouseItem.java @@ -72,7 +72,7 @@ public class WarehouseItem public WarehouseItem(Item item) { Objects.requireNonNull(item); - _item = item.getItem(); + _item = item.getTemplate(); _object = item.getObjectId(); _count = item.getCount(); _owner = item.getOwnerId(); @@ -80,7 +80,7 @@ public class WarehouseItem _enchant = item.getEnchantLevel(); _customType1 = item.getCustomType1(); _customType2 = item.getCustomType2(); - _grade = item.getItem().getCrystalType(); + _grade = item.getTemplate().getCrystalType(); _augmentation = item.getAugmentation(); _mana = item.getMana(); _time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java index 610e720125..d74b1218d3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/appearance/AppearanceStone.java @@ -285,13 +285,13 @@ public class AppearanceStone return false; } - if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) + if ((targetItem.isWeapon() && !getTargetTypes().contains(AppearanceTargetType.WEAPON)) || (targetItem.isArmor() && !getTargetTypes().contains(AppearanceTargetType.ARMOR) && !((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL))) || (targetItem.isEtcItem() && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (((targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getItem().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) + if (((targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIR2) || (targetItem.getTemplate().getBodyPart() == ItemTemplate.SLOT_HAIRALL)) && !getTargetTypes().contains(AppearanceTargetType.ACCESSORY)) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -317,7 +317,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -332,7 +332,7 @@ public class AppearanceStone return false; } - if (targetItem.getItem().getCrystalType() == CrystalType.NONE) + if (targetItem.getTemplate().getCrystalType() == CrystalType.NONE) { player.sendPacket(SystemMessageId.YOU_CANNOT_MODIFY_OR_RESTORE_NO_GRADE_ITEMS); return false; @@ -341,7 +341,7 @@ public class AppearanceStone } case ACCESSORY: { - if ((targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) + if ((targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIR2) && (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_HAIRALL)) { player.sendPacket(SystemMessageId.HAIR_ACCESSORIES_ONLY); return false; @@ -350,7 +350,7 @@ public class AppearanceStone } case ALL: { - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -368,13 +368,13 @@ public class AppearanceStone } } - if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getItem().getCrystalType())) + if (!getCrystalTypes().isEmpty() && !getCrystalTypes().contains(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; } - if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getItem().getBodyPart())) + if (targetItem.isArmor() && !getBodyParts().isEmpty() && !getBodyParts().contains(targetItem.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -400,7 +400,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -409,7 +409,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -422,7 +422,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -431,7 +431,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); return false; @@ -471,7 +471,7 @@ public class AppearanceStone { for (AppearanceHolder holder : _allVisualIds) { - if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getItem().getBodyPart() != holder.getBodyPart())) + if (targetItem.isArmor() && (holder.getBodyPart() != 0) && (targetItem.getTemplate().getBodyPart() != holder.getBodyPart())) { continue; } @@ -494,7 +494,7 @@ public class AppearanceStone { case ONE_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_HAND) != ItemTemplate.SLOT_R_HAND) { continue; } @@ -502,7 +502,7 @@ public class AppearanceStone } case TWO_HANDED: { - if ((targetItem.getItem().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) + if ((targetItem.getTemplate().getBodyPart() & ItemTemplate.SLOT_LR_HAND) != ItemTemplate.SLOT_LR_HAND) { continue; } @@ -514,7 +514,7 @@ public class AppearanceStone { case MAGICAL: { - if (!targetItem.getItem().isMagicWeapon()) + if (!targetItem.getTemplate().isMagicWeapon()) { continue; } @@ -522,7 +522,7 @@ public class AppearanceStone } case PHYISICAL: { - if (targetItem.getItem().isMagicWeapon()) + if (targetItem.getTemplate().isMagicWeapon()) { continue; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java index 76176d2ab3..c21f776020 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/AbstractEnchantItem.java @@ -174,11 +174,11 @@ public abstract class AbstractEnchantItem { return false; } - else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit()))) + else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getTemplate().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getTemplate().getEnchantLimit()))) { return false; } - else if (!isValidItemType(itemToEnchant.getItem().getType2())) + else if (!isValidItemType(itemToEnchant.getTemplate().getType2())) { return false; } @@ -186,7 +186,7 @@ public abstract class AbstractEnchantItem { return false; } - else if (_grade != itemToEnchant.getItem().getCrystalTypePlus()) + else if (_grade != itemToEnchant.getTemplate().getCrystalTypePlus()) { return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java index ea29d773db..21e755c6bc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/enchant/EnchantScroll.java @@ -179,7 +179,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.warning(getClass().getSimpleName() + ": Couldn't find enchant item group for scroll: " + getId() + " requested by: " + player); @@ -213,7 +213,7 @@ public class EnchantScroll extends AbstractEnchantItem return EnchantResultType.ERROR; } - final int crystalLevel = enchantItem.getItem().getCrystalType().getLevel(); + final int crystalLevel = enchantItem.getTemplate().getCrystalType().getLevel(); final double enchantRateStat = (crystalLevel > CrystalType.NONE.getLevel()) && (crystalLevel < CrystalType.EVENT.getLevel()) ? player.getStat().getValue(Stat.ENCHANT_RATE) : 0; final double bonusRate = getBonusRate(); final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 71585587eb..4360620a36 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -129,7 +129,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; @@ -195,18 +195,18 @@ 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()); _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); scheduleLifeTimeTask(); scheduleVisualLifeTime(); } @@ -214,22 +214,22 @@ 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()); _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(); scheduleVisualLifeTime(); } @@ -309,7 +309,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()); } } @@ -326,14 +326,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 @@ -342,7 +342,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 @@ -498,14 +498,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 @@ -515,7 +515,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 @@ -557,7 +557,7 @@ public class Item extends WorldObject { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isEnchantable(); + return _itemTemplate.isEnchantable(); } return false; } @@ -568,7 +568,7 @@ public class Item extends WorldObject */ public boolean isEquipable() { - return _item.getBodyPart() != ItemTemplate.SLOT_NONE; + return _itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE; } /** @@ -590,12 +590,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() @@ -633,7 +633,7 @@ public class Item extends WorldObject */ public ItemType getItemType() { - return _item.getItemType(); + return _itemTemplate.getItemType(); } /** @@ -651,7 +651,7 @@ public class Item extends WorldObject */ public int getDisplayId() { - return _item.getDisplayId(); + return _itemTemplate.getDisplayId(); } /** @@ -659,7 +659,7 @@ public class Item extends WorldObject */ public boolean isEtcItem() { - return (_item instanceof EtcItem); + return (_itemTemplate instanceof EtcItem); } /** @@ -667,7 +667,7 @@ public class Item extends WorldObject */ public boolean isWeapon() { - return (_item instanceof Weapon); + return (_itemTemplate instanceof Weapon); } /** @@ -675,7 +675,7 @@ public class Item extends WorldObject */ public boolean isArmor() { - return (_item instanceof Armor); + return (_itemTemplate instanceof Armor); } /** @@ -683,9 +683,9 @@ public class Item extends WorldObject */ public EtcItem getEtcItem() { - if (_item instanceof EtcItem) + if (_itemTemplate instanceof EtcItem) { - return (EtcItem) _item; + return (EtcItem) _itemTemplate; } return null; } @@ -695,9 +695,9 @@ public class Item extends WorldObject */ public Weapon getWeaponItem() { - if (_item instanceof Weapon) + if (_itemTemplate instanceof Weapon) { - return (Weapon) _item; + return (Weapon) _itemTemplate; } return null; } @@ -707,9 +707,9 @@ public class Item extends WorldObject */ public Armor getArmorItem() { - if (_item instanceof Armor) + if (_itemTemplate instanceof Armor) { - return (Armor) _item; + return (Armor) _itemTemplate; } return null; } @@ -719,7 +719,7 @@ public class Item extends WorldObject */ public int getCrystalCount() { - return _item.getCrystalCount(_enchantLevel); + return _itemTemplate.getCrystalCount(_enchantLevel); } /** @@ -727,7 +727,7 @@ public class Item extends WorldObject */ public long getReferencePrice() { - return _item.getReferencePrice(); + return _itemTemplate.getReferencePrice(); } /** @@ -735,7 +735,7 @@ public class Item extends WorldObject */ public String getItemName() { - return _item.getName(); + return _itemTemplate.getName(); } /** @@ -743,7 +743,7 @@ public class Item extends WorldObject */ public int getReuseDelay() { - return _item.getReuseDelay(); + return _itemTemplate.getReuseDelay(); } /** @@ -751,7 +751,7 @@ public class Item extends WorldObject */ public int getSharedReuseGroup() { - return _item.getSharedReuseGroup(); + return _itemTemplate.getSharedReuseGroup(); } /** @@ -777,7 +777,7 @@ public class Item extends WorldObject */ public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } /** @@ -790,7 +790,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && (getVisualId() == 0) && _item.isDropable(); + return !isAugmented() && (getVisualId() == 0) && _itemTemplate.isDropable(); } /** @@ -803,7 +803,7 @@ public class Item extends WorldObject { return false; } - return _item.isDestroyable(); + return _itemTemplate.isDestroyable(); } /** @@ -816,7 +816,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isTradeable(); + return !isAugmented() && _itemTemplate.isTradeable(); } /** @@ -829,7 +829,7 @@ public class Item extends WorldObject { return true; } - return !isAugmented() && _item.isSellable(); + return !isAugmented() && _itemTemplate.isSellable(); } /** @@ -839,7 +839,7 @@ public class Item extends WorldObject public boolean isDepositable(boolean isPrivateWareHouse) { // equipped, hero and quest items - if (isEquipped() || !_item.isDepositable()) + if (isEquipped() || !_itemTemplate.isDepositable()) { return false; } @@ -853,27 +853,27 @@ public class Item extends WorldObject 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(); } /** @@ -882,12 +882,12 @@ public class Item extends WorldObject */ public boolean isPvp() { - return _item.isPvpItem(); + return _itemTemplate.isPvpItem(); } public boolean isOlyRestrictedItem() { - return _item.isOlyRestrictedItem(); + return _itemTemplate.isOlyRestrictedItem(); } /** @@ -901,12 +901,12 @@ public class Item extends WorldObject final Summon pet = player.getPet(); 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 && ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet && !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll && (allowAdena || (_itemId != ADENA_ID)) // Not Adena - && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_item.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); + && (!player.isCastingNow(s -> s.getSkill().getItemConsumeId() != _itemId)) && (allowNonTradeable || (isTradeable() && (!((_itemTemplate.getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems()))))); } /** @@ -939,7 +939,7 @@ public class Item extends WorldObject clearEnchantStats(); // Agathion skills. - if (isEquipped() && (_item.getBodyPart() == ItemTemplate.SLOT_AGATHION)) + if (isEquipped() && (_itemTemplate.getBodyPart() == ItemTemplate.SLOT_AGATHION)) { final AgathionSkillHolder agathionSkills = AgathionData.getInstance().getSkills(getId()); if (agathionSkills != null) @@ -1035,7 +1035,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; } @@ -1065,7 +1065,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() @@ -1202,9 +1202,9 @@ public class Item extends WorldObject { if (isWeapon()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - return _item.getAttributes().stream().findFirst().orElse(null); + return _itemTemplate.getAttributes().stream().findFirst().orElse(null); } else if (_elementals != null) { @@ -1230,9 +1230,9 @@ public class Item extends WorldObject { if (isArmor()) { - if (_item.getAttributes() != null) + if (_itemTemplate.getAttributes() != null) { - final AttributeHolder attribute = _item.getAttribute(element); + final AttributeHolder attribute = _itemTemplate.getAttribute(element); if (attribute != null) { return attribute.getValue(); @@ -1407,21 +1407,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; } @@ -1430,7 +1430,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 @@ -1598,7 +1598,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()); } } @@ -1754,7 +1754,7 @@ public class Item extends WorldObject @Override public String toString() { - return _item + "[" + getObjectId() + "]"; + return _itemTemplate + "[" + getObjectId() + "]"; } public void resetOwnerTimer() @@ -1788,7 +1788,7 @@ public class Item extends WorldObject public boolean isAvailable() { - if (!_item.isConditionAttached()) + if (!_itemTemplate.isConditionAttached()) { return true; } @@ -1800,14 +1800,14 @@ public class Item extends WorldObject final Creature owner = getActingPlayer(); if (owner != null) { - for (Condition condition : _item.getConditions()) + for (Condition condition : _itemTemplate.getConditions()) { if (condition == null) { continue; } - if (!condition.testImpl(owner, owner, null, _item)) + if (!condition.testImpl(owner, owner, null, _itemTemplate)) { return false; } @@ -1959,26 +1959,26 @@ public class Item extends WorldObject public boolean isQuestItem() { - return _item.isQuestItem(); + return _itemTemplate.isQuestItem(); } public boolean isElementable() { if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL)) { - return _item.isElementable(); + return _itemTemplate.isElementable(); } return false; } public boolean isFreightable() { - return _item.isFreightable(); + return _itemTemplate.isFreightable(); } public int useSkillDisTime() { - return _item.useSkillDisTime(); + return _itemTemplate.useSkillDisTime(); } public int getOlyEnchantLevel() @@ -1993,7 +1993,7 @@ public class Item extends WorldObject if (player.isInOlympiadMode()) { - if (_item.isWeapon()) + if (_itemTemplate.isWeapon()) { if ((Config.ALT_OLY_WEAPON_ENCHANT_LIMIT >= 0) && (enchant > Config.ALT_OLY_WEAPON_ENCHANT_LIMIT)) { @@ -2014,7 +2014,7 @@ public class Item extends WorldObject public boolean hasPassiveSkills() { - return (_item.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_item.getSkills(ItemSkillType.NORMAL) != null); + return (_itemTemplate.getItemType() == EtcItemType.ENCHT_ATTR_RUNE) && (_loc == ItemLocation.INVENTORY) && (_ownerId > 0) && (_itemTemplate.getSkills(ItemSkillType.NORMAL) != null); } public void giveSkillsToOwner() @@ -2027,7 +2027,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2048,7 +2048,7 @@ public class Item extends WorldObject final Player player = getActingPlayer(); if (player != null) { - _item.forEachSkill(ItemSkillType.NORMAL, holder -> + _itemTemplate.forEachSkill(ItemSkillType.NORMAL, holder -> { final Skill skill = holder.getSkill(); if (skill.isPassive()) @@ -2077,7 +2077,7 @@ public class Item extends WorldObject public int getEquipReuseDelay() { - return _item.getEquipReuseDelay(); + return _itemTemplate.getEquipReuseDelay(); } /** @@ -2098,11 +2098,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()); } } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java index 7d70f34ed8..732d21b942 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemauction/AuctionItem.java @@ -81,7 +81,7 @@ public class AuctionItem final Item item = new Item(IdManager.getInstance().getNextId(), _itemId); World.getInstance().addObject(item); item.setCount(_itemCount); - item.setEnchantLevel(item.getItem().getDefaultEnchantLevel()); + item.setEnchantLevel(item.getTemplate().getDefaultEnchantLevel()); return item; } } \ No newline at end of file diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java index 1462e18bb3..9cd5209abd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ClanWarehouse.java @@ -71,7 +71,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; } @@ -79,7 +79,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); } @@ -87,7 +87,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); } @@ -97,7 +97,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); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e7c0f42957..0bb77047f7 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -316,7 +316,7 @@ public abstract class Inventory extends ItemContainer } final Player player = (Player) inventory.getOwner(); - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); final Map addedSkills = new HashMap<>(1); final Map removedSkills = new HashMap<>(1); boolean update = false; @@ -381,7 +381,7 @@ public abstract class Inventory extends ItemContainer continue; } - final List otherNormalSkills = itm.getItem().getSkills(ItemSkillType.NORMAL); + final List otherNormalSkills = itm.getTemplate().getSkills(ItemSkillType.NORMAL); if (otherNormalSkills == null) { continue; @@ -432,12 +432,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -535,9 +535,9 @@ public abstract class Inventory extends ItemContainer // Apply SA skill item.applySpecialAbilities(); - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { - final List onEnchantSkills = item.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List onEnchantSkills = item.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (onEnchantSkills != null) { for (ItemSkillHolder holder : onEnchantSkills) @@ -579,7 +579,7 @@ public abstract class Inventory extends ItemContainer } } - final List normalSkills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List normalSkills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if (normalSkills != null) { for (ItemSkillHolder holder : normalSkills) @@ -631,12 +631,12 @@ public abstract class Inventory extends ItemContainer // Must check all equipped items for enchant conditions. for (Item equipped : inventory.getPaperdollItems()) { - if (!equipped.getItem().hasSkills()) + if (!equipped.getTemplate().hasSkills()) { continue; } - final List otherEnchantSkills = equipped.getItem().getSkills(ItemSkillType.ON_ENCHANT); + final List otherEnchantSkills = equipped.getTemplate().getSkills(ItemSkillType.ON_ENCHANT); if (otherEnchantSkills == null) { continue; @@ -684,7 +684,7 @@ public abstract class Inventory extends ItemContainer // Apply skill, if item has "skills on equip" and it is not a secondary agathion. if ((slot < PAPERDOLL_AGATHION2) || (slot > PAPERDOLL_AGATHION5)) { - item.getItem().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); + item.getTemplate().forEachSkill(ItemSkillType.ON_EQUIP, holder -> holder.getSkill().activateSkill(player, player)); } if (!addedSkills.isEmpty()) @@ -746,7 +746,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -891,7 +891,7 @@ public abstract class Inventory extends ItemContainer player.sendSkillList(); } - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH)) { player.updateActiveBroochJewel(); } @@ -916,7 +916,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); @@ -952,7 +952,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH) { inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL1); inventory.unEquipItemInSlot(PAPERDOLL_BROOCH_JEWEL2); @@ -988,7 +988,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_BRACELET) { inventory.unEquipItemInSlot(PAPERDOLL_AGATHION1); inventory.unEquipItemInSlot(PAPERDOLL_AGATHION2); @@ -1022,7 +1022,7 @@ public abstract class Inventory extends ItemContainer return; } - if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) + if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT_BOOK) { inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT1); inventory.unEquipItemInSlot(PAPERDOLL_ARTIFACT2); @@ -1449,7 +1449,7 @@ public abstract class Inventory extends ItemContainer if (old != null) { // Prevent flood from using items with skills. - if (old.getItem().hasSkills()) + if (old.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1468,7 +1468,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; @@ -1514,7 +1514,7 @@ public abstract class Inventory extends ItemContainer if (item != null) { // Prevent flood from using items with skills. - if (item.getItem().hasSkills()) + if (item.getTemplate().hasSkills()) { checkEquipTask(); } @@ -1527,7 +1527,7 @@ public abstract class Inventory extends ItemContainer item.setLastChange(Item.MODIFIED); // Notify all paperdoll listener in order to equip item in slot - _wearedMask |= item.getItem().getItemMask(); + _wearedMask |= item.getTemplate().getItemMask(); for (PaperdollListener listener : _paperdollListeners) { if (listener == null) @@ -1590,7 +1590,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()); } } @@ -1692,7 +1692,7 @@ public abstract class Inventory extends ItemContainer } case PAPERDOLL_CHEST: { - slot = item.getItem().getBodyPart(); + slot = item.getTemplate().getBodyPart(); break; } case PAPERDOLL_LEGS: @@ -2007,11 +2007,11 @@ public abstract class Inventory extends ItemContainer } } - final long targetSlot = item.getItem().getBodyPart(); + final long 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 if ((targetSlot == ItemTemplate.SLOT_LR_HAND) || (targetSlot == ItemTemplate.SLOT_L_HAND) || (targetSlot == ItemTemplate.SLOT_R_HAND) || (targetSlot == ItemTemplate.SLOT_LEGS) || (targetSlot == ItemTemplate.SLOT_FEET) || (targetSlot == ItemTemplate.SLOT_GLOVES) || (targetSlot == ItemTemplate.SLOT_HEAD)) @@ -2034,7 +2034,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_L_HAND) { final Item rh = getPaperdollItem(PAPERDOLL_RHAND); - if ((rh != null) && (rh.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))) + if ((rh != null) && (rh.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) && !((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE))) { if (!item.isArmor() || (item.getArmorItem().getItemType() != ArmorType.SIGIL)) { @@ -2093,7 +2093,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == ItemTemplate.SLOT_LEGS) { 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); } @@ -2114,7 +2114,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2127,7 +2127,7 @@ public abstract class Inventory extends ItemContainer else if (targetSlot == 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); } @@ -2211,9 +2211,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); @@ -2254,7 +2254,7 @@ public abstract class Inventory extends ItemContainer Item arrow = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getItem().getCrystalTypePlus() == bow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.ARROW) && (item.getTemplate().getCrystalTypePlus() == bow.getCrystalTypePlus())) { arrow = item; break; @@ -2275,7 +2275,7 @@ public abstract class Inventory extends ItemContainer Item bolt = null; for (Item item : _items) { - if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getItem().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) + if (item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.BOLT) && (item.getTemplate().getCrystalTypePlus() == crossbow.getCrystalTypePlus())) { bolt = item; break; @@ -2387,7 +2387,7 @@ public abstract class Inventory extends ItemContainer return; } - switch (item.getItem().getArtifactSlot()) + switch (item.getTemplate().getArtifactSlot()) { case 1: // Attack { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java index fb47cce094..c2fcc89c91 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/ItemContainer.java @@ -175,7 +175,7 @@ public abstract class ItemContainer { for (Item item : _items) { - if (item.getItem().isAllowSelfResurrection()) + if (item.getTemplate().isAllowSelfResurrection()) { return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 34e8773117..5bb8985905 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_10.0_MasterClass/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()); } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java index 769149f9c2..15b1b01577 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java @@ -432,7 +432,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, addedItem), actor, addedItem.getTemplate()); } } return addedItem; @@ -507,7 +507,7 @@ public class PlayerInventory extends Inventory } // Notify to scripts - EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getItem()); + EventDispatcher.getInstance().notifyEventAsync(new OnPlayerItemAdd(actor, item), actor, item.getTemplate()); } return item; } @@ -538,7 +538,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; } @@ -594,7 +594,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; @@ -667,7 +667,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; @@ -700,7 +700,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; @@ -870,7 +870,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++; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java index b3f961de5b..c406ad33fc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/skill/SkillCaster.java @@ -357,7 +357,7 @@ public class SkillCaster implements Runnable { // Get the Item consumed by the spell. final Item requiredItem = caster.getInventory().getItemByItemId(_skill.getItemConsumeId()); - if (_skill.isBad() || (requiredItem.getItem().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. + if (_skill.isBad() || (requiredItem.getTemplate().getDefaultAction() == ActionType.NONE)) // Non reagent items are removed at finishSkill or item handler. { caster.destroyItem(_skill.toString(), requiredItem.getObjectId(), _skill.getItemConsumeCount(), caster, false); } @@ -517,7 +517,7 @@ public class SkillCaster implements Runnable } // Consume skill reduced item on success. - if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) + if ((_item != null) && (_item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS) && (_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItem(_skill.toString(), _item.getObjectId(), _skill.getItemConsumeCount(), target, true)) { return false; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java index 895c00a231..292794ad91 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/IStatFunction.java @@ -49,9 +49,9 @@ public interface IStatFunction for (int slot : slots) { final Item item = creature.getInventory().getPaperdollItemByItemId(slot); - if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getItem().getCrystalTypePlus() == CrystalType.R)) + if ((item != null) && (item.getEnchantLevel() >= 4) && (item.getTemplate().getCrystalTypePlus() == CrystalType.R)) { - value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getItem().isBlessed()); + value += calcEnchantBodyPartBonus(item.getEnchantLevel(), item.getTemplate().isBlessed()); } } return value; @@ -71,12 +71,12 @@ public interface IStatFunction final Pet pet = (Pet) creature; final Item weapon = pet.getActiveWeaponInstance(); final double baseVal = stat == Stat.PHYSICAL_ATTACK ? pet.getPetLevelData().getPetPAtk() : stat == Stat.MAGIC_ATTACK ? pet.getPetLevelData().getPetMAtk() : baseTemplateValue; - baseValue = baseVal + (weapon != null ? weapon.getItem().getStats(stat, baseVal) : 0); + baseValue = baseVal + (weapon != null ? weapon.getTemplate().getStats(stat, baseVal) : 0); } else if (creature.isPlayer() && (!creature.isTransformed() || (creature.getTransformation().get().getType() == TransformType.COMBAT) || (creature.getTransformation().get().getType() == TransformType.MODE_CHANGE))) { final Item weapon = creature.getActiveWeaponInstance(); - baseValue = (weapon != null ? weapon.getItem().getStats(stat, baseTemplateValue) : baseTemplateValue); + baseValue = (weapon != null ? weapon.getTemplate().getStats(stat, baseTemplateValue) : baseTemplateValue); } return baseValue; @@ -109,7 +109,7 @@ public interface IStatFunction double value = 0; for (Item equippedItem : creature.getInventory().getPaperdollItems(Item::isEnchanted)) { - final ItemTemplate item = equippedItem.getItem(); + final ItemTemplate item = equippedItem.getTemplate(); final long bodypart = item.getBodyPart(); if ((bodypart == ItemTemplate.SLOT_HAIR) || // (bodypart == ItemTemplate.SLOT_HAIR2) || // @@ -171,7 +171,7 @@ public interface IStatFunction */ static double calcEnchantDefBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -192,7 +192,7 @@ public interface IStatFunction */ static double calcEnchantMatkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { @@ -229,7 +229,7 @@ public interface IStatFunction */ static double calcEnchantedPAtkBonus(Item item, double blessedBonus, int enchant) { - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case R: { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java index b057f5c85d..68cf6eede9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/AttributeFinalizer.java @@ -59,7 +59,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = weapon.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = weapon.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); @@ -79,7 +79,7 @@ public class AttributeFinalizer implements IStatFunction baseValue += weaponInstanceHolder.getValue(); } - final AttributeHolder weaponHolder = item.getItem().getAttribute(_type); + final AttributeHolder weaponHolder = item.getTemplate().getAttribute(_type); if (weaponHolder != null) { baseValue += weaponHolder.getValue(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java index c3257b0c0f..8f916369b4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java @@ -59,7 +59,7 @@ public class MDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java index 98d5766746..10d5d8f3e3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java @@ -73,12 +73,12 @@ public class MaxHpFinalizer implements IStatFunction // Add maxHP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); // Apply enchanted item bonus HP if (item.isArmor() && item.isEnchanted()) { - final long bodyPart = item.getItem().getBodyPart(); + final long bodyPart = item.getTemplate().getBodyPart(); if ((bodyPart != ItemTemplate.SLOT_NECK) && (bodyPart != ItemTemplate.SLOT_LR_EAR) && (bodyPart != ItemTemplate.SLOT_LR_FINGER)) { addItem += EnchantItemHPBonusData.getInstance().getHPBonus(item); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java index d38eccd226..567b8b1387 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java @@ -71,7 +71,7 @@ public class MaxMpFinalizer implements IStatFunction // Add maxMP bonus from items for (Item item : inv.getPaperdollItems()) { - addItem += item.getItem().getStats(stat, 0); + addItem += item.getTemplate().getStats(stat, 0); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java index c4b2ee6602..265cef95f4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java @@ -63,7 +63,7 @@ public class PDefenseFinalizer implements IStatFunction { for (Item item : inv.getPaperdollItems()) { - baseValue += item.getItem().getStats(stat, 0); + baseValue += item.getTemplate().getStats(stat, 0); } if (creature.isPlayer()) @@ -72,7 +72,7 @@ public class PDefenseFinalizer implements IStatFunction for (int slot : SLOTS) { if (!inv.isPaperdollSlotEmpty(slot) || // - ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) + ((slot == Inventory.PAPERDOLL_LEGS) && !inv.isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR))) { final int defaultStatValue = player.getTemplate().getBaseDefBySlot(slot); baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java index 02c4afde37..5b48d65bbd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java @@ -172,7 +172,7 @@ public abstract class AbstractRefinePacket implements IClientIncomingPacket } } - if (!(item.getItem() instanceof Weapon) && !(item.getItem() instanceof Armor)) + if (!(item.getTemplate() instanceof Weapon) && !(item.getTemplate() instanceof Armor)) { return false; // neither weapon nor armor ? } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index 2f8b880801..68dfc938b9 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -499,7 +499,7 @@ public class MultiSellChoose implements IClientIncomingPacket final Item addedItem = inventory.addItem("Multisell", product.getId(), totalCount, player, npc, false); // Check if the newly given item should be enchanted. - if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getItem().getClass().equals(itemEnchantment.getItem().getClass())) + if (itemEnchantmentProcessed && list.isMaintainEnchantment() && (itemEnchantment != null) && addedItem.isEquipable() && addedItem.getTemplate().getClass().equals(itemEnchantment.getItem().getClass())) { addedItem.setEnchantLevel(itemEnchantment.getEnchantLevel()); addedItem.setAugmentation(itemEnchantment.getAugmentation(), false); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java index 0341d285b8..f840b482e2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java @@ -72,7 +72,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket return; } - if (isSummonShot(item.getItem())) + if (isSummonShot(item.getTemplate())) { if (player.hasSummon()) { @@ -124,7 +124,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket if (pet != null) { // Send message - if (!pet.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!pet.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -136,7 +136,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket for (Summon summon : player.getServitors().values()) { // Send message - if (!summon.isChargedShot(item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) + if (!summon.isChargedShot(item.getTemplate().getDefaultAction() == ActionType.SUMMON_SOULSHOT ? ShotType.SOULSHOTS : ((item.getId() == 6647) || (item.getId() == 20334)) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS)) { final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_ACTIVATED); sm.addItemName(item); @@ -151,7 +151,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_A_SERVITOR_OR_PET_AND_THEREFORE_CANNOT_USE_THE_AUTOMATIC_USE_FUNCTION); } } - else if (isPlayerShot(item.getItem())) + else if (isPlayerShot(item.getTemplate())) { final boolean isSoulshot = item.getEtcItem().getDefaultAction() == ActionType.SOULSHOT; final boolean isSpiritshot = item.getEtcItem().getDefaultAction() == ActionType.SPIRITSHOT; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index f887d8312e..2f83c2dc85 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -137,7 +137,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(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java index 2361dc60e4..a48a9dda19 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java @@ -117,7 +117,7 @@ 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)) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_CRYSTALLIZED); return; @@ -132,7 +132,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 D: { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 7558c4ff4e..dc3be6833a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -153,7 +153,7 @@ public class RequestDestroyItem implements IClientIncomingPacket count = itemToRemove.getCount(); } - if (itemToRemove.getItem().isPetItem()) + if (itemToRemove.getTemplate().isPetItem()) { final Summon pet = player.getPet(); if ((pet != null) && (pet.getControlObjectId() == _objectId)) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index bbc78d9061..d53c021ecd 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -148,13 +148,13 @@ public class RequestDropItem implements IClientIncomingPacket } // Cannot discard item that the skill is consuming. - if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) + if (player.isCastingNow(s -> (s.getSkill().getItemConsumeId() == item.getId()) && (item.getTemplate().getDefaultAction() == ActionType.SKILL_REDUCE_ON_SKILL_SUCCESS))) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_DESTROYED); return; } - 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; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 928fe73e03..90773a19b4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -120,7 +120,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } // first validation check - also over enchant check - if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getItem().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getItem().getEnchantLimit()))))) + if (!scrollTemplate.isValid(item, supportTemplate) || (Config.DISABLE_OVER_ENCHANTING && ((item.getEnchantLevel() == scrollTemplate.getMaxEnchantLevel()) || (!(item.getTemplate().getEnchantLimit() == 0) && (item.getEnchantLevel() == item.getTemplate().getEnchantLimit()))))) { player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS); player.removeRequest(request.getClass()); @@ -181,7 +181,7 @@ public class RequestEnchantItem implements IClientIncomingPacket } case SUCCESS: { - 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) { @@ -387,13 +387,13 @@ public class RequestEnchantItem implements IClientIncomingPacket World.getInstance().removeObject(item); int count = 0; - if (item.getItem().isCrystallizable()) + if (item.getTemplate().isCrystallizable()) { - count = Math.max(0, item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2)); + count = Math.max(0, item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2)); } Item crystals = null; - final int crystalId = item.getItem().getCrystalItemId(); + final int crystalId = item.getTemplate().getCrystalItemId(); if (count > 0) { crystals = player.getInventory().addItem("Enchant", crystalId, count, player, item); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java index cb2102e374..f0852bb7aa 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java @@ -105,14 +105,14 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket } // Quest Q10579_ContainingTheAttributePower check. - if ((item.getItem().getId() == 48168) && (stone.getItem().getId() != 48169)) + if ((item.getTemplate().getId() == 48168) && (stone.getTemplate().getId() != 48169)) { player.removeRequest(request.getClass()); player.sendPacket(SystemMessageId.ATTRIBUTE_ITEM_USAGE_HAS_BEEN_CANCELLED); return; } - if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getItem().getId())) + if (!ElementalAttributeData.getInstance().isElementableWithStone(item, stone.getTemplate().getId())) { player.sendPacket(SystemMessageId.ELEMENTAL_POWER_ENHANCER_USAGE_REQUIREMENT_IS_NOT_SUFFICIENT); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java index cce9fc4f8f..06e1b203fc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java @@ -124,11 +124,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; } @@ -140,7 +140,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S80: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 100000; } @@ -152,7 +152,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case S84: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 200000; } @@ -164,7 +164,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 400000; } @@ -176,7 +176,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R95: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 800000; } @@ -188,7 +188,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R99: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 3200000; } @@ -200,7 +200,7 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket } case R110: { - if (item.getItem() instanceof Weapon) + if (item.getTemplate() instanceof Weapon) { _price = 6400000; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java index c9b6d4dd3a..df02093863 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestExTryEnchantArtifact.java @@ -88,7 +88,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket return; } - final ItemTemplate item = targetItem.getItem(); + final ItemTemplate item = targetItem.getTemplate(); final int artifactSlot = item.getArtifactSlot(); if (artifactSlot <= 0) { @@ -143,7 +143,7 @@ public class RequestExTryEnchantArtifact implements IClientIncomingPacket for (int objectId : _ingridients) { final Item ingridient = player.getInventory().getItemByObjectId(objectId); - if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getItem().getArtifactSlot() != artifactSlot)) + if ((ingridient == null) || (ingridient.getEnchantLevel() < minIngridientEnchant) || (ingridient.getTemplate().getArtifactSlot() != artifactSlot)) { player.sendPacket(ExTryEnchantArtifactResult.ERROR_PACKET); return; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java index 0d858fb452..14b7867260 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java +++ b/L2J_Mobius_10.0_MasterClass/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; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 0acf549bed..cb28204e5a 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -151,7 +151,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(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java index 776e7f818f..94b1c7e143 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java @@ -155,7 +155,7 @@ public class RequestRecipeItemMakeSelf implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), null, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java index 00daed9223..99ae226bfb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java @@ -198,7 +198,7 @@ public class RequestRecipeShopMakeItem implements IClientIncomingPacket final Item item = player.getInventory().getItemByObjectId(offer.getId()); if (player.destroyItem("CraftOffering", item, offer.getCount(), manufacturer, true)) { - offeredAdenaWorth += (item.getItem().getReferencePrice() * offer.getCount()); + offeredAdenaWorth += (item.getTemplate().getReferencePrice() * offer.getCount()); } } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java index cd28e2a63e..eaaee18712 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefundItem.java @@ -142,7 +142,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 diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index c7a2467e04..3f4c9d1f83 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_10.0_MasterClass/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; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index 7224f6c56b..7f8843c3a1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -126,7 +126,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(); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 500f3545b4..922070a4d2 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -113,7 +113,7 @@ public class UseItem implements IClientIncomingPacket return; } - if (item.isQuestItem() && (item.getItem().getDefaultAction() != ActionType.NONE)) + if (item.isQuestItem() && (item.getTemplate().getDefaultAction() != ActionType.NONE)) { player.sendPacket(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS); return; @@ -134,7 +134,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; } @@ -149,7 +149,7 @@ public class UseItem implements IClientIncomingPacket if (!Config.ALT_GAME_KARMA_PLAYER_CAN_TELEPORT && (player.getReputation() < 0)) { - final List skills = item.getItem().getSkills(ItemSkillType.NORMAL); + final List skills = item.getTemplate().getSkills(ItemSkillType.NORMAL); if ((skills != null) && skills.stream().anyMatch(holder -> holder.getSkill().hasEffectType(EffectType.TELEPORT))) { return; @@ -200,14 +200,14 @@ public class UseItem implements IClientIncomingPacket return; } - if (player.getInventory().isItemSlotBlocked(item.getItem().getBodyPart())) + if (player.getInventory().isItemSlotBlocked(item.getTemplate().getBodyPart())) { player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_REQUIRED_CONDITION_TO_EQUIP_THAT_ITEM); return; } // Prevent players to equip weapon while wearing combat flag // Don't allow weapon/shield equipment if a cursed weapon is equipped. - if ((item.getItem().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getItem().getBodyPart() == ItemTemplate.SLOT_R_HAND)) + if ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_L_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) { if ((player.getActiveWeaponItem() != null) && (player.getActiveWeaponItem().getId() == 9819)) { @@ -224,7 +224,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_DECO) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_DECO) { if (!item.isEquipped() && (player.getInventory().getTalismanSlots() == 0)) { @@ -232,7 +232,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_BROOCH_JEWEL) { if (!item.isEquipped() && (player.getInventory().getBroochJewelSlots() == 0)) { @@ -242,7 +242,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_AGATHION) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_AGATHION) { if (!item.isEquipped() && (player.getInventory().getAgathionSlots() == 0)) { @@ -250,7 +250,7 @@ public class UseItem implements IClientIncomingPacket return; } } - else if (item.getItem().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) + else if (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_ARTIFACT) { if (!item.isEquipped() && (player.getInventory().getArtifactSlots() == 0)) { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java index 6d286b4894..d94b79c9c4 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingEnchantSupportItem.java @@ -80,7 +80,7 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); @@ -133,14 +133,14 @@ public class RequestExTryToPutShapeShiftingEnchantSupportItem implements IClient return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(SystemMessageId.THIS_ITEM_DOES_NOT_MEET_REQUIREMENTS); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(SystemMessageId.YOU_CANNOT_EXTRACT_FROM_ITEMS_THAT_ARE_HIGHER_GRADE_THAN_ITEMS_TO_BE_MODIFIED); player.sendPacket(ExPutShapeShiftingExtractionItemResult.FAILED); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java index 1c8eaa09c2..0099a38cbb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestExTryToPutShapeShiftingTargetItem.java @@ -77,7 +77,7 @@ public class RequestExTryToPutShapeShiftingTargetItem implements IClientIncoming return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExPutShapeShiftingTargetItemResult.FAILED); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java index 2a6d3e9bb9..1ec5c99502 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/appearance/RequestShapeShiftingItem.java @@ -86,7 +86,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!targetItem.getItem().isAppearanceable()) + if (!targetItem.getTemplate().isAppearanceable()) { player.sendPacket(SystemMessageId.THIS_ITEM_CANNOT_BE_MODIFIED_OR_RESTORED); player.sendPacket(ExShapeShiftingResult.CLOSE); @@ -141,7 +141,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (!extractItem.getItem().isAppearanceable()) + if (!extractItem.getTemplate().isAppearanceable()) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -155,7 +155,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if (extractItem.getItem().getCrystalType().isGreater(targetItem.getItem().getCrystalType())) + if (extractItem.getTemplate().getCrystalType().isGreater(targetItem.getTemplate().getCrystalType())) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); @@ -176,7 +176,7 @@ public class RequestShapeShiftingItem implements IClientIncomingPacket return; } - if ((extractItem.getItem().getBodyPart() != targetItem.getItem().getBodyPart()) && ((extractItem.getItem().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getItem().getBodyPart() != ItemTemplate.SLOT_CHEST))) + if ((extractItem.getTemplate().getBodyPart() != targetItem.getTemplate().getBodyPart()) && ((extractItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_FULL_ARMOR) || (targetItem.getTemplate().getBodyPart() != ItemTemplate.SLOT_CHEST))) { player.sendPacket(ExShapeShiftingResult.CLOSE); player.removeRequest(ShapeShiftingItemRequest.class); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java index 1da5028812..7446649384 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantPushTwo.java @@ -84,7 +84,7 @@ public class RequestNewEnchantPushTwo implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)) { player.sendPacket(ExEnchantTwoFail.STATIC_PACKET); return; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java index 54ce84fa38..b0f684b59f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/compound/RequestNewEnchantTry.java @@ -86,7 +86,7 @@ public class RequestNewEnchantTry implements IClientIncomingPacket } // Lets prevent using same item twice. Also stackable item check. - if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getItem().getId(), -1) < 2)) + if ((itemOne.getObjectId() == itemTwo.getObjectId()) && (player.getInventory().getInventoryItemCount(itemOne.getTemplate().getId(), -1) < 2)) { player.sendPacket(new ExEnchantFail(itemOne.getId(), itemTwo.getId())); player.removeRequest(request.getClass()); diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java index 31298a1992..3b20bb0041 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/crystalization/RequestCrystallizeEstimate.java @@ -93,10 +93,10 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket return; } - if (!item.getItem().isCrystallizable() || (item.getItem().getCrystalCount() <= 0) || (item.getItem().getCrystalType() == CrystalType.NONE)) + if (!item.getTemplate().isCrystallizable() || (item.getTemplate().getCrystalCount() <= 0) || (item.getTemplate().getCrystalType() == CrystalType.NONE)) { player.sendPacket(ActionFailed.STATIC_PACKET); - PacketLogger.warning(player + ": tried to crystallize " + item.getItem()); + PacketLogger.warning(player + ": tried to crystallize " + item.getTemplate()); return; } @@ -114,7 +114,7 @@ public class RequestCrystallizeEstimate implements IClientIncomingPacket // Check if the char can crystallize items and return if false; boolean canCrystallize = true; - switch (item.getItem().getCrystalTypePlus()) + switch (item.getTemplate().getCrystalTypePlus()) { case D: { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java index 8581ba621a..2c9f68e77f 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestItemEnsoul.java @@ -186,19 +186,19 @@ public class RequestItemEnsoul implements IClientIncomingPacket if (itemOption.getType() == 1) { // Normal Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position); if (((itemOption.getPosition() == 1) || (itemOption.getPosition() == 2)) && (item.getSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position); + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position); } } else if (itemOption.getType() == 2) { // Mystic Soul Crystal - fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getEnsoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 if ((itemOption.getPosition() == 1) && (item.getAdditionalSpecialAbility(position) != null)) { - fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position + 2); // Client Special type position = 0 + fee = EnsoulData.getInstance().getResoulFee(item.getTemplate().getCrystalType(), position + 2); // Client Special type position = 0 } } else diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java index eb65524f28..f71d3e9429 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/ensoul/RequestTryEnSoulExtraction.java @@ -86,7 +86,7 @@ public class RequestTryEnSoulExtraction implements IClientIncomingPacket return; } - final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getItem().getCrystalType()); + final Collection removalFee = EnsoulData.getInstance().getRemovalFee(item.getTemplate().getCrystalType()); if (removalFee.isEmpty()) { return; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java index 3220827fbb..a33544c3cc 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/equipmentupgrade/RequestUpgradeSystemResult.java @@ -86,7 +86,7 @@ public class RequestUpgradeSystemResult implements IClientIncomingPacket return; } - if ((existingItem.getItem().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) + if ((existingItem.getTemplate().getId() != upgradeHolder.getRequiredItemId()) || (existingItem.getEnchantLevel() != upgradeHolder.getRequiredItemEnchant())) { player.sendPacket(new ExUpgradeSystemResult(0, 0)); return; diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java index 567cfc70f9..ed598e5198 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExBuySellList.java @@ -67,7 +67,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 @@ -82,7 +82,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 diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java index 51e6646ff5..834777139d 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java @@ -60,7 +60,7 @@ public class ExShowBaseAttributeCancelWindow implements IClientOutgoingPacket */ private long getPrice(Item item) { - switch (item.getItem().getCrystalType()) + switch (item.getTemplate().getCrystalType()) { case S: { diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java index df056c2e43..f5ff1f56db 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java @@ -53,7 +53,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); } } else @@ -64,7 +64,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); } packet.writeD(0); for (TradeItem item2 : _buyList) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java index db6c5307ee..ba507d82d3 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java @@ -55,11 +55,11 @@ public class SellListProcure implements IClientOutgoingPacket for (Entry 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 } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java index b8a4b0d12f..1364eac945 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java @@ -103,7 +103,7 @@ public class AutoUseTaskManager implements Runnable continue ITEMS; } - final ItemTemplate it = item.getItem(); + final ItemTemplate it = item.getTemplate(); if (it != null) { if (!it.checkCondition(player, player, false)) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java index f14bb3063f..86167d7e54 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/taskmanager/ItemsAutoDestroyTaskManager.java +++ b/L2J_Mobius_10.0_MasterClass/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; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java index 7135045f6a..b7a9ef5e05 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/EnchantFormatter.java +++ b/L2J_Mobius_10.0_MasterClass/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) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java index b24cfd796d..21e50a77cb 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/log/formatter/ItemLogFormatter.java +++ b/L2J_Mobius_10.0_MasterClass/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 { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java index 50cee4939c..2c92d8c4a7 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java @@ -235,7 +235,7 @@ public class Inventory public List equipItem(Item item) { final List changedItems = new ArrayList<>(); - final int targetSlot = item.getItem().getBodyPart(); + final int targetSlot = item.getTemplate().getBodyPart(); switch (targetSlot) { case ItemTemplate.SLOT_LR_HAND: @@ -255,7 +255,7 @@ public class Inventory } setPaperdollItem(PAPERDOLL_RHAND, item); setPaperdollItem(PAPERDOLL_LRHAND, item); - if ((((Weapon) item.getItem()).getWeaponType() != Weapon.WEAPON_TYPE_BOW) || ((arrow = findArrowForBow(item.getItem())) == null)) + if ((((Weapon) item.getTemplate()).getWeaponType() != Weapon.WEAPON_TYPE_BOW) || ((arrow = findArrowForBow(item.getTemplate())) == null)) { break; } @@ -347,7 +347,7 @@ public class Inventory case ItemTemplate.SLOT_LEGS: { final Item chest = getPaperdollItem(10); - if ((chest != null) && (chest.getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)) + if ((chest != null) && (chest.getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)) { unEquipSlot(changedItems, PAPERDOLL_CHEST); } @@ -536,7 +536,7 @@ public class Inventory } if (oldItem.isEquipped()) { - unEquipItemInBodySlot(oldItem.getItem().getBodyPart()); + unEquipItemInBodySlot(oldItem.getTemplate().getBodyPart()); } if (oldItem.getItemId() == 57) { @@ -565,7 +565,7 @@ public class Inventory int weight = 0; for (Item item : _items) { - weight += item.getItem().getWeight() * item.getCount(); + weight += item.getTemplate().getWeight() * item.getCount(); } _totalWeight = weight; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 6825833d5e..c51da95370 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -858,7 +858,7 @@ public class Player extends Creature { return getFistsWeaponItem(); } - return (Weapon) weapon.getItem(); + return (Weapon) weapon.getTemplate(); } @Override @@ -1282,37 +1282,37 @@ public class Player extends Creature Item dummy = getInventory().getPaperdollItem(13); if (dummy != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } if ((dummy = getInventory().getPaperdollItem(10)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } if ((dummy = getInventory().getPaperdollItem(12)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } if ((dummy = getInventory().getPaperdollItem(9)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } if ((dummy = getInventory().getPaperdollItem(6)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } if ((dummy = getInventory().getPaperdollItem(11)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } if ((dummy = getInventory().getPaperdollItem(0)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getPDef(); } final double pDef = totalItemDef * lvlmod; @@ -1380,27 +1380,27 @@ public class Player extends Creature Item dummy = getInventory().getPaperdollItem(1); if (dummy != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getMDef(); } if ((dummy = getInventory().getPaperdollItem(4)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getMDef(); } if ((dummy = getInventory().getPaperdollItem(3)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getMDef(); } if ((dummy = getInventory().getPaperdollItem(2)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getMDef(); } if ((dummy = getInventory().getPaperdollItem(5)) != null) { - armorPiece = (Armor) dummy.getItem(); + armorPiece = (Armor) dummy.getTemplate(); totalItemDef += armorPiece.getMDef(); } final double mDef = totalItemDef * lvlBonus * menBonus; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java index 1c05a82d9e..6e18325a80 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java @@ -402,7 +402,7 @@ public class Pet extends Creature final Inventory petInventory = getInventory(); for (Item giveit : petInventory.getItems()) { - if (((giveit.getItem().getWeight() * giveit.getCount()) + _owner.getInventory().getTotalWeight()) < _owner.getMaxLoad()) + if (((giveit.getTemplate().getWeight() * giveit.getCount()) + _owner.getInventory().getTotalWeight()) < _owner.getMaxLoad()) { giveItemToOwner(giveit); continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java index 0d43e938eb..9db232d9b9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java @@ -27,7 +27,7 @@ public class Item extends WorldObject { private int _count = 1; private int _itemId; - private ItemTemplate _item; + private ItemTemplate _itemTemplate; private int _equippedSlot = -1; private int _price; private int _enchantLevel; @@ -49,7 +49,7 @@ public class Item extends WorldObject public boolean isEquipable() { - return (_item.getBodyPart() != ItemTemplate.SLOT_NONE) && !(_item instanceof EtcItem); + return (_itemTemplate.getBodyPart() != ItemTemplate.SLOT_NONE) && !(_itemTemplate instanceof EtcItem); } public boolean isEquipped() @@ -67,15 +67,15 @@ public class Item extends WorldObject return _equippedSlot; } - public ItemTemplate getItem() + public ItemTemplate getTemplate() { - return _item; + return _itemTemplate; } - public void setItem(ItemTemplate item) + public void setItem(ItemTemplate itemTemplate) { - _item = item; - _itemId = item.getItemId(); + _itemTemplate = itemTemplate; + _itemId = itemTemplate.getItemId(); } public int getItemId() @@ -105,7 +105,7 @@ public class Item extends WorldObject public boolean isStackable() { - return _item.isStackable(); + return _itemTemplate.isStackable(); } @Override diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java index 4cd0706970..4e6ea5ed44 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java @@ -326,7 +326,7 @@ public class ClientThread extends Thread { out.write(item.getObjectId() + ";"); out.write(item.getItemId() + ";"); - out.write(item.getItem().getName() + ";"); + out.write(item.getTemplate().getName() + ";"); out.write(item.getCount() + ";"); out.write(item.getPrice() + ";"); if ((item.getItemId() == 17) || (item.getItemId() == 1341) || (item.getItemId() == 1342) || (item.getItemId() == 1343) || (item.getItemId() == 1344) || (item.getItemId() == 1345)) @@ -467,7 +467,7 @@ public class ClientThread extends Thread final Item item = items.get(i); out.write(item.getObjectId() + ";"); out.write(item.getItemId() + ";"); - out.write(item.getItem().getName() + ";"); + out.write(item.getTemplate().getName() + ";"); out.write(item.getCount() + "\n"); } out.close(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java index 6d71e33363..c6aab52961 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java @@ -42,7 +42,7 @@ public class RequestSellItem extends ClientBasePacket continue; } final Item item = activeChar.getInventory().getItem(objectId); - activeChar.addAdena((item.getItem().getReferencePrice() / 2) * cnt); + activeChar.addAdena((item.getTemplate().getReferencePrice() / 2) * cnt); activeChar.getInventory().destroyItem(objectId, cnt); } final StatusUpdate su = new StatusUpdate(activeChar.getObjectId()); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java index d927fb90eb..c2ff3bd32d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java @@ -43,7 +43,7 @@ public class SendWareHouseWithDrawList extends ClientBasePacket final Item inst = ItemTable.getInstance().createItem(itemId); inst.setCount(count); items[i] = inst; - weight += items[i].getItem().getWeight() * count; + weight += items[i].getTemplate().getWeight() * count; } if ((activeChar.getMaxLoad() - activeChar.getCurrentLoad()) >= weight) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 7c922a83f4..7326c995ce 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -44,16 +44,16 @@ public class UseItem extends ClientBasePacket if ((item != null) && item.isEquipable() && !activeChar.isInCombat()) { final List items = activeChar.getInventory().equipItem(item); - if (item.getItem().getType2() == 0) + if (item.getTemplate().getType2() == 0) { activeChar.updatePAtk(); activeChar.updateMAtk(); } - else if (item.getItem().getType2() == 1) + else if (item.getTemplate().getType2() == 1) { activeChar.updatePDef(); } - else if (item.getItem().getType2() == 2) + else if (item.getTemplate().getType2() == 2) { activeChar.updateMDef(); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java index d42e2ce999..817ddb87ba 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java @@ -45,16 +45,16 @@ public class BuyList extends ServerBasePacket for (int i = 0; i < count; ++i) { final Item temp = items.get(i); - final int type = temp.getItem().getType1(); + final int type = temp.getTemplate().getType1(); writeH(type); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(0); if (type < 4) { - writeD(temp.getItem().getBodyPart()); + writeD(temp.getTemplate().getBodyPart()); writeH(temp.getEnchantLevel()); writeH(0); writeH(0); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java index ce99f1130a..3a64f92f18 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java @@ -38,7 +38,7 @@ public class EquipUpdate extends ServerBasePacket writeC(0x5E); writeD(_change); writeD(_item.getObjectId()); - switch (_item.getItem().getBodyPart()) + switch (_item.getTemplate().getBodyPart()) { case ItemTemplate.SLOT_L_EAR: { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index 7e820d4340..a3aefbc479 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -42,11 +42,11 @@ public class GMViewItemList extends ServerBasePacket writeH(_items.size()); for (Item item : _items) { - writeH(item.getItem().getType1()); + writeH(item.getTemplate().getType1()); writeD(item.getObjectId()); writeD(item.getItemId()); writeD(item.getCount()); - writeH(item.getItem().getType2()); + writeH(item.getTemplate().getType2()); writeH(255); if (item.isEquipped()) { @@ -56,7 +56,7 @@ public class GMViewItemList extends ServerBasePacket { writeH(0); } - writeD(item.getItem().getBodyPart()); + writeD(item.getTemplate().getBodyPart()); writeH(item.getEnchantLevel()); writeH(0); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java index 5134fd2b87..a8025ba340 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java @@ -64,11 +64,11 @@ public class InventoryUpdate extends ServerBasePacket { final Item temp = _items.get(i); writeH(temp.getLastChange()); - writeH(temp.getItem().getType1()); + writeH(temp.getTemplate().getType1()); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(0); if (temp.isEquipped()) { @@ -78,7 +78,7 @@ public class InventoryUpdate extends ServerBasePacket { writeH(0); } - writeD(temp.getItem().getBodyPart()); + writeD(temp.getTemplate().getBodyPart()); writeH(temp.getEnchantLevel()); writeH(0); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index a738e32eb7..f8820b9bf3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -54,11 +54,11 @@ public class ItemList extends ServerBasePacket writeH(_items.size()); for (Item item : _items) { - writeH(item.getItem().getType1()); + writeH(item.getTemplate().getType1()); writeD(item.getObjectId()); writeD(item.getItemId()); writeD(item.getCount()); - writeH(item.getItem().getType2()); + writeH(item.getTemplate().getType2()); writeH(255); if (item.isEquipped()) { @@ -68,7 +68,7 @@ public class ItemList extends ServerBasePacket { writeH(0); } - writeD(item.getItem().getBodyPart()); + writeD(item.getTemplate().getBodyPart()); writeH(item.getEnchantLevel()); writeH(0); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java index 3a8006e909..a25ebcc39d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java @@ -64,11 +64,11 @@ public class PetInventoryUpdate extends ServerBasePacket { final Item temp = _items.get(i); writeH(temp.getLastChange()); - writeH(temp.getItem().getType1()); + writeH(temp.getTemplate().getType1()); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(0); if (temp.isEquipped()) { @@ -78,7 +78,7 @@ public class PetInventoryUpdate extends ServerBasePacket { writeH(0); } - writeD(temp.getItem().getBodyPart()); + writeD(temp.getTemplate().getBodyPart()); writeH(temp.getEnchantLevel()); writeH(0); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index 51954bfcce..8d063f50ed 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -40,11 +40,11 @@ public class PetItemList extends ServerBasePacket writeH(_items.size()); for (Item item : _items) { - writeH(item.getItem().getType1()); + writeH(item.getTemplate().getType1()); writeD(item.getObjectId()); writeD(item.getItemId()); writeD(item.getCount()); - writeH(item.getItem().getType2()); + writeH(item.getTemplate().getType2()); writeH(255); if (item.isEquipped()) { @@ -54,7 +54,7 @@ public class PetItemList extends ServerBasePacket { writeH(0); } - writeD(item.getItem().getBodyPart()); + writeD(item.getTemplate().getBodyPart()); writeH(item.getEnchantLevel()); writeH(0); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java index d03b1aaa80..f32e3d68ac 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java @@ -43,7 +43,7 @@ public class PrivateSellListBuy extends ServerBasePacket final List buyList = _buyer.getBuyList(); for (Item item : _buyer.getInventory().getItems()) { - if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1))) + if (item.isEquipped() || (item.getTemplate().getType2() == 3) || ((item.getTemplate().getType2() == 4) && (item.getTemplate().getType1() == 4)) || ((item.getTemplate().getType2() == 1) && (item.getTemplate().getType1() == 1))) { continue; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java index e376046a20..b20b450472 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java @@ -43,7 +43,7 @@ public class PrivateSellListSell extends ServerBasePacket final List sellList = _seller.getSellList(); for (Item item : _seller.getInventory().getItems()) { - if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1))) + if (item.isEquipped() || (item.getTemplate().getType2() == 3) || ((item.getTemplate().getType2() == 4) && (item.getTemplate().getType1() == 4)) || ((item.getTemplate().getType2() == 1) && (item.getTemplate().getType1() == 1))) { continue; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java index 096f04ac04..93901ff55b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -43,7 +43,7 @@ public class SellList extends ServerBasePacket writeD(0); for (Item item : _char.getInventory().getItems()) { - if (item.isEquipped() || (item.getItemId() == 57) || (item.getItem().getType2() == 3)) + if (item.isEquipped() || (item.getItemId() == 57) || (item.getTemplate().getType2() == 3)) { continue; } @@ -52,20 +52,20 @@ public class SellList extends ServerBasePacket writeH(_selllist.size()); for (Item item : _selllist) { - writeH(item.getItem().getType1()); + writeH(item.getTemplate().getType1()); writeD(item.getObjectId()); writeD(item.getItemId()); writeD(item.getCount()); - writeH(item.getItem().getType2()); + writeH(item.getTemplate().getType2()); writeH(0); - if (item.getItem().getType1() < 4) + if (item.getTemplate().getType1() < 4) { - writeD(item.getItem().getBodyPart()); + writeD(item.getTemplate().getBodyPart()); writeH(item.getEnchantLevel()); writeH(0); writeH(0); } - writeD(item.getItem().getReferencePrice() / 2); + writeD(item.getTemplate().getReferencePrice() / 2); } } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java index aa860cd8ef..155a8dfe3e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java @@ -35,14 +35,14 @@ public class TradeOtherAdd extends ServerBasePacket { writeC(0x31); writeH(1); - final int type = temp.getItem().getType1(); + final int type = temp.getTemplate().getType1(); writeH(type); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(_amount); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(0); - writeD(temp.getItem().getBodyPart()); + writeD(temp.getTemplate().getBodyPart()); writeH(temp.getEnchantLevel()); writeH(0); writeH(0); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java index a2e95ebbd9..a3a20faf4a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java @@ -35,14 +35,14 @@ public class TradeOwnAdd extends ServerBasePacket { writeC(0x30); writeH(1); - final int type = temp.getItem().getType1(); + final int type = temp.getTemplate().getType1(); writeH(type); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(_amount); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(0); - writeD(temp.getItem().getBodyPart()); + writeD(temp.getTemplate().getBodyPart()); writeH(temp.getEnchantLevel()); writeH(0); writeH(0); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 03124b73ec..d45ba9aa96 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -40,7 +40,7 @@ public class TradeStart extends ServerBasePacket writeD(_me.getTransactionRequester().getObjectId()); for (Item item : _me.getInventory().getItems()) { - if (item.isEquipped() || (item.getItem().getType2() == 3)) + if (item.isEquipped() || (item.getTemplate().getType2() == 3)) { continue; } @@ -51,14 +51,14 @@ public class TradeStart extends ServerBasePacket for (int i = 0; i < count; ++i) { final Item temp = _tradelist.get(i); - final int type = temp.getItem().getType1(); + final int type = temp.getTemplate().getType1(); writeH(type); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(0); - writeD(temp.getItem().getBodyPart()); + writeD(temp.getTemplate().getBodyPart()); writeH(temp.getEnchantLevel()); writeH(0); writeH(0); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index 8b827c06f2..90c432886d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -43,7 +43,7 @@ public class WareHouseDepositList extends ServerBasePacket final List itemlist = new ArrayList<>(); for (Item item : _cha.getInventory().getItems()) { - if (item.isEquipped() || (item.getItem().getType2() == 3)) + if (item.isEquipped() || (item.getTemplate().getType2() == 3)) { continue; } @@ -54,11 +54,11 @@ public class WareHouseDepositList extends ServerBasePacket for (i = 0; i < count; ++i) { final Item temp = itemlist.get(i); - writeH(temp.getItem().getType1()); + writeH(temp.getTemplate().getType1()); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(100); writeD(400); writeH(temp.getEnchantLevel()); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java index d87703febe..82b23559bc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java @@ -44,11 +44,11 @@ public class WareHouseWithdrawalList extends ServerBasePacket for (int i = 0; i < count; ++i) { final Item temp = items.get(i); - writeH(temp.getItem().getType1()); + writeH(temp.getTemplate().getType1()); writeD(temp.getObjectId()); writeD(temp.getItemId()); writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(temp.getTemplate().getType2()); writeH(100); writeD(400); writeH(temp.getEnchantLevel()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java index 9ddf673d3f..9a04c453cd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -288,7 +288,7 @@ public class ItemTable // this can happen if the item templates were not initialized } - if (temp.getItem() == null) + if (temp.getTemplate() == null) { LOGGER.warning("ItemTable: Item Template missing for Id: " + itemId); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java index 9ecf99153b..795bd496e1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/xml/MultisellData.java @@ -125,7 +125,7 @@ public class MultisellData for (Item item : items) { // Only do the matchup on equipable items that are not currently equipped so for each appropriate item, produce a set of entries for the multisell list. - if (!item.isWear() && ((item.getItem() instanceof Armor) || (item.getItem() instanceof Weapon))) + if (!item.isWear() && ((item.getTemplate() instanceof Armor) || (item.getTemplate() instanceof Weapon))) { enchantLevel = listTemplate.getMaintainEnchantment() ? item.getEnchantLevel() : 0; // loop through the entries to see which ones we wish to include @@ -196,7 +196,7 @@ public class MultisellData // if it is an armor/weapon, modify the enchantment level appropriately, if necessary else if (maintainEnchantment) { - final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(ing.getItemId()).getItem(); + final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(ing.getItemId()).getTemplate(); if ((tempItem instanceof Armor) || (tempItem instanceof Weapon)) { newIngredient.setEnchantmentLevel(enchantLevel); @@ -221,7 +221,7 @@ public class MultisellData if (maintainEnchantment) { // if it is an armor/weapon, modify the enchantment level appropriately (note, if maintain enchantment is "false" this modification will result to a +0) - final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(ing.getItemId()).getItem(); + final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(ing.getItemId()).getTemplate(); if ((tempItem instanceof Armor) || (tempItem instanceof Weapon)) { newIngredient.setEnchantmentLevel(enchantLevel); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index a957d09d48..bf28fb7ffd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -594,7 +594,7 @@ public class AdminEditNpc implements IAdminCommandHandler newItem.setCount(-1); tradeList.addItem(newItem); storeTradeList(itemID, price, tradeListID, order); - BuilderUtil.sendSysMessage(activeChar, "Added " + newItem.getItem().getName() + " to Trade List " + tradeList.getListId()); + BuilderUtil.sendSysMessage(activeChar, "Added " + newItem.getTemplate().getName() + " to Trade List " + tradeList.getListId()); showShopList(activeChar, tradeListID, 1); return; } @@ -647,7 +647,7 @@ public class AdminEditNpc implements IAdminCommandHandler final int end = Math.min((((page - 1) * PAGE_LIMIT) + PAGE_LIMIT) - 1, tradeList.getItems().size() - 1); for (Item item : tradeList.getItems(start, end + 1)) { - replyMSG.append("" + item.getItem().getName() + ""); + replyMSG.append("" + item.getTemplate().getName() + ""); replyMSG.append("" + item.getPriceToSell() + ""); replyMSG.append("