Skip to content

Fixed server crash via @reloadpcdb #3377

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

Open
MrKeiKun wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

Fixed server crash via @reloadpcdb #3377

Show file tree
Hide file tree
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
15 changes: 15 additions & 0 deletions src/map/pc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11806,9 +11806,13 @@ static int pc_readdb(void)
/**
* Read and load into memory, the exp_group_db.conf file.
*/
pc->clear_class_exp_table();
pc->clear_exp_groups();
pc->read_exp_db();

// Repopulate class_exp_table after reloading exp groups
status->read_job_db();

// Reset and read skilltree
pc->clear_skill_tree();
pc->read_skill_tree();
Expand Down Expand Up @@ -12543,6 +12547,16 @@ static void pc_clear_exp_groups(void)
}
}

static void pc_clear_class_exp_table(void)
{
int i, j;
for (i = 0; i < CLASS_COUNT; i++) {
for (j = 0; j < 2; j++) {
pc->dbs->class_exp_table[i][j] = NULL;
}
}
}

static void pc_init_exp_groups(void)
{
int i;
Expand Down Expand Up @@ -13079,6 +13093,7 @@ void pc_defaults(void)
pc->removecombo = pc_removecombo;
pc->update_job_and_level = pc_update_job_and_level;
pc->clear_exp_groups = pc_clear_exp_groups;
pc->clear_class_exp_table = pc_clear_class_exp_table;
pc->init_exp_groups = pc_init_exp_groups;
pc->job_is_dummy = pc_job_is_dummy;

Expand Down
1 change: 1 addition & 0 deletions src/map/pc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,7 @@ END_ZEROED_BLOCK; /* End */
void (*validate_levels) (void);
void (*update_job_and_level) (struct map_session_data *sd);
void (*clear_exp_groups) (void);
void (*clear_class_exp_table) (void);
void (*init_exp_groups) (void);
bool (*job_is_dummy) (int job);

Expand Down
Loading