From f9096ffb3cc5228188723d3c7a8c95e753b32e19 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 15 Jun 2018 16:00:28 -0300
Subject: Correct order of events

---
 npc/functions/class.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'npc')

diff --git a/npc/functions/class.txt b/npc/functions/class.txt
index 02354ed1d..85a28fb0e 100644
--- a/npc/functions/class.txt
+++ b/npc/functions/class.txt
@@ -9,7 +9,7 @@
 function	script	ClassMaster	{
     .@CLASS=getarg(0);
     .@CNAME$=getarg(1);
-    .@OTHER$=getarg(2);
+    .@OTHER=getarg(2);
     //.name$=strnpcinfo(1);
 
     // Skills
@@ -18,6 +18,7 @@ function	script	ClassMaster	{
     mesq l("I am the @@ master.", .@CNAME);
     if (!MAGIC_LVL) goto L_NoMagic;
     if (getskilllv(.@OTHER) && !is_admin()) close;
+    if (getskilllv(.@CLASS) == 0) goto L_SignUp;
 
     if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 0) goto L_Tier2;
     if (getskilllv(.@CLASS) == 1 && MAGIC_LVL >= 2 && ST_TIER == 1) mes col("...Where is the recipe for the potion? Ah, I lost it...", 9);
@@ -25,8 +26,6 @@ function	script	ClassMaster	{
     // Sanity check
     if (getskilllv(.@SK_T1) >= 1) mesq l("Are you using my skill?");
     if (getskilllv(.@SK_T1) >= 1) close;
-
-    if (getskilllv(.@CLASS) == 0) goto L_SignUp;
     close;
 
 L_SignUp:
-- 
cgit v1.2.3-70-g09d2