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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/ItemTable.java
View File

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

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/xml/MultisellData.java
View File

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

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
View File

@@ -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("<tr><td><a action=\"bypass -h admin_editShopItem " + tradeList.getListId() + " " + item.getItemId() + "\">" + item.getItem().getName() + "</a></td>");
replyMSG.append("<tr><td><a action=\"bypass -h admin_editShopItem " + tradeList.getListId() + " " + item.getItemId() + "\">" + item.getTemplate().getName() + "</a></td>");
replyMSG.append("<td>" + item.getPriceToSell() + "</td>");
replyMSG.append("<td><button value=\"Del\" action=\"bypass -h admin_delShopItem " + tradeList.getListId() + " " + item.getItemId() + "\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></td>");
replyMSG.append("</tr>");

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEnchant.java
View File

@@ -220,8 +220,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 + ".");
}
}
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSoulShot.java
View File

@@ -137,7 +137,7 @@ public class BeastSoulShot implements IItemHandler
activeOwner.removeAutoSoulShot(itemId);
activeOwner.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName());
sm.addString(item.getTemplate().getName());
activeOwner.sendPacket(sm);
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpiritShot.java
View File

@@ -151,7 +151,7 @@ public class BeastSpiritShot implements IItemHandler
activeOwner.removeAutoSoulShot(itemId);
activeOwner.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName());
sm.addString(item.getTemplate().getName());
activeOwner.sendPacket(sm);
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BlessedSpiritShot.java
View File

@@ -111,7 +111,7 @@ public class BlessedSpiritShot implements IItemHandler
player.removeAutoSoulShot(itemId);
player.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName());
sm.addString(item.getTemplate().getName());
player.sendPacket(sm);
return;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
View File

@@ -104,7 +104,7 @@ public class SoulShots implements IItemHandler
player.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName());
sm.addString(item.getTemplate().getName());
player.sendPacket(sm);
}
else

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SpiritShot.java
View File

@@ -101,7 +101,7 @@ public class SpiritShot implements IItemHandler
player.sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
sm.addString(item.getItem().getName());
sm.addString(item.getTemplate().getName());
player.sendPacket(sm);
}
else

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RecipeManager.java
View File

