diff options
| author | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
|---|---|---|
| committer | Matheus Macabu <mkbu95@gmail.com> | 2015-07-08 08:45:01 -0300 |
| commit | 29f4963673b1f793448a083a21be3e6ae4d69c54 (patch) | |
| tree | 8722f2e506fc7ba97070a79739f819f0ade4f03d /src/map/status.c | |
| parent | fb82e87c39227921fc3397a8763f0bdb0921a28b (diff) | |
| parent | 7b1293c3caf76b5587aa3abe8df57b1083c2175d (diff) | |
| download | hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.gz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.bz2 hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.tar.xz hercules-29f4963673b1f793448a083a21be3e6ae4d69c54.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c index 1136b4fec..dc4813055 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -7322,7 +7322,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t status_change_end(bl, SC_FOOD_LUK, INVALID_TIMER); break; case SC_ENDURE: - if( val4 ) + if( val4 == 1 ) status_change_end(bl, SC_LKCONCENTRATION, INVALID_TIMER); break; case SC_FIGHTINGSPIRIT: @@ -10067,7 +10067,8 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const } break; case SC_LKCONCENTRATION: - status_change_end(bl, SC_ENDURE, INVALID_TIMER); + if (sc->data[SC_ENDURE] && sc->data[SC_ENDURE]->val4 != 2) + status_change_end(bl, SC_ENDURE, INVALID_TIMER); break; /** * 3rd Stuff |