Skip to content

Modified skill_cooldown_save() to ignore guild skills if guild_skill_relog_delay is set to 1. #2592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MishimaHaruna merged 1 commit into from
Dec 15, 2019
Merged

Modified skill_cooldown_save() to ignore guild skills if guild_skill_relog_delay is set to 1. #2592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/map/skill.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19758,23 +19758,23 @@ static int skill_get_elemental_type(uint16 skill_id, uint16 skill_lv)
static void skill_cooldown_save(struct map_session_data *sd)
{
int i;
struct skill_cd* cd = NULL;
struct skill_cd *cd = NULL;
int64 now = 0;

// always check to make sure the session properly exists
nullpo_retv(sd);

if( !(cd = idb_get(skill->cd_db, sd->status.char_id)) ) {// no skill cooldown is associated with this character
if ((cd = idb_get(skill->cd_db, sd->status.char_id)) == NULL)
return;
}

now = timer->gettick();

// process each individual cooldown associated with the character
for( i = 0; i < cd->cursor; i++ ) {
cd->entry[i]->duration = DIFF_TICK32(cd->entry[i]->started+cd->entry[i]->duration,now);
if( cd->entry[i]->timer != INVALID_TIMER ) {
timer->delete(cd->entry[i]->timer,skill->blockpc_end);
for (i = 0; i < cd->cursor; i++) {
if (battle_config.guild_skill_relog_delay == 1 && cd->entry[i]->skill_id > GD_SKILLBASE && cd->entry[i]->skill_id < GD_MAX)
continue;

cd->entry[i]->duration = DIFF_TICK32(cd->entry[i]->started + cd->entry[i]->duration, now);
if (cd->entry[i]->timer != INVALID_TIMER) {
timer->delete(cd->entry[i]->timer, skill->blockpc_end);
cd->entry[i]->timer = INVALID_TIMER;
}
}
Expand Down