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

Self targeted bad skills should not send a message.

Browse Source
This commit is contained in:
MobiusDev
2018-09-03 21:05:41 +00:00
parent a9045910af
commit c1e1d9083b
7 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }

9
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }

9
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }

9
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }

9
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }

9
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }

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

@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object)) if (!checkConditions(SkillConditionScope.GENERAL, activeChar, object) || !checkConditions(SkillConditionScope.TARGET, activeChar, object))
{ {
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS); if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
sm.addSkillName(_id); {
activeChar.sendPacket(sm); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
sm.addSkillName(_id);
activeChar.sendPacket(sm);
}
return false; return false;
} }