summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-13 11:07:09 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-13 11:07:09 +0000
commit45e87f58af948434abe3603f0bd314ccef79fd49 (patch)
tree75ff70b6d0c7d6a2084eebfd696cab59c1628681 /src/map/clif.c
parent00ea0c3f5908cddb310f9c720087facf5ec746e6 (diff)
downloadhercules-45e87f58af948434abe3603f0bd314ccef79fd49.tar.gz
hercules-45e87f58af948434abe3603f0bd314ccef79fd49.tar.bz2
hercules-45e87f58af948434abe3603f0bd314ccef79fd49.tar.xz
hercules-45e87f58af948434abe3603f0bd314ccef79fd49.zip
PNEUMA, BASILICA and SAFETYWALL no longer protect you from such negative status changes as COMA, STUN, FREEZE and etc. (bugreport:1346)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13767 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 95eddb1f4..a7b25d345 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -8129,10 +8129,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if( sd->state.changemap )
{// restore information that gets lost on map-change
- if( (map_flag_gvg(sd->state.pmap) && battle_config.gvg_flee_penalty != 100) || (map[sd->state.pmap].flag.battleground && battle_config.bg_flee_penalty != 100) )
+ if( (battle_config.bg_flee_penalty != 100 || battle_config.gvg_flee_penalty != 100) &&
+ (map_flag_gvg(sd->state.pmap) || map_flag_gvg(sd->bl.m) || map[sd->state.pmap].flag.battleground || map[sd->bl.m].flag.battleground) )
status_calc_bl(&sd->bl, SCB_FLEE); //Refresh flee penalty
- else if( (map_flag_gvg(sd->bl.m) && battle_config.gvg_flee_penalty != 100) || (map[sd->bl.m].flag.battleground && battle_config.bg_flee_penalty != 100) )
- status_calc_bl(&sd->bl, SCB_FLEE);
if( night_flag && map[sd->bl.m].flag.nightenabled )
{ //Display night.