|
@@ -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
|
|
// 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!
|
|
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;
|
|
sd->state.connect_new = 0;
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -10589,7 +10589,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
|
|
mail_clear(sd);
|
|
mail_clear(sd);
|
|
|
|
|
|
/* Guild Aura Init */
|
|
/* 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_LEADERSHIP,guild_checkskill(sd->guild,GD_LEADERSHIP));
|
|
guild_guildaura_refresh(sd,GD_GLORYWOUNDS,guild_checkskill(sd->guild,GD_GLORYWOUNDS));
|
|
guild_guildaura_refresh(sd,GD_GLORYWOUNDS,guild_checkskill(sd->guild,GD_GLORYWOUNDS));
|
|
guild_guildaura_refresh(sd,GD_SOULCOLD,guild_checkskill(sd->guild,GD_SOULCOLD));
|
|
guild_guildaura_refresh(sd,GD_SOULCOLD,guild_checkskill(sd->guild,GD_SOULCOLD));
|