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

10
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java
View File

@@ -235,7 +235,7 @@ public class Inventory
public List<Item> equipItem(Item item)
{
final List<Item> 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;
}

26
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

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

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java
View File

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

16
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

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

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java
View File

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

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

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

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

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -44,16 +44,16 @@ public class UseItem extends ClientBasePacket
if ((item != null) && item.isEquipable() && !activeChar.isInCombat())
{
final List<Item> 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();
}

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
View File

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

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

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java
View File

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/InventoryUpdate.java
View File

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java
View File

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetInventoryUpdate.java
View File

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

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

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

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java
View File

@@ -43,7 +43,7 @@ public class PrivateSellListBuy extends ServerBasePacket
final List<TradeItem> 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;
}

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java
View File

@@ -43,7 +43,7 @@ public class PrivateSellListSell extends ServerBasePacket
final List<TradeItem> 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;
}

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

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOtherAdd.java
View File

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

6
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeOwnAdd.java
View File

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

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
View File

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

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

@@ -43,7 +43,7 @@ public class WareHouseDepositList extends ServerBasePacket
final List<Item> 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());

4
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseWithdrawalList.java
View File

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