- Reverted the change that was making ES skills stun the caster always.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6523 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/05/08
+	* Reverted the change that was making ES skills stun the caster always.
+	  [Skotlex]
 	* Removed the fixpos packet which is sent whenever you are hit while moving
 	  as Aegis doesn't sends this packet neither. [Skotlex]
 	* ES magic will now put the caster on stun for 0.5 secs regardless of

src/map/skill.c

@@ -2924,12 +2924,12 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 	case SL_STIN:
 	case SL_STUN:
 	case SL_SMA:
-		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB)
+		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
+			status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
 			clif_skill_fail(sd,skillid,0,0);
-		else
-			skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag);
-				status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
-		status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
+			break;
+		}
+		skill_attack(BF_MAGIC,src,src,bl,skillid,skilllv,tick,flag);
 		break;
 		
 	/* ‚»‚Ì‘¼ */
@@ -5389,36 +5389,36 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		break;
 
 	case SL_SKA: // [marquis007]
-		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB)
+		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
+			status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
 			clif_skill_fail(sd,skillid,0,0);
-		else
-			clif_skill_nodamage(src,bl,skillid,skilllv,
-				sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
-		//Stun happens regardless.
-		status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
+			break;
+		}
+		clif_skill_nodamage(src,bl,skillid,skilllv,
+			sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
 		break;
-		
 	case SL_SWOO:
 		if (sd && (
 			(!battle_config.allow_es_magic_pc && bl->type != BL_MOB) ||
 			(tsc && tsc->data[type].timer != -1)
-		))
-			clif_skill_fail(sd,skillid,0,0);
-		else
-			clif_skill_nodamage(src,bl,skillid,skilllv,
-				sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
+		)) {
 			status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
+			clif_skill_fail(sd,skillid,0,0);
+			break;
+		}
+		clif_skill_nodamage(src,bl,skillid,skilllv,
+			sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
 		break;
 
 	case SL_SKE:
-		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB)
+		if (sd && !battle_config.allow_es_magic_pc && bl->type != BL_MOB) {
+			status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
 			clif_skill_fail(sd,skillid,0,0);
-		else {
-			clif_skill_nodamage(src,bl,skillid,skilllv,
-				sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
-			sc_start(src,SC_SMA,100,skilllv,skill_get_time(SL_SMA,skilllv));
+			break;
 		}
-		status_change_start(src,SC_STUN,10000,skilllv,0,0,0,500,10);
+		clif_skill_nodamage(src,bl,skillid,skilllv,
+			sc_start(bl,type,100,skilllv,skill_get_time(skillid,skilllv)));
+		sc_start(src,SC_SMA,100,skilllv,skill_get_time(SL_SMA,skilllv));
 		break;
 		
 	// New guild skills [Celest]