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

Fixed passive effects not applied when conditions are met.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2020-06-14 21:09:20 +00:00
parent e56a1374d3
commit f17155b4f0
45 changed files with 45 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1251,6 +1251,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -926,12 +926,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1286,6 +1286,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected(), true))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1355,6 +1355,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1286,6 +1286,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1362,6 +1362,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected(), true))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1355,6 +1355,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/EffectList.java
-6
View File
@@ -922,12 +922,6 @@ public class EffectList
LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!"); LOGGER.warning("Passive " + skill + " with abnormal type: " + skill.getAbnormalType() + "!");
} }
// Check for passive skill conditions.
if (!skill.checkCondition(info.getEffector(), info.getEffected()))
{
return;
}
// Remove previous passives of this id. // Remove previous passives of this id.
_passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> _passives.stream().filter(Objects::nonNull).filter(b -> b.getSkill().getId() == skill.getId()).forEach(b ->
{ {
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
+2
View File
@@ -1257,6 +1257,8 @@ public abstract class Inventory extends ItemContainer
item.updateDatabase(); item.updateDatabase();
} }
getOwner().getStat().recalculateStats(!getOwner().isPlayer());
if (getOwner().isPlayer()) if (getOwner().isPlayer())
{ {
getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer())); getOwner().sendPacket(new ExUserInfoEquipSlot(getOwner().getActingPlayer()));
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java
+1 -1
View File
@@ -1375,7 +1375,7 @@ public class Skill implements IIdentifiable
} }
} }
if (passive && checkConditions(SkillConditionScope.PASSIVE, effector, effector)) if (passive)
{ {
final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null); final BuffInfo info = new BuffInfo(effector, effector, this, true, item, null);
applyEffectScope(EffectScope.GENERAL, info, false, true); applyEffectScope(EffectScope.GENERAL, info, false, true);