From 4db605380fc8414ad82a6d2ef51f67789932005a Mon Sep 17 00:00:00 2001
From: SinSloth <SinSloth@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 4 Aug 2007 09:45:19 +0000
Subject: * Fixed a nasty bug in Dandelion's Request.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10944 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt            |  2 ++
 npc/quests/quests_morocc.txt | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 57971a374..283ab89a6 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/08/04
+	* Fixed a nasty bug in Dandelion's Request. [SinSloth]
 2007/07/31
 	* Fixed north prontera kafra having an empty warp list
 	* Removed junk &#1038;A text from the 2004 headgears
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 9470f7d22..adb6c0d9e 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.6
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -16,6 +16,7 @@
 //= 1.4 Fixed a small bug in Dandelion's Request. [SinSloth]
 //= 1.5 Fixed a little bug with "Job_Alchemist" changed to "Job_Alchem". [Samuray22]
 //	-Thanks to Nobuo
+//= 1.6 Fixed a nasty bug in last part of the quest. [SinSloth]
 //============================================================ 
 
 
@@ -7904,13 +7905,13 @@ moc_castle,40,20,3	script	Man	849,{
 		mes "d-dedicate... Myself...";
 		mes "For the s-sacrifice!";
 		mes "^333333*Cough Cough!*^000000";
-		close2;
 		if(!$mao_gate1)
 		{
+			close2;
 			warp "que_job02",14,182;
 			set $mao_gate1,1;
+			end;
 		}
-		end;
 	}
 	else if(mao_request == 124 || mao_request == 125)
 	{
@@ -7922,14 +7923,15 @@ moc_castle,40,20,3	script	Man	849,{
 		mes "d-dedicate... Myself...";
 		mes "For the s-sacrifice!";
 		mes "^333333*Cough Cough!*^000000";
-		close2;
 		if(!$mao_gate2)
 		{
+			close2;
 			warp "que_job03",14,182;
 			set $mao_gate2,1;
+			end;
 		}
-		end;
 	}
+	close;
 
 OnInit:
 	set $mao_gate1,0;
-- 
cgit v1.2.3-60-g2f50