From 52e68dbe1533b916cab84e0e1e3f825f81e6153e Mon Sep 17 00:00:00 2001
From: Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sun, 17 May 2009 16:11:05 +0000
Subject: * Eske and Eska now affect friendly guardians and slaves.
 (bugreport:2131)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13786 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/skill.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/map/skill.c b/src/map/skill.c
index 525beac6f..cb97bd0d0 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5308,13 +5308,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
 			clif_skill_fail(sd,skillid,0,0);
 			status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
-		} else
-			clif_skill_nodamage(src,bl,skillid,skilllv,
-				sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
-
+			break;
+		}
+		clif_skill_nodamage(src,bl,skillid,skilllv,sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
 		if (skillid == SL_SKE)
 			sc_start(src,SC_SMA,100,skilllv,skill_get_time(SL_SMA,skilllv));
-
 		break;
 
 	// New guild skills [Celest]
@@ -5674,6 +5672,12 @@ int skill_castend_id(int tid, unsigned int tick, int id, intptr data)
 				inf &= ~BCT_NEUTRAL;
 			}
 
+			if( ud->skillid >= SL_SKE && ud->skillid <= SL_SKA && target->type == BL_MOB )
+			{
+				if( ((TBL_MOB*)target)->class_ == MOBID_EMPERIUM )
+					break;
+			}
+			else
 			if (inf && battle_check_target(src, target, inf) <= 0)
 				break;
 
-- 
cgit v1.2.3-70-g09d2