@@ -588,7 +588,7 @@ public class RecipeManager
super();
_itemId = item.getItemId();
_quantity = quantity;
_itemName = item.getItem().getName();
_itemName = item.getTemplate().getName();
}
/**

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ItemInfo.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/TradeList.java
View File

@@ -58,7 +58,7 @@ public class TradeList
public TradeItem(Item item, int count, int price)
{
_objectId = item.getObjectId();
_item = item.getItem();
_item = item.getTemplate();
_enchant = item.getEnchantLevel();
_count = count;
_price = price;

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -2593,10 +2593,10 @@ public class Attackable extends Npc
{
try
{
if (item.getItem().getName().contains("Grade"))
if (item.getTemplate().getName().contains("Grade"))
{
// Split the name of the crystal into 'name' & 'level'
crystalNFO = item.getItem().getName().trim().replace(" Grade ", "-").split("-");
crystalNFO = item.getTemplate().getName().trim().replace(" Grade ", "-").split("-");
// Set Level to 13
crystalLVL = 13;
// Get Name
@@ -2605,7 +2605,7 @@ public class Attackable extends Npc
else
{
// Split the name of the crystal into 'name' & 'level'
crystalNFO = item.getItem().getName().trim().replace(" Stage ", "").split("-");
crystalNFO = item.getTemplate().getName().trim().replace(" Stage ", "").split("-");
// Get Level
crystalLVL = Integer.parseInt(crystalNFO[1].trim());
// Get Name
@@ -2644,7 +2644,7 @@ public class Attackable extends Npc
}
else
{
crystalNME = item.getItem().getName().toLowerCase().trim();
crystalNME = item.getTemplate().getName().toLowerCase().trim();
crystalNEW = id + 1;
}

58
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -2174,7 +2174,7 @@ public class Player extends Playable
{
for (Item item : getInventory().getItems())
{
if ((item != null) && item.isEquipped() && (item.getItem() instanceof Armor))
if ((item != null) && item.isEquipped() && (item.getTemplate() instanceof Armor))
{
// No penality for formal wear
if (item.getItemId() == 6408)
@@ -2182,7 +2182,7 @@ public class Player extends Playable
continue;
}
final Armor armorItem = (Armor) item.getItem();
final Armor armorItem = (Armor) item.getTemplate();
switch (armorItem.getItemType())
{
case HEAVY:
@@ -2321,7 +2321,7 @@ public class Player extends Playable
{
for (Item item : getInventory().getItems())
{
if ((item != null) && item.isEquipped() && (item.getItem() instanceof Weapon) && !isCursedWeaponEquiped())
if ((item != null) && item.isEquipped() && (item.getTemplate() instanceof Weapon) && !isCursedWeaponEquiped())
{
// No penality for cupid's bow
if (item.isCupidBow())
@@ -2329,7 +2329,7 @@ public class Player extends Playable
continue;
}
final Weapon weaponItem = (Weapon) item.getItem();
final Weapon weaponItem = (Weapon) item.getTemplate();
switch (weaponItem.getItemType())
{
@@ -2439,7 +2439,7 @@ public class Player extends Playable
{
if ((item != null) && item.isEquipped()) // Checks if items equipped
{
final int crystaltype = item.getItem().getCrystalType(); // Gets grade of item
final int crystaltype = item.getTemplate().getCrystalType(); // Gets grade of item
// Checks if item crystal levels is above character levels and also if last penalty for weapon was lower.
if ((crystaltype > getExpertiseIndex()) && item.isWeapon() && (crystaltype > intensityW))
{
@@ -2525,12 +2525,12 @@ public class Player extends Playable
return;
}
if ((unequipped.getItem().getType2() == ItemTemplate.TYPE2_WEAPON) && ((equipped == null) || (equipped.getItem().getCrystalType() != unequipped.getItem().getCrystalType())))
if ((unequipped.getTemplate().getType2() == ItemTemplate.TYPE2_WEAPON) && ((equipped == null) || (equipped.getTemplate().getCrystalType() != unequipped.getTemplate().getCrystalType())))
{
for (Item ss : getInventory().getItems())
{
final int itemId = ss.getItemId();
if ((((itemId >= 2509) && (itemId <= 2514)) || ((itemId >= 3947) && (itemId <= 3952)) || ((itemId <= 1804) && (itemId >= 1808)) || (itemId == 5789) || (itemId == 5790) || (itemId == 1835)) && (ss.getItem().getCrystalType() == unequipped.getItem().getCrystalType()))
if ((((itemId >= 2509) && (itemId <= 2514)) || ((itemId >= 3947) && (itemId <= 3952)) || ((itemId <= 1804) && (itemId >= 1808)) || (itemId == 5789) || (itemId == 5790) || (itemId == 1835)) && (ss.getTemplate().getCrystalType() == unequipped.getTemplate().getCrystalType()))
{
sendPacket(new ExAutoSoulShot(itemId, 0));
final SystemMessage sm = new SystemMessage(SystemMessageId.THE_AUTOMATIC_USE_OF_S1_HAS_BEEN_DEACTIVATED);
@@ -3504,7 +3504,7 @@ public class Player extends Playable
}
// If you pickup arrows.
if (item.getItem().getItemType() == EtcItemType.ARROW)
if (item.getTemplate().getItemType() == EtcItemType.ARROW)
{
// If a bow is equipped, try to equip them if no arrows is currently equipped.
final Weapon currentWeapon = getActiveWeaponItem();
@@ -5115,7 +5115,7 @@ public class Player extends Playable
}
// Fixed it's not possible pick up the object if you exceed the maximum weight.
if ((_inventory.getTotalWeight() + (target.getItem().getWeight() * target.getCount())) > getMaxLoad())
if ((_inventory.getTotalWeight() + (target.getTemplate().getWeight() * target.getCount())) > getMaxLoad())
{
sendMessage("You have reached the maximun weight.");
return;
@@ -5155,7 +5155,7 @@ public class Player extends Playable
else
{
// if item is instance of ArmorType or WeaponType broadcast an "Attention" system message
if ((target.getItemType() instanceof ArmorType) || (target.getItemType() instanceof WeaponType) || (target.getItem() instanceof Armor) || (target.getItem() instanceof Weapon))
if ((target.getItemType() instanceof ArmorType) || (target.getItemType() instanceof WeaponType) || (target.getTemplate() instanceof Armor) || (target.getTemplate() instanceof Weapon))
{
if (target.getEnchantLevel() > 0)
{
@@ -5190,7 +5190,7 @@ public class Player extends Playable
addItem("Pickup", target, null, true);
// Like L2OFF Auto-Equip arrows if player has a bow and player picks up arrows.
if ((target.getItem() != null) && (target.getItem().getItemType() == EtcItemType.ARROW))
if ((target.getTemplate() != null) && (target.getTemplate().getItemType() == EtcItemType.ARROW))
{
checkAndEquipArrows();
}
@@ -5300,7 +5300,7 @@ public class Player extends Playable
{
return getFistsWeaponItem();
}
return (Weapon) weapon.getItem();
return (Weapon) weapon.getTemplate();
}
/**
@@ -5332,7 +5332,7 @@ public class Player extends Playable
{
return null;
}
return (Armor) armor.getItem();
return (Armor) armor.getTemplate();
}
/**
@@ -5346,7 +5346,7 @@ public class Player extends Playable
{
return null;
}
return (Armor) legs.getItem();
return (Armor) legs.getTemplate();
}
/**
@@ -5361,7 +5361,7 @@ public class Player extends Playable
{
return true;
}
if ((armor != null) && ((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && ((ArmorType) armor.getItemType() == ArmorType.HEAVY)))
if ((armor != null) && ((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && ((ArmorType) armor.getItemType() == ArmorType.HEAVY)))
{
return true;
}
@@ -5380,7 +5380,7 @@ public class Player extends Playable
{
return true;
}
if ((armor != null) && ((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && ((ArmorType) armor.getItemType() == ArmorType.LIGHT)))
if ((armor != null) && ((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && ((ArmorType) armor.getItemType() == ArmorType.LIGHT)))
{
return true;
}
@@ -5399,7 +5399,7 @@ public class Player extends Playable
{
return true;
}
if ((armor != null) && ((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && ((ArmorType) armor.getItemType() == ArmorType.MAGIC)))
if ((armor != null) && ((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && ((ArmorType) armor.getItemType() == ArmorType.MAGIC)))
{
return true;
}
@@ -5611,7 +5611,7 @@ public class Player extends Playable
return getFistsWeaponItem();
}
final ItemTemplate item = weapon.getItem();
final ItemTemplate item = weapon.getTemplate();
if (item instanceof Weapon)
{
return (Weapon) item;
@@ -5791,8 +5791,8 @@ public class Player extends Playable
if (itemDrop.isAugmented() || // Dont drop augmented items
itemDrop.isShadowItem() || // Dont drop Shadow Items
(itemDrop.getItemId() == 57) || // Adena
(itemDrop.getItem().getType2() == ItemTemplate.TYPE2_QUEST) || // Quest Items
(itemDrop.getItem().isDropable() == false) || // Non-dropable item
(itemDrop.getTemplate().getType2() == ItemTemplate.TYPE2_QUEST) || // Quest Items
(itemDrop.getTemplate().isDropable() == false) || // Non-dropable item
Config.KARMA_LIST_NONDROPPABLE_ITEMS.contains(itemDrop.getItemId()) || // Item listed in the non droppable item list
Config.KARMA_LIST_NONDROPPABLE_PET_ITEMS.contains(itemDrop.getItemId()) || // Item listed in the non droppable pet item list
((getPet() != null) && (getPet().getControlItemId() == itemDrop.getItemId() // Control Item of active pet
@@ -5804,7 +5804,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;
getInventory().unEquipItemInSlotAndRecord(itemDrop.getEquipSlot());
}
else
@@ -6970,7 +6970,7 @@ public class Player extends Playable
wpn.getAugmentation().removeBonus(this);
}
final List<Item> unequipped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
final List<Item> unequipped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getTemplate().getBodyPart());
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : unequipped)
{
@@ -7010,7 +7010,7 @@ public class Player extends Playable
return false;
}
final List<Item> unequipped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart());
final List<Item> unequipped = getInventory().unEquipItemInBodySlotAndRecord(sld.getTemplate().getBodyPart());
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : unequipped)
{
@@ -11486,7 +11486,7 @@ public class Player extends Playable
if (rhand != null)
{
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart()))
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getTemplate().getBodyPart()))
{
iu.addModifiedItem(element);
}
@@ -11501,7 +11501,7 @@ public class Player extends Playable
if (chest != null)
{
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart()))
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(chest.getTemplate().getBodyPart()))
{
iu.addModifiedItem(element);
}
@@ -11516,7 +11516,7 @@ public class Player extends Playable
if (legs != null)
{
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart()))
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(legs.getTemplate().getBodyPart()))
{
iu.addModifiedItem(element);
}
@@ -11830,7 +11830,7 @@ public class Player extends Playable
if (rhand != null)
{
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getItem().getBodyPart()))
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(rhand.getTemplate().getBodyPart()))
{
iu.addModifiedItem(element);
}
@@ -11845,7 +11845,7 @@ public class Player extends Playable
if (chest != null)
{
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(chest.getItem().getBodyPart()))
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(chest.getTemplate().getBodyPart()))
{
iu.addModifiedItem(element);
}
@@ -11860,7 +11860,7 @@ public class Player extends Playable
if (legs != null)
{
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(legs.getItem().getBodyPart()))
for (Item element : getInventory().unEquipItemInBodySlotAndRecord(legs.getTemplate().getBodyPart()))
{
iu.addModifiedItem(element);
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java
View File

@@ -337,7 +337,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;
}
@@ -357,7 +357,7 @@ public class Pet extends Summon
{
return null;
}
return (Weapon) weapon.getItem();
return (Weapon) weapon.getTemplate();
}
@Override
@@ -674,7 +674,7 @@ public class Pet extends Summon
for (Item item : _inventory.getItems())
{
final Item giveit = item;
if (((giveit.getItem().getWeight() * giveit.getCount()) + getOwner().getInventory().getTotalWeight()) < getOwner().getMaxLoad())
if (((giveit.getTemplate().getWeight() * giveit.getCount()) + getOwner().getInventory().getTotalWeight()) < getOwner().getMaxLoad())
{
// If the owner can carry it give it to them
giveItemToOwner(giveit);

64
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@@ -74,7 +74,7 @@ public class Item extends WorldObject
private int _time;
private boolean _decrease = false;
private final int _itemId;
private final ItemTemplate _item;
private final ItemTemplate _itemTemplate;
private ItemLocation _loc;
private int _locData;
private int _enchantLevel;
@@ -118,24 +118,24 @@ 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);
if (item == null)
if (itemTemplate == null)
{
throw new IllegalArgumentException();
}
super.setKnownList(new NullKnownList(this));
_itemId = item.getItemId();
_item = item;
_itemId = itemTemplate.getItemId();
_itemTemplate = itemTemplate;
_count = 1;
_loc = ItemLocation.VOID;
_mana = _item.getDuration();
_mana = _itemTemplate.getDuration();
}
/**
@@ -212,7 +212,7 @@ public class Item extends WorldObject
public boolean isPotion()
{
return _item.isPotion();
return _itemTemplate.isPotion();
}
/**
@@ -321,7 +321,7 @@ public class Item extends WorldObject
*/
public boolean isEquipable()
{
return ((_item.getBodyPart() != 0) && !(_item instanceof EtcItem));
return ((_itemTemplate.getBodyPart() != 0) && !(_itemTemplate instanceof EtcItem));
}
/**
@@ -344,11 +344,11 @@ public class Item extends WorldObject
/**
* Returns the characteristics of the item.
* @return Item
* @return ItemTemplate
*/
public ItemTemplate getItem()
public ItemTemplate getTemplate()
{
return _item;
return _itemTemplate;
}
/**
@@ -438,7 +438,7 @@ public class Item extends WorldObject
*/
public Enum<?> getItemType()
{
return _item.getItemType();
return _itemTemplate.getItemType();
}
/**
@@ -456,7 +456,7 @@ public class Item extends WorldObject
*/
public int getCrystalCount()
{
return _item.getCrystalCount(_enchantLevel);
return _itemTemplate.getCrystalCount(_enchantLevel);
}
/**
@@ -465,7 +465,7 @@ public class Item extends WorldObject
*/
public int getReferencePrice()
{
return _item.getReferencePrice();
return _itemTemplate.getReferencePrice();
}
/**
@@ -474,7 +474,7 @@ public class Item extends WorldObject
*/
public String getItemName()
{
return _item.getName();
return _itemTemplate.getName();
}
/**
@@ -483,7 +483,7 @@ public class Item extends WorldObject
*/
public int getPriceToSell()
{
return _item.isConsumable() ? (int) (_priceSell * Config.RATE_CONSUMABLE_COST) : _priceSell;
return _itemTemplate.isConsumable() ? (int) (_priceSell * Config.RATE_CONSUMABLE_COST) : _priceSell;
}
/**
@@ -520,7 +520,7 @@ public class Item extends WorldObject
*/
public boolean isStackable()
{
return _item.isStackable();
return _itemTemplate.isStackable();
}
/**
@@ -529,7 +529,7 @@ public class Item extends WorldObject
*/
public boolean isDropable()
{
return !isAugmented() && _item.isDropable();
return !isAugmented() && _itemTemplate.isDropable();
}
/**
@@ -538,7 +538,7 @@ public class Item extends WorldObject
*/
public boolean isDestroyable()
{
return _item.isDestroyable();
return _itemTemplate.isDestroyable();
}
/**
@@ -547,7 +547,7 @@ public class Item extends WorldObject
*/
public boolean isTradeable()
{
return !isAugmented() && _item.isTradeable();
return !isAugmented() && _itemTemplate.isTradeable();
}
/**
@@ -556,7 +556,7 @@ public class Item extends WorldObject
*/
public boolean isConsumable()
{
return _item.isConsumable();
return _itemTemplate.isConsumable();
}
/**
@@ -568,7 +568,7 @@ public class Item extends WorldObject
*/
public boolean isAvailable(Player player, boolean allowAdena, boolean allowEquipped)
{
return (!isEquipped() || allowEquipped) && (_item.getType2() != ItemTemplate.TYPE2_QUEST) && ((_item.getType2() != ItemTemplate.TYPE2_MONEY) || (_item.getType1() != ItemTemplate.TYPE1_SHIELD_ARMOR)) // TODO: what does this mean?
return (!isEquipped() || allowEquipped) && (_itemTemplate.getType2() != ItemTemplate.TYPE2_QUEST) && ((_itemTemplate.getType2() != ItemTemplate.TYPE2_MONEY) || (_itemTemplate.getType1() != ItemTemplate.TYPE1_SHIELD_ARMOR)) // TODO: what does this mean?
&& ((player.getPet() == null) || (getObjectId() != player.getPet().getControlItemId())) // Not Control item of currently summoned pet
&& (player.getActiveEnchantItem() != this) && (allowAdena || (_itemId != 57)) && ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != _itemId)) && isTradeable();
}
@@ -638,9 +638,9 @@ public class Item extends WorldObject
*/
public int getPDef()
{
if (_item instanceof Armor)
if (_itemTemplate instanceof Armor)
{
return ((Armor) _item).getPDef();
return ((Armor) _itemTemplate).getPDef();
}
return 0;
}
@@ -753,21 +753,21 @@ public class Item extends WorldObject
case 10:
{
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_10);
sm.addString(_item.getName());
sm.addString(_itemTemplate.getName());
player.sendPacket(sm);
break;
}
case 5:
{
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_5);
sm.addString(_item.getName());
sm.addString(_itemTemplate.getName());
player.sendPacket(sm);
break;
}
case 1:
{
sm = new SystemMessage(SystemMessageId.S1_S_REMAINING_MANA_IS_NOW_1_IT_WILL_DISAPPEAR_SOON);
sm.addString(_item.getName());
sm.addString(_itemTemplate.getName());
player.sendPacket(sm);
break;
}
@@ -776,7 +776,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.addString(_item.getName());
sm.addString(_itemTemplate.getName());
player.sendPacket(sm);
// unequip
@@ -912,7 +912,7 @@ public class Item extends WorldObject
*/
public List<Func> getStatFuncs(Creature creature)
{
return _item.getStatFuncs(this, creature);
return _itemTemplate.getStatFuncs(this, creature);
}
/**
@@ -1243,7 +1243,7 @@ public class Item extends WorldObject
@Override
public String toString()
{
return _item + "[" + getObjectId() + "]";
return _itemTemplate + "[" + getObjectId() + "]";
}
/**
@@ -1422,7 +1422,7 @@ public class Item extends WorldObject
*/
public boolean isWeapon()
{
return (_item instanceof Weapon);
return (_itemTemplate instanceof Weapon);
}
@Override

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -228,7 +228,7 @@ public abstract class Inventory extends ItemContainer
if (item.getItemType() == WeaponType.BOW)
{
final Item arrow = findArrowForBow(item.getItem());
final Item arrow = findArrowForBow(item.getTemplate());
if (arrow != null)
{
setPaperdollItem(PAPERDOLL_LHAND, arrow);
@@ -291,7 +291,7 @@ public abstract class Inventory extends ItemContainer
Skill passiveSkill = null;
Skill enchant4Skill = null;
final ItemTemplate it = item.getItem();
final ItemTemplate it = item.getTemplate();
if (it instanceof Weapon)
{
passiveSkill = ((Weapon) it).getSkill();
@@ -334,7 +334,7 @@ public abstract class Inventory extends ItemContainer
Skill passiveSkill = null;
Skill enchant4Skill = null;
final ItemTemplate it = item.getItem();
final ItemTemplate it = item.getTemplate();
if (it instanceof Weapon)
{
// Check for Penality
@@ -892,7 +892,7 @@ public abstract class Inventory extends ItemContainer
final Item pi = _paperdoll[i];
if (pi != null)
{
mask |= pi.getItem().getItemMask();
mask |= pi.getTemplate().getItemMask();
}
}
@@ -923,7 +923,7 @@ public abstract class Inventory extends ItemContainer
_paperdoll[slot] = item;
item.setLocation(getEquipLocation(), slot);
item.setLastChange(Item.MODIFIED);
_wearedMask |= item.getItem().getItemMask();
_wearedMask |= item.getTemplate().getItemMask();
for (PaperdollListener listener : _paperdollListeners)
{
listener.notifyEquiped(slot, item);
@@ -1268,7 +1268,7 @@ public abstract class Inventory extends ItemContainer
}
}
final int targetSlot = item.getItem().getBodyPart();
final int targetSlot = item.getTemplate().getBodyPart();
switch (targetSlot)
{
case ItemTemplate.SLOT_LR_HAND:
@@ -1289,7 +1289,7 @@ public abstract class Inventory extends ItemContainer
}
case ItemTemplate.SLOT_L_HAND:
{
if (!(item.getItem() instanceof EtcItem) || (item.getItem().getItemType() != EtcItemType.ARROW))
if (!(item.getTemplate() instanceof EtcItem) || (item.getTemplate().getItemType() != EtcItemType.ARROW))
{
final Item old1 = setPaperdollItem(PAPERDOLL_LRHAND, null);
if (old1 != null)
@@ -1375,7 +1375,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);
}
@@ -1468,9 +1468,9 @@ public abstract class Inventory extends ItemContainer
int 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();
}
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@@ -120,7 +120,7 @@ public class PlayerInventory extends Inventory
break;
}
}
if (!isDuplicate && (!onlyAvailable || (item.getItem().isSellable() && item.isAvailable(_owner, false, allowEquipped))))
if (!isDuplicate && (!onlyAvailable || (item.getTemplate().isSellable() && item.isAvailable(_owner, false, allowEquipped))))
{
list.add(item);
}
@@ -165,7 +165,7 @@ public class PlayerInventory extends Inventory
}
}
if (!isDuplicate && (!onlyAvailable || (item.getItem().isSellable() && item.isAvailable(_owner, false, allowEquipped))))
if (!isDuplicate && (!onlyAvailable || (item.getTemplate().isSellable() && item.isAvailable(_owner, false, allowEquipped))))
{
list.add(item);
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/QuestState.java
View File

@@ -716,7 +716,7 @@ public class QuestState
// Fix for destroyed quest items
if (item.isEquipped())
{
_player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart());
_player.getInventory().unEquipItemInBodySlotAndRecord(item.getTemplate().getBodyPart());
}
_player.destroyItemByItemId("Quest", itemId, count, _player, true);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java
View File

