Kiel Hyre bug squashage.

- Lots of fixes (4ish) from Valandi.
- Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10488 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 13 insertions, 3 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index dbd5d93ab..82a8a5b76 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2007/05/07
+	* Rev. 10487 Kiel Hyre bug squashage. 
+	- Lots of fixes (4ish) from Valandi. [L0ne_W0lf]
+	- Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users. [L0ne_W0lf]
 2007/05/06
 	* More "fixes" tot he Kiel Hyre quest, .KHQuestBusy was being set but was unused. No longer set. [L0ne_W0lf]
 	* Fixed some bugs in Einbech and Geffen spawns [Playtester]
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 3b65fed12..950948a4d 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf (Script), DZeroX (Timer)
 //===== Current Version: ===================================== 
-//= 2.3
+//= 2.4
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -39,6 +39,8 @@
 //= 2.1 Fifth door now checks for a variable HIGHER or EQUAL to 74 not 84, as pointed out by Stollen. [L0ne_W0lf]
 //= 2.2 Another fix for elly, no longer RESETS to 26 when you tak to her. [L0ne_W0lf]
 //= 2.3 Should NOT have been setting .KHQuestBusy at all. It's not used or accessed anymore. Removed. [L0ne_W0lf]
+//= 2.4 Lots of fixes (4ish) from Valandi. [L0ne_W0lf]
+//=	Added a getmapuser check to the mapwarp in KHTimerEnd so it's not trying to warp out 0 users. [L0ne_W0lf]
 //
 //============================================================ 
 
@@ -6694,6 +6696,7 @@ OnTimer30000:
 	stopnpctimer;
 	misceffect 215;
 	disablenpc "Big_Door_5_Warp";
+	set getvariableofnpc(.KHDoor5Opened,"Big Door#BigDoorKHQ5"),0;
 	end;
 
 OnInit:
@@ -7187,7 +7190,7 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	902,{
 		end;
 	}
 
-OnTimer18050:
+OnTimer180050:
 	stopnpctimer;
 	mapwarp "kh_kiehl02","lighthalzen",193,202;
 	donpcevent "KiehlRoom::OnReset";
@@ -7243,7 +7246,10 @@ OnKiehlDead:
 	end;
 	
 OnKHTimerEnd:
-	mapwarp "kh_kiehl02","lighthalzen",193,202;
+	set $@KH_DoorInvoker$,"";
+	if (getmapusers("kh_kiehl02") > 0) {
+		mapwarp "kh_kiehl02","lighthalzen",193,202;
+	}
 	donpcevent "KiehlRoom::OnReset";
 	end;