diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-26 13:01:10 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-26 13:01:10 +0000 |
| commit | 2ea1a0100b05dcf1f8001159485c57c76e4a5ae6 (patch) | |
| tree | b5e2155521f5b1487ad536d543e403862f7b6c4b /src/map/clif.c | |
| parent | 54385260051f2b09138aed6c57b1f889ce766c7a (diff) | |
| download | hercules-2ea1a0100b05dcf1f8001159485c57c76e4a5ae6.tar.gz hercules-2ea1a0100b05dcf1f8001159485c57c76e4a5ae6.tar.bz2 hercules-2ea1a0100b05dcf1f8001159485c57c76e4a5ae6.tar.xz hercules-2ea1a0100b05dcf1f8001159485c57c76e4a5ae6.zip | |
- Fixed guild emblem not showing when you log in (caused by r5359)
- Fixed server not sending party/guild info when you enter a map
- Fixed server not removing member minimap dot when you leave a guild
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10624 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 80e863483..456667a32 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8012,15 +8012,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) clif_updatestatus(sd,SP_MAXWEIGHT); clif_updatestatus(sd,SP_WEIGHT); - if(battle_config.pc_invincible_time > 0) { - if(map_flag_gvg(sd->bl.m)) - pc_setinvincibletimer(sd,battle_config.pc_invincible_time<<1); - else - pc_setinvincibletimer(sd,battle_config.pc_invincible_time); - } - map_addblock(&sd->bl); // ブロック登録 - clif_spawn(&sd->bl); // spawn - // Party if(sd->status.party_id) { party_send_movemap(sd); @@ -8031,6 +8022,15 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->status.guild_id) guild_send_memberinfoshort(sd,1); + if(battle_config.pc_invincible_time > 0) { + if(map_flag_gvg(sd->bl.m)) + pc_setinvincibletimer(sd,battle_config.pc_invincible_time<<1); + else + pc_setinvincibletimer(sd,battle_config.pc_invincible_time); + } + map_addblock(&sd->bl); // ブロック登録 + clif_spawn(&sd->bl); // spawn + if(map[sd->bl.m].flag.pvp) { if(!battle_config.pk_mode) { // remove pvp stuff for pk_mode [Valaris] if (!map[sd->bl.m].flag.pvp_nocalcrank) |