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

Pet include LR hand to weapon getter method.

Browse Source 
Contributed by darkillust.
This commit is contained in:
MobiusDevelopment 2022-07-24 08:47:29 +00:00
parent 65244dc432
commit 914c9efe6c
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,7 +338,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

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

@ -338,7 +338,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

2
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java
View File

@ -338,7 +338,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

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

@ -338,7 +338,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

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

@ -459,7 +459,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

2
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
View File

@ -73,11 +73,11 @@ public class ExPetEquipItem implements IClientIncomingPacket
} }
final Item item = player.getInventory().getItemByObjectId(_objectId); final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null) if (item == null)
{ {
return; return;
} }
// No UseItem is allowed while the player is in special conditions // No UseItem is allowed while the player is in special conditions
if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead()) if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead())
{ {

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

@ -459,7 +459,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

2
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
View File

@ -73,11 +73,11 @@ public class ExPetEquipItem implements IClientIncomingPacket
} }
final Item item = player.getInventory().getItemByObjectId(_objectId); final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null) if (item == null)
{ {
return; return;
} }
// No UseItem is allowed while the player is in special conditions // No UseItem is allowed while the player is in special conditions
if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead()) if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead())
{ {

2
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/instance/Pet.java
View File

@ -459,7 +459,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

2
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
View File

@ -73,11 +73,11 @@ public class ExPetEquipItem implements IClientIncomingPacket
} }
final Item item = player.getInventory().getItemByObjectId(_objectId); final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null) if (item == null)
{ {
return; return;
} }
// No UseItem is allowed while the player is in special conditions // No UseItem is allowed while the player is in special conditions
if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead()) if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead())
{ {

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

@ -459,7 +459,7 @@ public class Pet extends Summon
{ {
for (Item item : _inventory.getItems()) for (Item item : _inventory.getItems())
{ {
if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND)) if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && ((item.getTemplate().getBodyPart() == ItemTemplate.SLOT_R_HAND) || (item.getTemplate().getBodyPart() == ItemTemplate.SLOT_LR_HAND)))
{ {
return item; return item;
} }

2
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/pet/ExPetEquipItem.java
View File

@ -73,11 +73,11 @@ public class ExPetEquipItem implements IClientIncomingPacket
} }
final Item item = player.getInventory().getItemByObjectId(_objectId); final Item item = player.getInventory().getItemByObjectId(_objectId);
if (item == null) if (item == null)
{ {
return; return;
} }
// No UseItem is allowed while the player is in special conditions // No UseItem is allowed while the player is in special conditions
if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead()) if (player.hasBlockActions() || player.isControlBlocked() || player.isAlikeDead())
{ {