From 3632bd9852e35079f65354dda0d8b854afa609c5 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 12 Jun 2016 10:56:32 +0000
Subject: [PATCH] Fixing L2EffectZone message spamming.

---
 .../java/com/l2jmobius/gameserver/model/stats/Formulas.java  | 4 ++--
 .../l2jmobius/gameserver/model/zone/type/L2EffectZone.java   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java
index cfc7663063..22cc98afbc 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/stats/Formulas.java
@@ -724,7 +724,7 @@ public final class Formulas
 			Debug.sendSkillDebug(attacker, target, skill, set);
 		}
 		
-		if (finalRate <= Rnd.get(100))
+		if ((finalRate <= Rnd.get(100)) && (target != attacker))
 		{
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
 			sm.addCharName(target);
@@ -805,7 +805,7 @@ public final class Formulas
 			Debug.sendSkillDebug(attacker.getOwner(), target, skill, set);
 		}
 		
-		return (Rnd.get(100) < finalRate);
+		return Rnd.get(100) < finalRate;
 	}
 	
 	public static boolean calcMagicSuccess(L2Character attacker, L2Character target, Skill skill)
diff --git a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java
index b50874dab0..ab5648fa09 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/zone/type/L2EffectZone.java
@@ -250,7 +250,10 @@ public final class L2EffectZone extends L2ZoneType
 							final Skill skill = SkillData.getInstance().getSkill(e.getKey(), e.getValue());
 							if ((skill != null) && (_bypassConditions || skill.checkCondition(character, character)))
 							{
-								skill.activateSkill(character, character);
+								if (!character.isAffectedBySkill(skill.getId()))
+								{
+									skill.activateSkill(character, character);
+								}
 							}
 						}
 					}