diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-22 21:02:46 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-22 21:02:46 +0000 |
| commit | f80a5e94f547d398549b1ad4ba030eea73dcd949 (patch) | |
| tree | afa13dfec3323e08c89b27651d0005257d1c81fb | |
| parent | 9b6610e12b484d9bb4b295a5fc609a3eed7f9940 (diff) | |
| download | hercules-f80a5e94f547d398549b1ad4ba030eea73dcd949.tar.gz hercules-f80a5e94f547d398549b1ad4ba030eea73dcd949.tar.bz2 hercules-f80a5e94f547d398549b1ad4ba030eea73dcd949.tar.xz hercules-f80a5e94f547d398549b1ad4ba030eea73dcd949.zip | |
Plagiarized skills are now removed on jobchange (bugreport:4973).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14862 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 138642b15..718ff00a9 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 0584b3c0d..372c45cb0 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); |