@@ -290,7 +290,7 @@ public class Formulas
{
env.value -= hasMagePDef ? 15 : 31;
}
if ((p.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS) != null) || ((chest != null) && (chest.getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)))
if ((p.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS) != null) || ((chest != null) && (chest.getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR)))
{
env.value -= hasMagePDef ? 8 : 18;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/conditions/ConditionSlotItemType.java
View File

@@ -47,6 +47,6 @@ public class ConditionSlotItemType extends ConditionInventory
{
return false;
}
return (item.getItem().getItemMask() & _mask) != 0;
return (item.getTemplate().getItemMask() & _mask) != 0;
}
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/conditions/ConditionUsingItemType.java
View File

@@ -60,7 +60,7 @@ public class ConditionUsingItemType extends Condition
{
return false;
}
final int chestMask = chest.getItem().getItemMask();
final int chestMask = chest.getTemplate().getItemMask();
// If chest armor is different from the condition one return false
if ((_mask & chestMask) == 0)
@@ -70,7 +70,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)
{
@@ -82,7 +82,7 @@ public class ConditionUsingItemType extends Condition
{
return false;
}
final int legMask = legs.getItem().getItemMask();
final int legMask = legs.getTemplate().getItemMask();
// return true if legs armor matches too
return (_mask & legMask) != 0;
}

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/funcs/FuncEnchant.java
View File

