diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-04 16:05:28 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-04 16:05:28 +0000 |
| commit | e7254485e9c865e5757ec39ba60fddb1d1a13e1c (patch) | |
| tree | 48c7d785142f2af6c9360a8362a09da89f20adf0 | |
| parent | 36e4e442f21ed7193c4510a9bb4fcc733f821757 (diff) | |
| download | hercules-e7254485e9c865e5757ec39ba60fddb1d1a13e1c.tar.gz hercules-e7254485e9c865e5757ec39ba60fddb1d1a13e1c.tar.bz2 hercules-e7254485e9c865e5757ec39ba60fddb1d1a13e1c.tar.xz hercules-e7254485e9c865e5757ec39ba60fddb1d1a13e1c.zip | |
Fixed bugreport:5913 recently-added state system no longer breaks on stacking status changes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16228 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/status.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/map/status.c b/src/map/status.c index 21d2621d6..5fd25eeea 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8271,15 +8271,14 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val tick = tick_time; //Don't trust the previous sce assignment, in case the SC ended somewhere between there and here. - if((sce=sc->data[type])) - {// reuse old sc + if((sce=sc->data[type])) {// reuse old sc if( sce->timer != INVALID_TIMER ) delete_timer(sce->timer, status_change_timer); - } - else - {// new sc + } else {// new sc ++(sc->count); sce = sc->data[type] = ers_alloc(sc_data_ers, struct status_change_entry); + if ( StatusChangeStateTable[type] ) /* non-zero */ + status_calc_state(bl,sc,( enum scs_flag ) StatusChangeStateTable[type],true); } sce->val1 = val1; sce->val2 = val2; @@ -8292,10 +8291,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val if (calc_flag) status_calc_bl(bl,calc_flag); - - if ( StatusChangeStateTable[type] ) /* non-zero */ - status_calc_state(bl,sc,( enum scs_flag ) StatusChangeStateTable[type],true); - + if(sd && sd->pd) pet_sc_check(sd, type); //Skotlex: Pet Status Effect Healing |