From 91c87969c4a0f32487cfc8d53cd5342488492a6b Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Sun, 11 Nov 2018 22:57:49 +0100 Subject: [PATCH] Revert "SQL synchronization" This reverts commit d0be16f6285231e59b8bb1589765722cd50a9df1. --- src/map/clif.cpp | 4 ++-- src/map/guild.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/map/clif.cpp b/src/map/clif.cpp index e290445af6..995fae11e3 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -10273,7 +10273,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) // Autotraders should ignore this entirely, clif_parse_LoadEndAck is always invoked manually for them if (!sd->state.active || (!sd->state.autotrade && !sd->state.pc_loaded)) { //Character loading is not complete yet! - //Let pc_reg_received or intif_parse_StorageReceived reinvoke this when ready. + //Let pc_reg_received or pc_scdata_received reinvoke this when ready. sd->state.connect_new = 0; return; } @@ -10589,7 +10589,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) mail_clear(sd); /* Guild Aura Init */ - if( sd->state.gmaster_flag ) { + if( sd->guild && sd->state.gmaster_flag ) { guild_guildaura_refresh(sd,GD_LEADERSHIP,guild_checkskill(sd->guild,GD_LEADERSHIP)); guild_guildaura_refresh(sd,GD_GLORYWOUNDS,guild_checkskill(sd->guild,GD_GLORYWOUNDS)); guild_guildaura_refresh(sd,GD_SOULCOLD,guild_checkskill(sd->guild,GD_SOULCOLD)); diff --git a/src/map/guild.cpp b/src/map/guild.cpp index fba37d6833..b9ee9e9f0b 100644 --- a/src/map/guild.cpp +++ b/src/map/guild.cpp @@ -108,7 +108,7 @@ int guild_skill_get_max (int id) { // Retrieve skill_lv learned by guild int guild_checkskill(struct guild *g, int id) { - if ((id = guild_skill_get_index(id)) < 0) + if ( g == nullptr || (id = guild_skill_get_index(id)) < 0) return 0; return g->skill[id].lv; }