summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-10 18:11:10 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-10 18:11:10 +0000
commit1346352b049d049bf773d358cd9aae75788f5eae (patch)
treeabe5ffe00fcf899d901654a842b92690fe976f20 /src
parent0ce48c125084fdbbcdd2b2cd0fd35e8cb6a7c48c (diff)
downloadhercules-1346352b049d049bf773d358cd9aae75788f5eae.tar.gz
hercules-1346352b049d049bf773d358cd9aae75788f5eae.tar.bz2
hercules-1346352b049d049bf773d358cd9aae75788f5eae.tar.xz
hercules-1346352b049d049bf773d358cd9aae75788f5eae.zip
- Fixed Homunculus being spawned as soon as they arrive from the char-server even if the Master has not spawned on the map yet.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9193 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/mercenary.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 1d417be98..34c7d9cd9 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -642,7 +642,8 @@ int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag)
merc_hom_alloc(sd, sh);
hd = sd->hd;
- if(hd->homunculus.hp && !hd->homunculus.vaporize && hd->bl.prev == NULL)
+ if(hd->homunculus.hp && !hd->homunculus.vaporize &&
+ hd->bl.prev == NULL && sd->bl.prev != NULL)
{
map_addblock(&hd->bl);
clif_spawn(&hd->bl);