From bb0e0bcc5d4da8331f6fb33c879b2d757855722a Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 6 Nov 2006 15:58:30 +0000 Subject: - Ganbantein's delay is now 2 secs. - Removed the time2 value of NJ_NEN since it has no use. - Removed the return code entry when logging GM reload-GM requests (login-sql),it'll just be stored as zero. - Added a fix on socket.c to not pick INADDR_ANY when choosing our own IP. - Applied the correction on maprespawnguildid so that it parses ALL players and not just those on a map. - TK_JUMPKICK now dispels normal aspd/speed potions (not berserk pitched ones) and Preserve will be unable to block this. - Soul Linkers are now inmune to SA_DISPEL - You can now place everything (except magic skills) on top of LPs. - Corrected Ganbantein to not touch song/dance/ensembles. - Status_calc_pc will refuse to execute if the player is still tagged as a "new connection" and the invocation is not meant to be the first one. - Swapped the order of checks in status_isimmune so that Wand of Hermod skill blocking takes precedence over GTB's - Client packets will all be ignored while a player is not on a map until the LoadEndAck packet is received. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9152 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 32a2e9f97..1d417be98 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -720,8 +720,8 @@ int merc_resurrect_homunculus(struct map_session_data *sd, unsigned char per, sh hd->bl.m = sd->bl.m; hd->bl.x = x; hd->bl.y = y; - map_addblock(&sd->hd->bl); - clif_spawn(&sd->hd->bl); + map_addblock(&hd->bl); + clif_spawn(&hd->bl); } status_revive(&hd->bl, per, 0); return 1; -- cgit v1.2.3-70-g09d2