diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-12 00:40:39 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-12 00:40:39 +0000 |
| commit | b1cc3f5ebc252e30b129b7570f207211129f08e4 (patch) | |
| tree | de5abbb8831e732006efe0f5dffb8ed2a2ff86a2 | |
| parent | 22618c9ef3cd2eca23a5e9006637074d5b11cf76 (diff) | |
| download | hercules-b1cc3f5ebc252e30b129b7570f207211129f08e4.tar.gz hercules-b1cc3f5ebc252e30b129b7570f207211129f08e4.tar.bz2 hercules-b1cc3f5ebc252e30b129b7570f207211129f08e4.tar.xz hercules-b1cc3f5ebc252e30b129b7570f207211129f08e4.zip | |
Fixed bugreport:6883 made maya purple no longer conflict with status-change-controlled intravision stuff, e.g. box of sunlight.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16916 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/map/status.c b/src/map/status.c index 70ec22af3..802a1c023 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2380,7 +2380,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first) memset (&sd->right_weapon.overrefine, 0, sizeof(sd->right_weapon) - sizeof(sd->right_weapon.atkmods)); memset (&sd->left_weapon.overrefine, 0, sizeof(sd->left_weapon) - sizeof(sd->left_weapon.atkmods)); - if (sd->special_state.intravision) //Clear status change. + if (sd->special_state.intravision && !sd->sc.data[SC_INTRAVISION]) //Clear intravision as long as nothing else is using it clif_status_load(&sd->bl, SI_INTRAVISION, 0); memset(&sd->special_state,0,sizeof(sd->special_state)); @@ -6672,9 +6672,6 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if (sc->data[SC_BERSERK] || sc->data[SC_INSPIRATION] || sc->data[SC__BLOODYLUST]) return 0; break; - case SC_INTRAVISION: - if(sd && sd->special_state.intravision) return 0; //we already have the status by maya P - break; } //Check for BOSS resistances |