From ac699c6bac6c2f11254703d24099765667cc0b26 Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Tue, 7 Jul 2020 03:37:57 +0200
Subject: Fix Dokebi Battle Quest becoming undoable until server restart under
 certain circumstances

---
 npc/quests/quests_amatsu.txt | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 3c55f91a3..d2fa56e6d 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -399,11 +399,14 @@ OnStartArena:
 	enablenpc "Grandma#ama1";
 	enablenpc "Grandpa#ama";
 	warpwaitingpc "ama_test",50,83;
-	donpcevent "Timer#ama::OnEnable";
+	enablenpc("Timer#ama");
+	initnpctimer("Timer#ama");
 	disablewaitingroomevent "Assistant#ama";
 	end;
 
 OnReset:
+	stopnpctimer("Timer#ama");
+	disablenpc("Timer#ama");
 	enablewaitingroomevent "Assistant#ama";
 	end;
 }
@@ -620,7 +623,6 @@ ama_test,50,100,3	script	Coach#ama	4_M_JPN2,15,15,{
 		mes "Don't lose your high self-esteem";
 		mes "in the future. Farewell.";
 		close2;
-		donpcevent "Timer#ama::OnDisable";
 		warp "amatsu",223,230;
 		disablenpc "Coach#ama";
 		donpcevent "Assistant#ama::OnReset";
@@ -665,7 +667,6 @@ ama_test,50,100,3	script	Coach#ama	4_M_JPN2,15,15,{
 			setquest 8128;
 			warp "amatsu",223,230;
 			disablenpc "Coach#ama";
-			donpcevent "Timer#ama::OnDisable";
 			donpcevent "Assistant#ama::OnReset";
 			end;
 		}
@@ -754,7 +755,6 @@ OnTouch:
 	changequest 8129,8130;
 	warp "amatsu",223,230;
 	disablenpc "Coach#after";
-	donpcevent "Timer#ama::OnDisable";
 	donpcevent "Assistant#ama::OnReset";
 	end;
 }
@@ -764,14 +764,6 @@ OnInit:
 	disablenpc "Timer#ama";
 	end;
 
-OnEnable:
-	enablenpc "Timer#ama";
-	initnpctimer;
-	end;
-OnDisable:
-	stopnpctimer;
-	end;
-
 OnTimer1000:
 	mapannounce "ama_test"," The Timer has been activated. You have 6 minutes. Annihilate the monsters in time! ",bc_map;
 	end;
@@ -797,7 +789,6 @@ OnTimer362000:
 
 OnTimer362500:
 	donpcevent "Assistant#ama::OnReset";
-	donpcevent "Timer#ama::OnDisable";
 	end;
 }
 
-- 
cgit v1.2.3-60-g2f50


From be1e71e0252f66e472395aa6d1f56883a565b59a Mon Sep 17 00:00:00 2001
From: skyleo <skyleo@skyleo.de>
Date: Tue, 7 Jul 2020 03:55:35 +0200
Subject: Fix possible exploit in Dokebi Battle Quest

As many players as wanted could remain in the battle area, where the
dokebis and am muts spawn, as long as you have a dialogue open, which
the script provides. One could even keep a certain part of the dialogue
open right before the am muts spawn. Making you able to abuse this quest
in order to have your own am mut farming map, since they drop loot
and give exp. If you have any NPC that you can whisper to trigger a
dialogue, you could even do this more efficiently and kill am muts per
run. First run you kill 3. Second you can kill 6. Third 9.
So once you got 10 players in there, you will have killed 135 Am Muts
and can kill 30 more.
---
 npc/quests/quests_amatsu.txt | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index d2fa56e6d..504ab6032 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -780,11 +780,7 @@ OnTimer361000:
 	end;
 
 OnTimer361500:
-	enablenpc "backwarp#ama";
-	end;
-
-OnTimer362000:
-	disablenpc "backwarp#ama";
+	areawarp("ama_test", 25, 75, 80, 130, "amatsu", 115, 95);
 	end;
 
 OnTimer362500:
@@ -792,16 +788,6 @@ OnTimer362500:
 	end;
 }
 
-ama_test,50,100,0	script	backwarp#ama	FAKE_NPC,25,25,{
-OnInit:
-	disablenpc "backwarp#ama";
-	end;
-
-OnTouch:
-	warp "amatsu",115,95;
-	end;
-}
-
 //== Sushi Quest :: japan_sushi ============================
 ama_in01,162,17,1	script	Sushi Master#ama	4_M_JPNOJI2,{
 	if (MaxWeight - Weight < 5000) {
-- 
cgit v1.2.3-60-g2f50