lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper naming for Item ItemTemplate getter.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-02-03 23:09:47 +00:00
parent c81f7ee38c
commit 90e0adc645
2245 changed files with 8241 additions and 8241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminElement.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEnchant.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/Heal.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSoulShot.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BeastSpiritShot.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/BlessedSpiritShot.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/CharmOfCourage.java vendored
View File

@@ -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;

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/FishShots.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Harvester.java vendored
View File

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

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

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java vendored
View File

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

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/Seed.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SoulShots.java vendored
View File

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

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/SpiritShot.java vendored
View File

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

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

@@ -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;