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

Additional checks for passive skill conditions.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-06-22 10:41:12 +00:00
parent 50694c2121
commit 2a5c8246fa
24 changed files with 132 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -463,6 +463,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -590,6 +595,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

10
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -480,6 +480,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -607,6 +612,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

10
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -480,6 +480,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -607,6 +612,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

10
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -480,6 +480,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -607,6 +612,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

10
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -485,6 +485,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -612,6 +617,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

10
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -508,6 +508,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -635,6 +640,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

10
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -508,6 +508,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -635,6 +640,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

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

@@ -480,6 +480,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -607,6 +612,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

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

@@ -480,6 +480,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -607,6 +612,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

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

@@ -485,6 +485,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -612,6 +617,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

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

@@ -508,6 +508,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -635,6 +640,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);

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

@@ -508,6 +508,11 @@ public abstract class Inventory extends ItemContainer
final Skill skill = holder.getSkill();
if (skill != null)
{
if (skill.isPassive() && !skill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
return;
}
player.addSkill(skill, false);
if (skill.isActive())
@@ -635,6 +640,11 @@ public abstract class Inventory extends ItemContainer
continue;
}
if (itemSkill.isPassive() && !itemSkill.checkConditions(SkillConditionScope.PASSIVE, player, player))
{
continue;
}
player.addSkill(itemSkill, false);
if (itemSkill.isActive() && (item != null))
{

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1395,7 +1395,7 @@ public final class Skill implements IIdentifiable
}
}
if (passive)
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector))
{
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true);