Browse Source

- Updated Safety wall so it does not blocks melee magic.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12062 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 17 năm trước cách đây
mục cha
commit
418f5b1059
2 tập tin đã thay đổi với 3 bổ sung1 xóa
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/battle.c

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/01/13
+	* Updated Safety wall so it does not blocks melee magic. [Skotlex]
 2008/01/12
 	* Another possible fix to ers/status_change crashing.
 	- same logic as r12058 but in status_change_timer.

+ 1 - 1
src/map/battle.c

@@ -281,7 +281,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
 
 	if (sc && sc->count) {
 		//First, sc_*'s that reduce damage to 0.
-		if( sc->data[SC_SAFETYWALL] && flag&BF_SHORT && skill_num != NPC_GUIDEDATTACK )
+		if( sc->data[SC_SAFETYWALL] && (flag&(BF_SHORT|BF_MAGIC))==BF_SHORT && skill_num != NPC_GUIDEDATTACK )
 		{
 			struct skill_unit_group *group = (struct skill_unit_group *)sc->data[SC_SAFETYWALL]->val3;
 			if (group) {