summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-23 14:47:15 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-23 14:47:15 +0000
commite3e7adefe2227343a55a4ac6634de23e045fab09 (patch)
tree5b4fcd51d21d36bdfb37b5da4a71726aeecf7b76 /npc
parent4ed63e0f9abe2b9cb288340940269d6bb116284b (diff)
downloadhercules-e3e7adefe2227343a55a4ac6634de23e045fab09.tar.gz
hercules-e3e7adefe2227343a55a4ac6634de23e045fab09.tar.bz2
hercules-e3e7adefe2227343a55a4ac6634de23e045fab09.tar.xz
hercules-e3e7adefe2227343a55a4ac6634de23e045fab09.zip
Fixed a bug in the new Job Master
- he rebirthed you even if you haven't reached level 99 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6713 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/custom/jobs/jobmaster.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index eeee71086..631c89d76 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -31,6 +31,8 @@ Evera
Date Added
======
05/23
+ * Fixed a bug in the new Job Master [Playtester]
+ - he rebirthed you even if you haven't reached level 99...
* Changed the questions of the Wizard Quiz to official ones [Playtester]
05/22
* Global_Functions fix. Jobmaster fix. [Lance]
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index 6c27c4a8f..707dfa7fc 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -166,7 +166,7 @@ prontera.gat,153,193,6 script Job Master 123,{
if((Class >=Job_Knight) && (Class <=Job_Crusader2)){
mes "Do you want to reborn?";
if(select("Yes","No")==1){
- if(BaseLevel < 99 && JobLevel < 50) goto L_cantCh;
+ if(BaseLevel < 99 || JobLevel < 50) goto L_cantCh;
set lastJob, Class;
if(Class == Job_Knight2){
set lastJob, Job_Knight;