@@ -39,7 +39,7 @@ public class FuncEnchant extends Func
return;
}
final Item item = (Item) funcOwner;
final int cristall = item.getItem().getCrystalType();
final int cristall = item.getTemplate().getCrystalType();
final Enum<?> itemType = item.getItemType();
if (cristall == ItemTemplate.CRYSTAL_NONE)
{
@@ -78,7 +78,7 @@ public class FuncEnchant extends Func
if (stat == Stat.MAGIC_ATTACK)
{
switch (item.getItem().getCrystalType())
switch (item.getTemplate().getCrystalType())
{
case ItemTemplate.CRYSTAL_S:
{
@@ -109,7 +109,7 @@ public class FuncEnchant extends Func
return;
}
switch (item.getItem().getCrystalType())
switch (item.getTemplate().getCrystalType())
{
case ItemTemplate.CRYSTAL_A:
{
@@ -117,7 +117,7 @@ public class FuncEnchant extends Func
{
env.value += (8 * enchant) + (16 * overenchant);
}
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getItem().getBodyPart() == 16384)))
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getTemplate().getBodyPart() == 16384)))
{
env.value += (5 * enchant) + (10 * overenchant);
}
@@ -133,7 +133,7 @@ public class FuncEnchant extends Func
{
env.value += (6 * enchant) + (12 * overenchant);
}
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getItem().getBodyPart() == 16384)))
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getTemplate().getBodyPart() == 16384)))
{
env.value += (4 * enchant) + (8 * overenchant);
}
@@ -149,7 +149,7 @@ public class FuncEnchant extends Func
{
env.value += (6 * enchant) + (12 * overenchant);
}
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getItem().getBodyPart() == 16384)))
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getTemplate().getBodyPart() == 16384)))
{
env.value += (4 * enchant) + (8 * overenchant);
}
@@ -177,7 +177,7 @@ public class FuncEnchant extends Func
{
env.value += (10 * enchant) + (20 * overenchant);
}
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getItem().getBodyPart() == 16384)))
else if ((itemType == WeaponType.DUALFIST) || (itemType == WeaponType.DUAL) || ((itemType == WeaponType.SWORD) && (item.getTemplate().getBodyPart() == 16384)))
{
env.value += (4 * enchant) + (12 * overenchant);
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -267,7 +267,7 @@ public class CharacterCreate implements IClientIncomingPacket
newChar.registerShortCut(new ShortCut(11, 0, 1, itemInstance.getObjectId(), -1)); // Tutorial Book shortcut
}
if (itemInstance.isEquipable() && ((newChar.getActiveWeaponItem() == null) || (itemInstance.getItem().getType2() == ItemTemplate.TYPE2_WEAPON)))
if (itemInstance.isEquipable() && ((newChar.getActiveWeaponItem() == null) || (itemInstance.getTemplate().getType2() == ItemTemplate.TYPE2_WEAPON)))
{
newChar.getInventory().equipItemAndRecord(itemInstance);
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java
View File

@@ -488,7 +488,7 @@ public class MultiSellChoose implements IClientIncomingPacket
// If it is an armor/weapon, modify the enchantment level appropriately, if necessary
else if (maintainEnchantment)
{
final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(newIngredient.getItemId()).getItem();
final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(newIngredient.getItemId()).getTemplate();
if ((tempItem instanceof Armor) || (tempItem instanceof Weapon))
{
newIngredient.setEnchantmentLevel(enchantLevel);
@@ -515,7 +515,7 @@ public class MultiSellChoose implements IClientIncomingPacket
{
// 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(newIngredient.getItemId()).getItem();
final ItemTemplate tempItem = ItemTable.getInstance().createDummyItem(newIngredient.getItemId()).getTemplate();
if ((tempItem instanceof Armor) || (tempItem instanceof Weapon))
{
if ((level == 0) && maintainEnchantment)

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAutoSoulShot.java
View File

@@ -123,7 +123,7 @@ public class RequestAutoSoulShot implements IClientIncomingPacket
}
else
{
if ((player.getActiveWeaponItem() != player.getFistsWeaponItem()) && (item.getItem().getCrystalType() == player.getActiveWeaponItem().getCrystalType()))
if ((player.getActiveWeaponItem() != player.getFistsWeaponItem()) && (item.getTemplate().getCrystalType() == player.getActiveWeaponItem().getCrystalType()))
{
if ((_itemId >= 3947) && (_itemId <= 3952) && player.isInOlympiadMode())
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmCancelItem.java
View File

@@ -57,7 +57,7 @@ public class RequestConfirmCancelItem implements IClientIncomingPacket
}
int price = 0;
switch (item.getItem().getItemGrade())
switch (item.getTemplate().getItemGrade())
{
case ItemTemplate.CRYSTAL_C:
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmGemStone.java
View File

@@ -59,7 +59,7 @@ public class RequestConfirmGemStone implements IClientIncomingPacket
}
// Make sure the item is a gemstone
final int gemstoneItemId = gemstoneItem.getItem().getItemId();
final int gemstoneItemId = gemstoneItem.getTemplate().getItemId();
if ((gemstoneItemId != 2130) && (gemstoneItemId != 2131))
{
player.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
@@ -67,7 +67,7 @@ public class RequestConfirmGemStone implements IClientIncomingPacket
}
// Check if the gemstoneCount is sufficant
final int itemGrade = targetItem.getItem().getItemGrade();
final int itemGrade = targetItem.getTemplate().getItemGrade();
switch (itemGrade)
{

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
View File

@@ -57,8 +57,8 @@ public class RequestConfirmRefinerItem implements IClientIncomingPacket
return;
}
final int itemGrade = targetItem.getItem().getItemGrade();
final int refinerItemId = refinerItem.getItem().getItemId();
final int itemGrade = targetItem.getTemplate().getItemGrade();
final int refinerItemId = refinerItem.getTemplate().getItemId();
// is the item a life stone?
if ((refinerItemId < 8723) || (refinerItemId > 8762))

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestConfirmTargetItem.java
View File

@@ -57,8 +57,8 @@ public class RequestConfirmTargetItem implements IClientIncomingPacket
}
// check if the item is augmentable
final int itemGrade = item.getItem().getItemGrade();
final int itemType = item.getItem().getType2();
final int itemGrade = item.getTemplate().getItemGrade();
final int itemType = item.getTemplate().getType2();
if (item.isAugmented())
{
player.sendPacket(SystemMessageId.ONCE_AN_ITEM_IS_AUGMENTED_IT_CANNOT_BE_AUGMENTED_AGAIN);

14
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestCrystallizeItem.java
View File

@@ -114,14 +114,14 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
return;
}
if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_NONE))
if (!itemToRemove.getTemplate().isCrystallizable() || (itemToRemove.getTemplate().getCrystalCount() <= 0) || (itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_NONE))
{
PacketLogger.warning(player.getObjectId() + " tried to crystallize " + itemToRemove.getItem().getItemId());
PacketLogger.warning(player.getObjectId() + " tried to crystallize " + itemToRemove.getTemplate().getItemId());
return;
}
// Check if the char can crystallize C items and return if false;
if ((itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_C) && (skillLevel <= 1))
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_C) && (skillLevel <= 1))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
final ActionFailed af = ActionFailed.STATIC_PACKET;
@@ -130,7 +130,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
}
// Check if the user can crystallize B items and return if false;
if ((itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_B) && (skillLevel <= 2))
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_B) && (skillLevel <= 2))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
final ActionFailed af = ActionFailed.STATIC_PACKET;
@@ -139,7 +139,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
}
// Check if the user can crystallize A items and return if false;
if ((itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_A) && (skillLevel <= 3))
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_A) && (skillLevel <= 3))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
final ActionFailed af = ActionFailed.STATIC_PACKET;
@@ -148,7 +148,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
}
// Check if the user can crystallize S items and return if false;
if ((itemToRemove.getItem().getCrystalType() == ItemTemplate.CRYSTAL_S) && (skillLevel <= 4))
if ((itemToRemove.getTemplate().getCrystalType() == ItemTemplate.CRYSTAL_S) && (skillLevel <= 4))
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_MAY_NOT_CRYSTALLIZE_THIS_ITEM_YOUR_CRYSTALLIZATION_SKILL_LEVEL_IS_TOO_LOW));
final ActionFailed af = ActionFailed.STATIC_PACKET;
@@ -184,7 +184,7 @@ public class RequestCrystallizeItem implements IClientIncomingPacket
final Item removedItem = player.getInventory().destroyItem("Crystalize", _objectId, _count, player, null);
// add crystals
final int crystalId = itemToRemove.getItem().getCrystalItemId();
final int crystalId = itemToRemove.getTemplate().getCrystalItemId();
final int crystalAmount = itemToRemove.getCrystalCount();
final Item createditem = player.getInventory().addItem("Crystalize", crystalId, crystalAmount, player, itemToRemove);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_EARNED_S2_S1_S);

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
View File

