From c1e1d9083b8042a1a395bcbc97f7b4b526a4cbb3 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 3 Sep 2018 21:05:41 +0000
Subject: [PATCH] Self targeted bad skills should not send a message.

---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 .../com/l2jmobius/gameserver/model/skills/Skill.java     | 9 ++++++---
 7 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 1cea15b228..bf0b717aa6 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1089,9 +1089,12 @@ public final class Skill implements IIdentifiable
 		
 		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);
-			sm.addSkillName(_id);
-			activeChar.sendPacket(sm);
+			if (!((activeChar == object) && isBad())) // Self targeted bad skills should not send a message.
+			{
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);
+				sm.addSkillName(_id);
+				activeChar.sendPacket(sm);
+			}
 			return false;
 		}