diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-04 15:37:09 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-04 15:37:09 +0000 |
| commit | 9b325c6a9ee3e96a991bbac34b907305316e5e1a (patch) | |
| tree | a88ca00179edb3b5a8e89bcad77c1b31bdf880ac /src/map/clif.c | |
| parent | 5edc20529759c12add3da5c3ed0a1cfe335de6b8 (diff) | |
| download | hercules-9b325c6a9ee3e96a991bbac34b907305316e5e1a.tar.gz hercules-9b325c6a9ee3e96a991bbac34b907305316e5e1a.tar.bz2 hercules-9b325c6a9ee3e96a991bbac34b907305316e5e1a.tar.xz hercules-9b325c6a9ee3e96a991bbac34b907305316e5e1a.zip | |
- Repairing items via scripts no longer displays "item has been repaired"
- Status Recovery again makes mobs unlock their current target.
- Moved requesting party/guilds from the char-server from pc_authok to pc_reg_received, since map_nick2sd and map_getallsd won't work until the characters are authentified. Also removed the guild master setting from clif_parse_LoadEndAck to pc_reg_received since guild master setting will work there.
- Fixed homun hunger timer being started on login even when hom is vaporized/dead.
- Fixed mvp exp attacker bonus applying incorrectly.
- Removed duplicate msg_athena.conf entries 619 and 620 for Ninja/Gunslinger.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9401 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 31fdd80f7..ec1ad27bd 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8338,7 +8338,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->state.connect_new) { int lv; - struct guild *g; sd->state.connect_new = 0; clif_skillinfoblock(sd); clif_updatestatus(sd,SP_NEXTBASEEXP); @@ -8365,17 +8364,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) if(sd->pd && sd->pd->pet.intimate > 900) clif_pet_emotion(sd->pd,(sd->pd->pet.class_ - 100)*100 + 50 + pet_hungry_val(sd->pd)); - if(sd->hd) - merc_hom_init_timers(sd->hd); - if (sd->status.guild_id > 0 && !sd->state.gmaster_flag && - (g=guild_search(sd->status.guild_id)) && - strcmp(sd->status.name,g->master) == 0) - { //Block Guild Skills to prevent logout/login reuse exploiting. [Skotlex] - guild_block_skill(sd, 300000); - //Also set the Guild Master flag. - sd->state.gmaster_flag = g; - } + if(merc_is_hom_active(sd->hd)) + merc_hom_init_timers(sd->hd); //Delayed night effect on log-on fix for the glow-issue. Thanks to Larry. if (night_flag && map[sd->bl.m].flag.nightenabled) |