Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds support for instance destruction button (#5073)

Browse Source 
* Adds support for instance destruction button
* Adds an extra parameter in the instance database to toggle if an instance is destroy-able or not.
* Adds support for being notified about character and Clan instances on login.
* Fixes an issue with the instance window displaying wrong instance information on an instance map when multiples instances were running for the character.
Co-authored-by: atemo <capucrath@gmail.com>
This commit is contained in:
Aleos
2020-06-17 14:52:22 -04:00
committed by GitHub
parent 04ba3e3d96
commit 3804d7f603
18 changed files with 185 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/map/guild.cpp
View File

@@ -673,7 +673,7 @@ int guild_recv_info(struct guild *sg) {
clif_guild_notice(sd);
sd->guild_emblem_id = g->emblem_id;
}
if (g->instance_id != 0)
if (g->instance_id > 0)
instance_reqinfo(sd, g->instance_id);
}
@@ -818,7 +818,7 @@ void guild_member_joined(struct map_session_data *sd) {
g->member[i].sd = sd;
sd->guild = g;
if (g->instance_id != 0)
if (g->instance_id > 0)
instance_reqinfo(sd, g->instance_id);
if( channel_config.ally_tmpl.name[0] && (channel_config.ally_tmpl.opt&CHAN_OPT_AUTOJOIN) ) {
channel_gjoin(sd,3);
@@ -870,7 +870,7 @@ int guild_member_added(int guild_id,uint32 account_id,uint32 char_id,int flag) {
//Next line commented because it do nothing, look at guild_recv_info [LuzZza]
//clif_charnameupdate(sd); //Update display name [Skotlex]
if (g->instance_id != 0)
if (g->instance_id > 0)
instance_reqinfo(sd, g->instance_id);
return 0;