From 6d970f21c13006074dea1bd173d9ff7f7af7c338 Mon Sep 17 00:00:00 2001
From: momacabu <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 5 Dec 2012 05:49:10 +0000
Subject: - Re-committed r16974/trunk/src/ (pid:161281).

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

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

diff --git a/src/map/pc.c b/src/map/pc.c
index 25ef846ae..e1ef92d00 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7119,6 +7119,19 @@ int pc_percentheal(struct map_session_data *sd,int hp,int sp)
 	return 0;
 }
 
+static int jobchange_killclone(struct block_list *bl, va_list ap)
+{
+	struct mob_data *md;
+		int flag;
+	md = (struct mob_data *)bl;
+	nullpo_ret(md);
+	flag = va_arg(ap, int);
+
+	if (md->master_id && md->special_state.clone && md->master_id == flag)
+		status_kill(&md->bl);
+	return 1;
+}
+
 /*==========================================
  * Called when player changes job
  * Rewrote to make it tidider [Celest]
@@ -7228,6 +7241,13 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper)
 	//Update skill tree.
 	pc_calc_skilltree(sd);
 	clif_skillinfoblock(sd);
+	
+	if (sd->ed)
+		elemental_delete(sd->ed, 0);
+	if (sd->state.vending)
+		vending_closevending(sd);
+	
+	map_foreachinmap(jobchange_killclone, sd->bl.m, BL_MOB, sd->bl.id);
 
 	//Remove peco/cart/falcon
 	i = sd->sc.option;
-- 
cgit v1.2.3-60-g2f50