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

Item enchant level should not be negative.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-06-14 21:36:22 +00:00
parent c9864ae60c
commit 56788f6fa1
28 changed files with 178 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -914,17 +914,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

9
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -919,17 +919,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

9
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -919,17 +919,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

9
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -919,17 +919,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

10
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -617,15 +617,17 @@ public class Item extends WorldObject
/**
* Sets the level of enchantment of the item.
* @param enchantLevel the new enchant level
* @param level the new enchant level
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
_storedInDb = false;
}

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

@ -619,15 +619,17 @@ public class Item extends WorldObject
/**
* Sets the level of enchantment of the item.
* @param enchantLevel the new enchant level
* @param level the new enchant level
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
_storedInDb = false;
}

10
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -858,16 +858,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -861,16 +861,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;
}

10
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -861,16 +861,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;
}

9
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -919,17 +919,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

9
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -919,17 +919,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -923,11 +923,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -955,7 +956,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -965,7 +966,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -981,7 +982,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -923,11 +923,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -955,7 +956,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -965,7 +966,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -981,7 +982,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -923,11 +923,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -955,7 +956,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -965,7 +966,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -981,7 +982,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -923,11 +923,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -955,7 +956,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -965,7 +966,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -981,7 +982,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

10
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -914,16 +914,18 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
clearEnchantStats();
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;
}

13
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;

13
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@ -926,11 +926,12 @@ public class Item extends WorldObject
}
/**
* @param enchantLevel the enchant value to set
* @param level the enchant value to set
*/
public void setEnchantLevel(int enchantLevel)
public void setEnchantLevel(int level)
{
if (_enchantLevel == enchantLevel)
final int newLevel = Math.max(0, level);
if (_enchantLevel == newLevel)
{
return;
}
@ -958,7 +959,7 @@ public class Item extends WorldObject
// Add new skills.
if (getLocationSlot() == Inventory.PAPERDOLL_AGATHION1)
{
for (Skill skill : agathionSkills.getMainSkills(enchantLevel))
for (Skill skill : agathionSkills.getMainSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -968,7 +969,7 @@ public class Item extends WorldObject
update = true;
}
}
for (Skill skill : agathionSkills.getSubSkills(enchantLevel))
for (Skill skill : agathionSkills.getSubSkills(newLevel))
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, getActingPlayer(), getActingPlayer()))
{
@ -984,7 +985,7 @@ public class Item extends WorldObject
}
}
_enchantLevel = enchantLevel;
_enchantLevel = newLevel;
applyEnchantStats();
_storedInDb = false;