Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected Homunculus healing (#3047)

Browse Source 
* Fixes #3013.
* Homunculus should only be automatically healed at creation.
Thanks to @Thekobe and @Lemongrass3110!
This commit is contained in:
Aleos 2018-04-11 21:52:40 -04:00 committed by GitHub
parent 5b13dc7009
commit 524260183e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/homunculus.cpp
View File

@ -1045,7 +1045,6 @@ void hom_alloc(struct map_session_data *sd, struct s_homunculus *hom)
map_addiddb(&hd->bl); map_addiddb(&hd->bl);
status_calc_homunculus(hd, SCO_FIRST); status_calc_homunculus(hd, SCO_FIRST);
status_percent_heal(&hd->bl, 100, 100);
hd->hungry_timer = INVALID_TIMER; hd->hungry_timer = INVALID_TIMER;
hd->masterteleport_timer = INVALID_TIMER; hd->masterteleport_timer = INVALID_TIMER;
@ -1121,6 +1120,7 @@ int hom_recv_data(uint32 account_id, struct s_homunculus *sh, int flag)
{ {
struct map_session_data *sd; struct map_session_data *sd;
struct homun_data *hd; struct homun_data *hd;
bool created = false;
sd = map_id2sd(account_id); sd = map_id2sd(account_id);
if(!sd) if(!sd)
@ -1137,14 +1137,19 @@ int hom_recv_data(uint32 account_id, struct s_homunculus *sh, int flag)
return 0; return 0;
} }
if (!sd->status.hom_id) //Hom just created. if (!sd->status.hom_id) { //Hom just created.
sd->status.hom_id = sh->hom_id; sd->status.hom_id = sh->hom_id;
created = true;
}
if (sd->hd) //uh? Overwrite the data. if (sd->hd) //uh? Overwrite the data.
memcpy(&sd->hd->homunculus, sh, sizeof(struct s_homunculus)); memcpy(&sd->hd->homunculus, sh, sizeof(struct s_homunculus));
else else
hom_alloc(sd, sh); hom_alloc(sd, sh);
hd = sd->hd; hd = sd->hd;
if (created)
status_percent_heal(&hd->bl, 100, 100);
if(hd && hd->homunculus.hp && !hd->homunculus.vaporize && hd->bl.prev == NULL && sd->bl.prev != NULL) if(hd && hd->homunculus.hp && !hd->homunculus.vaporize && hd->bl.prev == NULL && sd->bl.prev != NULL)
{ {
if(map_addblock(&hd->bl)) if(map_addblock(&hd->bl))