From 6b23cb7f0e5479ae13d15b4ea4bf832c570943ff Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 4 May 2019 13:08:24 -0300
Subject: Fix some bugs on mobhunter, and update Exception() code

---
 npc/functions/main.txt      | 2 +-
 npc/functions/mobhunter.txt | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'npc/functions')

diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 2cfcbe25c..3568f5f92 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -355,7 +355,7 @@ function	script	Exception	{
 
     if (.@gf & RB_ISFATAL) {
         if (.@gf & RB_SPEECH) {
-            mesc l("This error is fatal."), 1;
+            mesc l("This error is fatal, we stop execution."), 1;
             close;
         }
         if (.@gf & RB_DISPBOTTOM)
diff --git a/npc/functions/mobhunter.txt b/npc/functions/mobhunter.txt
index e7bf03421..a19a595a1 100644
--- a/npc/functions/mobhunter.txt
+++ b/npc/functions/mobhunter.txt
@@ -180,7 +180,7 @@ function	script	GHQ_Assign	{
     .@id=GHQ_GetQuestIDByMonsterID(.@mobId);
     .@q=getq(General_Hunter);
     .@p=getq2(General_Hunter);
-    next;
+    //next;
     //mesq l("Current Quest Progress: @@/10,000 kills", .@p);
     mesn;
     mes l("I represent the @@ Hunters. We hunt @@.", .@loc$, getmonsterlink(.@mobId));
@@ -189,7 +189,8 @@ function	script	GHQ_Assign	{
     else
         mes l("The great prize is to unlock a pet!");
 
-    GHQ_GetRewardsOnMilestone();
+    if (.@q)
+        GHQ_GetRewardsOnMilestone();
     if (.@q == .@id) {
         .@m=GHQ_GetMonsterIDByQuestID(.@q);
         mes l("You are currently hunting @@/10000 @@.", .@p, getmonsterlink(.@m));
-- 
cgit v1.2.3-70-g09d2