Sfoglia il codice sorgente

Fixed bugreport:6883 made maya purple no longer conflict with status-change-controlled intravision stuff, e.g. box of sunlight.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16916 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 12 anni fa
parent
commit
9d3f99b320
1 ha cambiato i file con 1 aggiunte e 4 eliminazioni
  1. 1 4
      src/map/status.c

+ 1 - 4
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