diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-13 02:52:06 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-13 02:52:06 +0000 |
| commit | 022423b0ef56edb26303a4d5dfa497db617c9406 (patch) | |
| tree | 1b5ddd8b916b4e73b6ce10db46c7112628b3d7e7 | |
| parent | 11f718069761d2df79c8a127288d258db475ffa0 (diff) | |
| download | hercules-022423b0ef56edb26303a4d5dfa497db617c9406.tar.gz hercules-022423b0ef56edb26303a4d5dfa497db617c9406.tar.bz2 hercules-022423b0ef56edb26303a4d5dfa497db617c9406.tar.xz hercules-022423b0ef56edb26303a4d5dfa497db617c9406.zip | |
- Updated Safety wall so it does not blocks melee magic.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12062 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 691e1c114..703495ec5 100644 --- a/Changelog-Trunk.txt +++ b/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. diff --git a/src/map/battle.c b/src/map/battle.c index 0ada71a5e..9d3bfe31c 100644 --- a/src/map/battle.c +++ b/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) { |