From f8047993636ed47b0cb6c49ff650f0bd5e9217b0 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 16 Aug 2006 18:23:28 +0000
Subject: - Fixed null-pointer crash on Evolving a homunculus.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8319 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/mercenary.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/map/mercenary.c')

diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index e76e1bcac..6c5ffe923 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -353,7 +353,7 @@ int merc_hom_evolution(struct homun_data *hd)
 	y = hd->bl.y;
 	merc_hom_vaporize(sd, 0);
 	unit_free(&hd->bl);
-	merc_call_homunculus(hd->master, x, y);
+	merc_call_homunculus(sd, x, y);
 	clif_emotion(&sd->bl, 21) ;	//no1
 	clif_misceffect2(&hd->bl,568);
 	return 1 ;
-- 
cgit v1.2.3-60-g2f50