diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/mercenary.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ac78c829a..980ce43cf 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/11/10
+ * Fixed Homunculus being spawned as soon as they arrive from the
+ char-server even if the Master has not spawned on the map yet. [Skotlex]
* AL_TELEPORT now fails when used on top of Land Protector. [Skotlex]
* Some minor cleanings in pc_setpos, it may (or not) help fix that
homunc-caused "map_addblock" error message. [Skotlex]
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);
|