瀏覽代碼

Immunity to magic now makes you immune to the SC effect as well. (bugreport:1277)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12527 54d463be-8e91-2dee-dedb-b68131a5f0ec
Kevin 17 年之前
父節點
當前提交
c86112f4e9
共有 2 個文件被更改,包括 4 次插入0 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 3 0
      src/map/skill.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ 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.
 
 2008/04/07
+	* Immunity to magic now makes you immune to the SC effect as well. (r12527) [Kevin]
 	* Made script command 'flagemblem' and guild_emblem_change send an update 
 	  of the emblem_id to the players in the area.
 	- known bug: ui components that are displaying the emblem at the time 

+ 3 - 0
src/map/skill.c

@@ -2197,6 +2197,9 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
 
 	if (skillid && skill_get_type(skillid) == BF_MAGIC && status_isimmune(bl) == 100)
 	{	//GTB makes all targetted magic display miss with a single bolt.
+		sc_type sct = status_skill2sc(skillid);
+		if(sct != SC_NONE)
+			status_change_end(bl, sct, -1);
 		clif_skill_damage(src, bl, tick, status_get_amotion(src), status_get_dmotion(bl), 0, 1, skillid, skilllv, skill_get_hit(skillid));
 		return 1;
 	}