Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NPC_GUIDEDATTACK is not supposed to bypass pneuma/safetywall.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12687 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-05-03 12:37:38 +00:00
parent acde528ec5
commit 4da32e3732
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. 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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/05/03
* NPC_GUIDEDATTACK is not supposed to bypass pneuma/safetywall [ultramage]
2008/05/02 2008/05/02
* Fixed missing iterator destruction in the map_foreach* functions (followup to r12684). * Fixed missing iterator destruction in the map_foreach* functions (followup to r12684).
* Added backward compatible handling of PACKETVER 8 and 9. (followup to r12539) * Added backward compatible handling of PACKETVER 8 and 9. (followup to r12539)

4
src/map/battle.c
View File

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