From 64b0f98620183330ed2dee90b4c75f49fc90858d Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 13 Apr 2017 08:36:05 +0000
Subject: [PATCH] Return message when skill conditions are not met.

---
 .../com/l2jmobius/gameserver/model/skills/Skill.java   | 10 +++++++++-
 .../com/l2jmobius/gameserver/model/skills/Skill.java   | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 5164e39052..4db95c40b5 100644
--- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1056,7 +1056,15 @@ public final class Skill implements IIdentifiable
 			return false;
 		}
 		
-		return 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);
+			sm.addSkillName(_id);
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		
+		return true;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
index 5164e39052..4db95c40b5 100644
--- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
+++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/Skill.java
@@ -1056,7 +1056,15 @@ public final class Skill implements IIdentifiable
 			return false;
 		}
 		
-		return 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);
+			sm.addSkillName(_id);
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		
+		return true;
 	}
 	
 	/**