From d4a24e017e8570ba4cf6d211b71bf982b10ec304 Mon Sep 17 00:00:00 2001 From: ultramage Date: Wed, 22 Jun 2011 21:02:46 +0000 Subject: [PATCH] Plagiarized skills are now removed on jobchange (bugreport:4973). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14862 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/map/pc.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 138642b15a..718ff00a97 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/06/22 + * Plagiarized skills are now removed on jobchange (bugreport:4973) [ultramage] 2011/06/19 * Fixed various sorts of issues with VS6 project files (since r6929, follow up to r14466 and r14638). [Ai4rei] - Debug configuration was missing and release had _DEBUG defined (indicates debug configuration). diff --git a/src/map/pc.c b/src/map/pc.c index 0584b3c0d4..372c45cb0c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -6371,6 +6371,12 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper) } if(sd->cloneskill_id) { + if( sd->status.skill[sd->cloneskill_id].flag == SKILL_FLAG_PLAGIARIZED ) { + sd->status.skill[sd->cloneskill_id].id = 0; + sd->status.skill[sd->cloneskill_id].lv = 0; + sd->status.skill[sd->cloneskill_id].flag = 0; + clif_deleteskill(sd,sd->cloneskill_id); + } sd->cloneskill_id = 0; pc_setglobalreg(sd, "CLONE_SKILL", 0); pc_setglobalreg(sd, "CLONE_SKILL_LV", 0);