@@ -192,7 +192,7 @@ public class RequestDropItem implements IClientIncomingPacket
}
}
if ((ItemTemplate.TYPE2_QUEST == item.getItem().getType2()) && !player.isGM())
if ((ItemTemplate.TYPE2_QUEST == item.getTemplate().getType2()) && !player.isGM())
{
player.sendPacket(SystemMessageId.THAT_ITEM_CANNOT_BE_DISCARDED_OR_EXCHANGED);
return;
@@ -213,7 +213,7 @@ public class RequestDropItem implements IClientIncomingPacket
}
final InventoryUpdate iu = new InventoryUpdate();
for (Item element : player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart()))
for (Item element : player.getInventory().unEquipItemInBodySlotAndRecord(item.getTemplate().getBodyPart()))
{
player.checkSSMatch(null, element);
iu.addModifiedItem(element);

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -179,7 +179,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
}
// can't enchant rods and shadow items
if ((item.getItem().getItemType() == WeaponType.ROD) || item.isShadowItem())
if ((item.getTemplate().getItemType() == WeaponType.ROD) || item.isShadowItem())
{
player.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.setActiveEnchantItem(null);
@@ -204,14 +204,14 @@ public class RequestEnchantItem implements IClientIncomingPacket
return;
}
final int itemType2 = item.getItem().getType2();
final int itemType2 = item.getTemplate().getType2();
boolean enchantItem = false;
boolean blessedScroll = false;
boolean crystalScroll = false;
int crystalId = 0;
/** pretty code ;D */
switch (item.getItem().getCrystalType())
switch (item.getTemplate().getCrystalType())
{
case ItemTemplate.CRYSTAL_A:
{
@@ -384,7 +384,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
int chance = 0;
int maxEnchantLevel = 0;
int minEnchantLevel = 0;
if (item.getItem().getType2() == ItemTemplate.TYPE2_WEAPON)
if (item.getTemplate().getType2() == ItemTemplate.TYPE2_WEAPON)
{
if (blessedScroll)
{
@@ -450,7 +450,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
}
}
}
else if (item.getItem().getType2() == ItemTemplate.TYPE2_SHIELD_ARMOR)
else if (item.getTemplate().getType2() == ItemTemplate.TYPE2_SHIELD_ARMOR)
{
if (blessedScroll)
{
@@ -511,7 +511,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
}
}
}
else if (item.getItem().getType2() == ItemTemplate.TYPE2_ACCESSORY)
else if (item.getTemplate().getType2() == ItemTemplate.TYPE2_ACCESSORY)
{
if (blessedScroll)
{
@@ -595,7 +595,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
return;
}
if ((item.getEnchantLevel() < Config.ENCHANT_SAFE_MAX) || ((item.getItem().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (item.getEnchantLevel() < Config.ENCHANT_SAFE_MAX_FULL)))
if ((item.getEnchantLevel() < Config.ENCHANT_SAFE_MAX) || ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_FULL_ARMOR) && (item.getEnchantLevel() < Config.ENCHANT_SAFE_MAX_FULL)))
{
chance = 100;
}
@@ -697,7 +697,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
player.broadcastUserInfo();
}
int count = item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2);
int count = item.getCrystalCount() - ((item.getTemplate().getCrystalCount() + 1) / 2);
if (count < 1)
{
count = 1;

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetUseItem.java
View File

@@ -85,25 +85,25 @@ public class RequestPetUseItem implements IClientIncomingPacket
if (item.isEquipable())
{
if (PetDataTable.isWolf(pet.getNpcId()) && // wolf
item.getItem().isForWolf())
item.getTemplate().isForWolf())
{
useItem(pet, item, player);
return;
}
else if (PetDataTable.isHatchling(pet.getNpcId()) && // hatchlings
item.getItem().isForHatchling())
item.getTemplate().isForHatchling())
{
useItem(pet, item, player);
return;
}
else if (PetDataTable.isStrider(pet.getNpcId()) && // striders
item.getItem().isForStrider())
item.getTemplate().isForStrider())
{
useItem(pet, item, player);
return;
}
else if (PetDataTable.isBaby(pet.getNpcId()) && // baby pets (buffalo, cougar, kookaboora)
item.getItem().isForBabyPet())
item.getTemplate().isForBabyPet())
{
useItem(pet, item, player);
return;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefine.java
View File

@@ -162,8 +162,8 @@ public class RequestRefine implements IClientIncomingPacket
return false;
}
final int itemGrade = targetItem.getItem().getItemGrade();
final int itemType = targetItem.getItem().getType2();
final int itemGrade = targetItem.getTemplate().getItemGrade();
final int itemType = targetItem.getTemplate().getType2();
final int lifeStoneId = refinerItem.getItemId();
final int gemstoneItemId = gemstoneItem.getItemId();

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRefineCancel.java
View File

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

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestSellItem.java
View File

