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

Reduced ensoul array lengths.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-04-01 00:43:40 +00:00
parent 5d4ed8942a
commit 0baae2ed06
10 changed files with 70 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2171,7 +2171,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }

10
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@ -174,8 +174,8 @@ public final class ItemInstance extends WorldObject
private final DropProtection _dropProtection = new DropProtection(); private final DropProtection _dropProtection = new DropProtection();
private final List<Options> _enchantOptions = new ArrayList<>(); private final List<Options> _enchantOptions = new ArrayList<>();
private final EnsoulOption[] _ensoulOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulOptions = new EnsoulOption[2];
private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[3]; private final EnsoulOption[] _ensoulSpecialOptions = new EnsoulOption[1];
/** /**
* Constructor of the ItemInstance from the objectId and the itemId. * Constructor of the ItemInstance from the objectId and the itemId.
@ -2169,7 +2169,11 @@ public final class ItemInstance extends WorldObject
public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB) public void addSpecialAbility(EnsoulOption option, int position, int type, boolean updateInDB)
{ {
if ((position < 0) || (position > 2)) if ((type == 1) && ((position < 0) || (position > 1))) // two first slots
{
return;
}
if ((type == 2) && (position != 0)) // third slot
{ {
return; return;
} }