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

Reworked Inventory order for rings and earrings.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-24 08:53:24 +00:00
parent 914c9efe6c
commit 3b4ab73421
34 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1133,11 +1133,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1146,8 +1146,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1139,11 +1139,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1152,8 +1152,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1139,11 +1139,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1152,8 +1152,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1139,11 +1139,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1152,8 +1152,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_05.0_Salvation/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())
{
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;
}

6
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1185,11 +1185,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1197,7 +1197,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_05.5_EtinasFate/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())
{
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;
}

6
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1259,11 +1259,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1271,7 +1271,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_06.0_Fafurion/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())
{
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;
}

6
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1259,11 +1259,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1271,7 +1271,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_07.0_PreludeOfWar/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())
{
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;
}

6
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1253,11 +1253,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1265,7 +1265,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1235,11 +1235,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1247,7 +1247,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1235,11 +1235,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1247,7 +1247,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1236,11 +1236,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1248,7 +1248,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1236,11 +1236,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1248,7 +1248,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -833,11 +833,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -846,8 +846,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -898,11 +898,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -911,8 +911,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -898,11 +898,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -911,8 +911,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1141,11 +1141,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1154,8 +1154,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1141,11 +1141,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1154,8 +1154,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_Classic_2.2_Antharas/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())
{
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;
}

6
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1187,11 +1187,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1199,7 +1199,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_Classic_2.3_SevenSigns/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())
{
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;
}

6
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1261,11 +1261,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1273,7 +1273,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/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())
{
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;
}

6
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1261,11 +1261,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1273,7 +1273,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

2
L2J_Mobius_Classic_3.0_TheKamael/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())
{
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;
}

6
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1255,11 +1255,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1267,7 +1267,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1133,11 +1133,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_R_EAR:
{
return PAPERDOLL_REAR;
}
case ItemTemplate.SLOT_LR_EAR:
case ItemTemplate.SLOT_L_EAR:
{
return PAPERDOLL_LEAR;
@@ -1146,8 +1146,8 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
case ItemTemplate.SLOT_R_FINGER:
case ItemTemplate.SLOT_LR_FINGER:
case ItemTemplate.SLOT_R_FINGER:
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1363,11 +1363,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1375,7 +1375,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1372,11 +1372,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1384,7 +1384,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1372,11 +1372,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1384,7 +1384,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}

6
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -1372,11 +1372,11 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_UNDER;
}
else if (slot == ItemTemplate.SLOT_R_EAR)
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_R_EAR))
{
return PAPERDOLL_REAR;
}
else if ((slot == ItemTemplate.SLOT_LR_EAR) || (slot == ItemTemplate.SLOT_L_EAR))
else if (slot == ItemTemplate.SLOT_L_EAR)
{
return PAPERDOLL_LEAR;
}
@@ -1384,7 +1384,7 @@ public abstract class Inventory extends ItemContainer
{
return PAPERDOLL_NECK;
}
else if ((slot == ItemTemplate.SLOT_R_FINGER) || (slot == ItemTemplate.SLOT_LR_FINGER))
else if ((slot == ItemTemplate.SLOT_LR_FINGER) || (slot == ItemTemplate.SLOT_R_FINGER))
{
return PAPERDOLL_RFINGER;
}