From cd706c544b903335eb99bd2353c950dabf0d956c Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Tue, 16 Aug 2022 02:17:49 -0400 Subject: [PATCH] Fix bug where non-200 capped classes can't rebirth --- scripts/npc/rebirth.js | 6 +++--- src/main/java/client/Character.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/npc/rebirth.js b/scripts/npc/rebirth.js index 78ddecc290..7859407880 100644 --- a/scripts/npc/rebirth.js +++ b/scripts/npc/rebirth.js @@ -50,10 +50,10 @@ function action(mode, type, selection) { cm.sendSimple("What do you want me to do today: \r\n \r\n #L0##bI want to be reborn!#l \r\n #L1##bNothing for now...#k#l"); } else if (status === 2) { if (selection === 0) { - if (cm.getChar().getLevel() === 200) { + if (cm.getChar().getLevel() === cm.getChar().getMaxClassLevel()) { cm.sendSimple("I see... and which path would you like to take? \r\n\r\n #L0##bExplorer (Beginner)#l \r\n #L1##bCygnus Knight (Noblesse)#l \r\n #L2##bAran (Legend)#l"); } else { - cm.sendOk("You are not level 200, please come back when you hit level 200."); + cm.sendOk("It looks like your journey has not yet ended... come back when you're level " + cm.getChar().getMaxClassLevel()); cm.dispose(); } } else if (selection === 1) { @@ -64,7 +64,7 @@ function action(mode, type, selection) { // 0 => beginner, 1000 => noblesse, 2000 => legend // makes this very easy :-) jobId = selection * 1000; - + var job = ""; if (selection === 0) job = "Beginner"; else if (selection === 1) job = "Noblesse"; diff --git a/src/main/java/client/Character.java b/src/main/java/client/Character.java index 3594ec7b7d..b9972d4248 100644 --- a/src/main/java/client/Character.java +++ b/src/main/java/client/Character.java @@ -11151,7 +11151,7 @@ public class Character extends AbstractCharacterObject { yellowMessage("Rebirth system is not enabled!"); throw new NotEnabledException(); } - if (getLevel() != 200) { + if (getLevel() != getMaxClassLevel()) { return; } addReborns();