diff options
| author | Haru <haru@dotalux.com> | 2018-07-28 03:29:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 03:29:46 +0200 |
| commit | be1c1bc7adda99fbcdc398660525022e5d60b747 (patch) | |
| tree | 241917231ff3f60e973222f19d994b83b6ff2495 /src/map/pc.c | |
| parent | b9bffb2a211618df8a24e1425a04c14d90913fce (diff) | |
| parent | 148f1131248a6c605c2b9875b6f742db01554c47 (diff) | |
| download | hercules-be1c1bc7adda99fbcdc398660525022e5d60b747.tar.gz hercules-be1c1bc7adda99fbcdc398660525022e5d60b747.tar.bz2 hercules-be1c1bc7adda99fbcdc398660525022e5d60b747.tar.xz hercules-be1c1bc7adda99fbcdc398660525022e5d60b747.zip | |
Merge pull request #2147 from MishimaHaruna/fixcooldown
Fix an issue that causes skill cooldowns to get stuck indefinitely
Diffstat (limited to 'src/map/pc.c')
| -rw-r--r-- | src/map/pc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index ff8f18489..01bae5e14 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1413,16 +1413,6 @@ static bool pc_authok(struct map_session_data *sd, int login_id2, time_t expirat clif->changemap(sd,sd->bl.m,sd->bl.x,sd->bl.y); } - /** - * Check if player have any cool downs on - **/ - skill->cooldown_load(sd); - - /** - * Check if player have any item cooldowns on - **/ - pc->itemcd_do(sd,true); - #ifdef GP_BOUND_ITEMS if( sd->status.party_id == 0 ) pc->bound_clear(sd,IBT_PARTY); @@ -1561,6 +1551,10 @@ static int pc_reg_received(struct map_session_data *sd) if (!chrif->auth_finished(sd)) ShowError("pc_reg_received: Failed to properly remove player %d:%d from logging db!\n", sd->status.account_id, sd->status.char_id); + // Restore any cooldowns + skill->cooldown_load(sd); + pc->itemcd_do(sd, true); + pc->load_combo(sd); status_calc_pc(sd,SCO_FIRST|SCO_FORCE); |