summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
diff options
context:
space:
mode:
authordaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-02 12:17:06 +0000
committerdaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-08-02 12:17:06 +0000
commitbc3119af6271425b6d1579e10ff3d64478467a06 (patch)
tree7cd3b1cd4d120b78a5ff4b08da43ecf2c8609a92 /npc/jobs/2-2
parent84a989232fddebb175e17266f340a77baa82396f (diff)
downloadhercules-bc3119af6271425b6d1579e10ff3d64478467a06.tar.gz
hercules-bc3119af6271425b6d1579e10ff3d64478467a06.tar.bz2
hercules-bc3119af6271425b6d1579e10ff3d64478467a06.tar.xz
hercules-bc3119af6271425b6d1579e10ff3d64478467a06.zip
Fixed some bugs on jobs and merchants scripts.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16559 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/2-2')
-rw-r--r--npc/jobs/2-2/dancer.txt2
-rw-r--r--npc/jobs/2-2/sage.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index db81f1a17..285b7fa14 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -895,6 +895,8 @@ job_duncer,95,93,4 script Bijou#da 101,{
// Waiting Room
//============================================================
job_duncer,32,154,1 script Waiting Room#dance 66,{
+ end;
+
OnInit:
waitingroom "Waiting Room",20,"Waiting Room#dance::OnStartArena",1;
enablewaitingroomevent;
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index fead53630..481392c60 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2560,6 +2560,8 @@ job_sage,50,165,4 script Test Helper#talk 700,{
}
job_sage,50,165,4 script Waiting Room#sg 700,{
+ end;
+
OnInit:
disablenpc "Waiting Room#sg";
waitingroom "Waiting Room",20,"Waiting Room#sg::OnStartArena",1;