fixed Job Assassin Quest

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

2 files changed, 14 insertions, 9 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cf8ad0152..0bf99fad8 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,6 +29,8 @@ Playtester
 

 Date		Added

 ======

+10/03

+	* Fixed Assassin Job Quest: Timer bug / NPC bypass exploit [Lupus]

 10/01

 	* Removed some duplicate Rachel warps [Playtester]

 09/28	

diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 3031d0545..0af3aa114 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 2.2

+//= 2.3t

 //===== Compatible With: ===================================== 

 //= eAthena RC4

 //===== Description: ========================================= 

@@ -30,6 +30,7 @@
 //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]

 //= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I 

 //= was still able to bypass it) [Toms]

+//= 2.3t Temp fix of: bypassing NPC and timer bug [Lupus]

 //============================================================ 

 

 

@@ -535,17 +536,19 @@ sF_Quiz:
 // ----------------------------------------------------------------

 // Keeps the player from moving to far into the room.

 // This is to avoid cheaters who might try to take Bakardi's test first.

-in_moc_16.gat,19,144,1	script	getbacker	139,8,0,{

-	if(ASSIN_Q > 1) end;

-	warp "in_moc_16.gat",19,142;

-	addtimer 100, "Nameless One::OnTimer700";

-	end;

-}

+//in_moc_16.gat,19,144,1	script	getbacker	139,8,0,{

+//	if(ASSIN_Q > 1) end;

+//	warp "in_moc_16.gat",19,142;

+//	addtimer 100, "Nameless One::OnTimer700";

+//	end;

+//}

 

 // Namelss One ====================================================

-in_moc_16.gat,19,150,1	script	Nameless One	139,{

+in_moc_16.gat,19,150,1	script	Nameless One	139,8,6,{

+OnTouch:

+	if(ASSIN_Q > 1) end;

 

-OnTimer700:

+//OnTimer700:

 	if(ASSIN_Q == 1) goto L_ReTest;

 	set @LISTEN, 0;