@@ -142,7 +142,7 @@ public class RequestSellItem implements IClientIncomingPacket
// Check Item
final int objectId = _items[i * 3];
final Item item = player.checkItemManipulation(objectId, count, "sell");
if ((item == null) || !item.getItem().isSellable() || (item.getItemLocation() != ItemLocation.INVENTORY))
if ((item == null) || !item.getTemplate().isSellable() || (item.getItemLocation() != ItemLocation.INVENTORY))
{
continue;
}

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
View File

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

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -144,7 +144,7 @@ public class UseItem implements IClientIncomingPacket
return;
}
if (item.getItem().getType2() == ItemTemplate.TYPE2_QUEST)
if (item.getTemplate().getType2() == ItemTemplate.TYPE2_QUEST)
{
player.sendPacket(new SystemMessage(SystemMessageId.YOU_CANNOT_USE_QUEST_ITEMS));
return;
@@ -265,7 +265,7 @@ public class UseItem implements IClientIncomingPacket
}
// Char cannot use pet items
if (item.getItem().isForWolf() || item.getItem().isForHatchling() || item.getItem().isForStrider() || item.getItem().isForBabyPet())
if (item.getTemplate().isForWolf() || item.getTemplate().isForHatchling() || item.getTemplate().isForStrider() || item.getTemplate().isForBabyPet())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.YOU_MAY_NOT_EQUIP_A_PET_ITEM); // You cannot equip a pet item.
sm.addItemName(itemId);
@@ -299,7 +299,7 @@ public class UseItem implements IClientIncomingPacket
}
// Over enchant protection
int bodyPart = item.getItem().getBodyPart();
int bodyPart = item.getTemplate().getBodyPart();
if (Config.PROTECTED_ENCHANT)
{
switch (bodyPart)
@@ -401,7 +401,7 @@ public class UseItem implements IClientIncomingPacket
List<Item> items = null;
final boolean isEquiped = item.isEquipped();
SystemMessage sm = null;
if (item.getItem().getType2() == ItemTemplate.TYPE2_WEAPON)
if (item.getTemplate().getType2() == ItemTemplate.TYPE2_WEAPON)
{
// if used item is a weapon
Item wep = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_LRHAND);
@@ -486,7 +486,7 @@ public class UseItem implements IClientIncomingPacket
else
{
// Restrict bow weapon for class except Cupid bow.
if ((item.getItem() instanceof Weapon) && (((Weapon) item.getItem()).getItemType() == WeaponType.BOW) && !item.isCupidBow())
if ((item.getTemplate() instanceof Weapon) && (((Weapon) item.getTemplate()).getItemType() == WeaponType.BOW) && !item.isCupidBow())
{
// Restriction not valid on Olympiad matches
if (Config.DISABLE_BOW_CLASSES.contains(player.getClassId().getId()) && !player.isInOlympiadMode())
@@ -497,7 +497,7 @@ public class UseItem implements IClientIncomingPacket
}
}
final int tempBodyPart = item.getItem().getBodyPart();
final int tempBodyPart = item.getTemplate().getBodyPart();
Item tempItem = player.getInventory().getPaperdollItemByItemId(tempBodyPart);
// remove augmentation stats for replaced items currently weapons only.
@@ -592,7 +592,7 @@ public class UseItem implements IClientIncomingPacket
}
// Charge Soulshot/Spiritshot like L2OFF
if (item.getItem() instanceof Weapon)
if (item.getTemplate() instanceof Weapon)
{
player.rechargeAutoSoulShot(true, true, false);
}
@@ -605,14 +605,14 @@ public class UseItem implements IClientIncomingPacket
player.sendPacket(new EtcStatusUpdate(player));
// If an "invisible" item has changed (Jewels, helmet), we dont need to send broadcast packet to all other users.
if ((((item.getItem().getBodyPart() & ItemTemplate.SLOT_HEAD) <= 0) && ((item.getItem().getBodyPart() & ItemTemplate.SLOT_NECK) <= 0) && ((item.getItem().getBodyPart() & ItemTemplate.SLOT_L_EAR) <= 0) && ((item.getItem().getBodyPart() & ItemTemplate.SLOT_R_EAR) <= 0) && ((item.getItem().getBodyPart() & ItemTemplate.SLOT_L_FINGER) <= 0) && ((item.getItem().getBodyPart() & ItemTemplate.SLOT_R_FINGER) <= 0)))
if ((((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_HEAD) <= 0) && ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_NECK) <= 0) && ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_L_EAR) <= 0) && ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_EAR) <= 0) && ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_L_FINGER) <= 0) && ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_R_FINGER) <= 0)))
{
player.broadcastUserInfo();
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(items);
player.sendPacket(iu);
}
else if ((item.getItem().getBodyPart() & ItemTemplate.SLOT_HEAD) > 0)
else if ((item.getTemplate().getBodyPart() & ItemTemplate.SLOT_HEAD) > 0)
{
final InventoryUpdate iu = new InventoryUpdate();
iu.addItems(items);

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
View File

@@ -70,7 +70,7 @@ public class BuyList implements IClientOutgoingPacket
{
if ((item.getCount() > 0) || (item.getCount() == -1))
{
packet.writeH(item.getItem().getType1()); // item type1
packet.writeH(item.getTemplate().getType1()); // item type1
packet.writeD(item.getObjectId());
packet.writeD(item.getItemId());
if (item.getCount() < 0)
@@ -81,11 +81,11 @@ public class BuyList implements IClientOutgoingPacket
{
packet.writeD(item.getCount());
}
packet.writeH(item.getItem().getType2()); // item type2
packet.writeH(item.getTemplate().getType2()); // item type2
packet.writeH(0); // ?
if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA)
if (item.getTemplate().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA)
{
packet.writeD(item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeD(item.getTemplate().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeH(item.getEnchantLevel()); // enchant level
packet.writeH(0); // ?
packet.writeH(0);

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/EquipUpdate.java
View File

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

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
View File

@@ -49,18 +49,18 @@ public class GMViewItemList implements IClientOutgoingPacket
packet.writeH(_items.size());
for (Item temp : _items)
{
if ((temp == null) || (temp.getItem() == null))
if ((temp == null) || (temp.getTemplate() == null))
{
continue;
}
packet.writeH(temp.getItem().getType1());
packet.writeH(temp.getTemplate().getType1());
packet.writeD(temp.getObjectId());
packet.writeD(temp.getItemId());
packet.writeD(temp.getCount());
packet.writeH(temp.getItem().getType2());
packet.writeH(temp.getTemplate().getType2());
packet.writeH(temp.getCustomType1());
packet.writeH(temp.isEquipped() ? 1 : 0);
packet.writeD(temp.getItem().getBodyPart());
packet.writeD(temp.getTemplate().getBodyPart());
packet.writeH(temp.getEnchantLevel());
packet.writeH(temp.getCustomType2());
if (temp.isAugmented())

16
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
View File

@@ -59,20 +59,20 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket
packet.writeH(_items.size());
for (Item item : _items)
{
packet.writeH(item.getItem().getType1());
packet.writeH(item.getTemplate().getType1());
packet.writeD(item.getObjectId());
packet.writeD(item.getItemId());
packet.writeD(item.getCount());
packet.writeH(item.getItem().getType2());
packet.writeH(item.getTemplate().getType2());
packet.writeH(item.getCustomType1());
switch (item.getItem().getType2())
switch (item.getTemplate().getType2())
{
case ItemTemplate.TYPE2_WEAPON:
{
packet.writeD(item.getItem().getBodyPart());
packet.writeD(item.getTemplate().getBodyPart());
packet.writeH(item.getEnchantLevel());
packet.writeH(((Weapon) item.getItem()).getSoulShotCount());
packet.writeH(((Weapon) item.getItem()).getSpiritShotCount());
packet.writeH(((Weapon) item.getTemplate()).getSoulShotCount());
packet.writeH(((Weapon) item.getTemplate()).getSpiritShotCount());
break;
}
case ItemTemplate.TYPE2_SHIELD_ARMOR:
@@ -82,7 +82,7 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket
case ItemTemplate.TYPE2_PET_STRIDER:
case ItemTemplate.TYPE2_PET_BABY:
{
packet.writeD(item.getItem().getBodyPart());
packet.writeD(item.getTemplate().getBodyPart());
packet.writeH(item.getEnchantLevel());
packet.writeH(0);
packet.writeH(0);
@@ -90,7 +90,7 @@ public class GMViewWarehouseWithdrawList implements IClientOutgoingPacket
}
}
packet.writeD(item.getObjectId());
switch (item.getItem().getType2())
switch (item.getTemplate().getType2())
{
case ItemTemplate.TYPE2_WEAPON:
{

8
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
View File

@@ -54,18 +54,18 @@ public class ItemList implements IClientOutgoingPacket
packet.writeH(_items.size());
for (Item temp : _items)
{
if ((temp == null) || (temp.getItem() == null))
if ((temp == null) || (temp.getTemplate() == null))
{
continue;
}
packet.writeH(temp.getItem().getType1());
packet.writeH(temp.getTemplate().getType1());
packet.writeD(temp.getObjectId());
packet.writeD(temp.getItemId());
packet.writeD(temp.getCount());
packet.writeH(temp.getItem().getType2());
packet.writeH(temp.getTemplate().getType2());
packet.writeH(temp.getCustomType1());
packet.writeH(temp.isEquipped() ? 1 : 0);
packet.writeD(temp.getItem().getBodyPart());
packet.writeD(temp.getTemplate().getBodyPart());
packet.writeH(temp.getEnchantLevel());
// race tickets
packet.writeH(temp.getCustomType2());

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PackageSendableList.java
View File

@@ -47,13 +47,13 @@ public class PackageSendableList implements IClientOutgoingPacket
packet.writeD(_items.size());
for (Item item : _items) // format inside the for taken from SellList part use should be about the same
{
packet.writeH(item.getItem().getType1());
packet.writeH(item.getTemplate().getType1());
packet.writeD(item.getObjectId());
packet.writeD(item.getItemId());
packet.writeD(item.getCount());
packet.writeH(item.getItem().getType2());
packet.writeH(item.getTemplate().getType2());
packet.writeH(0);
packet.writeD(item.getItem().getBodyPart());
packet.writeD(item.getTemplate().getBodyPart());
packet.writeH(item.getEnchantLevel());
packet.writeH(0);
packet.writeH(0);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java
View File

@@ -42,11 +42,11 @@ public class PetItemList implements IClientOutgoingPacket
packet.writeH(_items.size());
for (Item temp : _items)
{
packet.writeH(temp.getItem().getType1()); // item type1
packet.writeH(temp.getTemplate().getType1()); // item type1
packet.writeD(temp.getObjectId());
packet.writeD(temp.getItemId());
packet.writeD(temp.getCount());
packet.writeH(temp.getItem().getType2()); // item type2
packet.writeH(temp.getTemplate().getType2()); // item type2
packet.writeH(0xff); // ?
if (temp.isEquipped())
{
@@ -56,7 +56,7 @@ public class PetItemList implements IClientOutgoingPacket
{
packet.writeH(0);
}
packet.writeD(temp.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeD(temp.getTemplate().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
// writeH(temp.getItem().getBodyPart()); // rev 377 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeH(temp.getEnchantLevel()); // enchant level
packet.writeH(0); // ?

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
View File

@@ -67,8 +67,8 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket
packet.writeD(item.getCount());
packet.writeD(item.getReferencePrice());
packet.writeH(0);
packet.writeD(item.getItem().getBodyPart());
packet.writeH(item.getItem().getType2());
packet.writeD(item.getTemplate().getBodyPart());
packet.writeH(item.getTemplate().getType2());
}
// section 3
packet.writeD(_buyList.size()); // count for all items already added for buy

12
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
View File

@@ -43,8 +43,8 @@ public class SellList implements IClientOutgoingPacket
{
if ((item != null) && !item.isEquipped() && // Not equipped
(item.getItemLocation() == ItemLocation.INVENTORY) && // exploit fix
item.getItem().isSellable() && // Item is sellable
(item.getItem().getItemId() != 57) && // Adena is not sellable
item.getTemplate().isSellable() && // Item is sellable
(item.getTemplate().getItemId() != 57) && // Adena is not sellable
((_player.getPet() == null) || // Pet not summoned or
(item.getObjectId() != _player.getPet().getControlItemId()))) // Pet is summoned and not the item that summoned the pet
{
@@ -62,17 +62,17 @@ public class SellList implements IClientOutgoingPacket
packet.writeH(_selllist.size());
for (Item item : _selllist)
{
packet.writeH(item.getItem().getType1());
packet.writeH(item.getTemplate().getType1());
packet.writeD(item.getObjectId());
packet.writeD(item.getItemId());
packet.writeD(item.getCount());
packet.writeH(item.getItem().getType2());
packet.writeH(item.getTemplate().getType2());
packet.writeH(0);
packet.writeD(item.getItem().getBodyPart());
packet.writeD(item.getTemplate().getBodyPart());
packet.writeH(item.getEnchantLevel());
packet.writeH(0);
packet.writeH(0);
packet.writeD(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getItem().getReferencePrice() / 2);
packet.writeD(Config.MERCHANT_ZERO_SELL_PRICE ? 0 : item.getTemplate().getReferencePrice() / 2);
}
return true;
}

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/SellListProcure.java
View File

@@ -64,11 +64,11 @@ public class SellListProcure implements IClientOutgoingPacket
for (Entry<Item, Integer> 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.getItemId());
packet.writeD(entry.getValue()); // count
packet.writeH(item.getItem().getType2());
packet.writeH(item.getTemplate().getType2());
packet.writeH(0); // unknown
packet.writeD(0); // price, you shouldnt get any adena for crops, only raw materials
}

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
View File

@@ -51,13 +51,13 @@ public class TradeStart implements IClientOutgoingPacket
packet.writeH(_itemList.size());
for (Item item : _itemList)// int i = 0; i < count; i++)
{
packet.writeH(item.getItem().getType1()); // item type1
packet.writeH(item.getTemplate().getType1()); // item type1
packet.writeD(item.getObjectId());
packet.writeD(item.getItemId());
packet.writeD(item.getCount());
packet.writeH(item.getItem().getType2()); // item type2
packet.writeH(item.getTemplate().getType2()); // item type2
packet.writeH(0); // ?
packet.writeD(item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeD(item.getTemplate().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeH(item.getEnchantLevel()); // enchant level
packet.writeH(0); // ?
packet.writeH(0);

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
View File

@@ -75,13 +75,13 @@ public class WareHouseDepositList implements IClientOutgoingPacket
packet.writeH(_items.size());
for (Item item : _items)
{
packet.writeH(item.getItem().getType1()); // item type1 //unconfirmed, works
packet.writeH(item.getTemplate().getType1()); // item type1 //unconfirmed, works
packet.writeD(item.getObjectId()); // unconfirmed, works
packet.writeD(item.getItemId()); // unconfirmed, works
packet.writeD(item.getCount()); // unconfirmed, works
packet.writeH(item.getItem().getType2()); // item type2 //unconfirmed, works
packet.writeH(item.getTemplate().getType2()); // item type2 //unconfirmed, works
packet.writeH(0); // ? 100
packet.writeD(item.getItem().getBodyPart()); // ?
packet.writeD(item.getTemplate().getBodyPart()); // ?
packet.writeH(item.getEnchantLevel()); // enchant level -confirmed
packet.writeH(0); // ? 300
packet.writeH(0); // ? 200

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
View File

@@ -66,13 +66,13 @@ public class WareHouseWithdrawalList implements IClientOutgoingPacket
packet.writeH(_items.size());
for (Item item : _items)
{
packet.writeH(item.getItem().getType1()); // item type1 //unconfirmed, works
packet.writeH(item.getTemplate().getType1()); // item type1 //unconfirmed, works
packet.writeD(0); // unconfirmed, works
packet.writeD(item.getItemId()); // unconfirmed, works
packet.writeD(item.getCount()); // unconfirmed, works
packet.writeH(item.getItem().getType2()); // item type2 //unconfirmed, works
packet.writeH(item.getTemplate().getType2()); // item type2 //unconfirmed, works
packet.writeH(0); // ?
packet.writeD(item.getItem().getBodyPart()); // ?
packet.writeD(item.getTemplate().getBodyPart()); // ?
packet.writeH(item.getEnchantLevel()); // enchant level -confirmed
packet.writeH(0); // ?
packet.writeH(0); // ?

10
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java
View File

@@ -60,7 +60,7 @@ public class WearList implements IClientOutgoingPacket
int newlength = 0;
for (Item item : _list)
{
if ((item.getItem().getCrystalType() <= _expertise) && item.isEquipable())
if ((item.getTemplate().getCrystalType() <= _expertise) && item.isEquipable())
{
newlength++;
}
@@ -68,13 +68,13 @@ public class WearList implements IClientOutgoingPacket
packet.writeH(newlength);
for (Item item : _list)
{
if ((item.getItem().getCrystalType() <= _expertise) && item.isEquipable())
if ((item.getTemplate().getCrystalType() <= _expertise) && item.isEquipable())
{
packet.writeD(item.getItemId());
packet.writeH(item.getItem().getType2()); // item type2
if (item.getItem().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA)
packet.writeH(item.getTemplate().getType2()); // item type2
if (item.getTemplate().getType1() != ItemTemplate.TYPE1_ITEM_QUESTITEM_ADENA)
{
packet.writeH(item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
packet.writeH(item.getTemplate().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
}
else
{

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/log/formatter/ItemLogFormatter.java
View File

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

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/telnet/GameStatusThread.java
View File

@@ -880,11 +880,11 @@ public class GameStatusThread extends Thread
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 + ".");
// LOGGER
GMAudit.auditGMAction("TelnetAdministrator", "enchant", player.getName(), itemInstance.getItem().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
GMAudit.auditGMAction("TelnetAdministrator", "enchant", player.getName(), itemInstance.getTemplate().getName() + "(" + itemInstance.getObjectId() + ") from " + curEnchant + " to " + ench);
return true;
}
return false;