- 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://svn.code.sf.net/p/rathena/svn/trunk@9193 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-11-10 18:11:10 +00:00
parent 2de16acdeb
commit fff660eb38
2 changed files with 4 additions and 1 deletions

View File

@ -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]

View File

@ -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);