Merge pull request #64 from wushin/stable-testv2013.12.28

MobManger Timing Fix

1 files changed, 3 insertions, 20 deletions

diff --git a/world/map/npc/annuals/xmas/mobmanager.txt b/world/map/npc/annuals/xmas/mobmanager.txt
index 2ffa5e15..c8156783 100644
--- a/world/map/npc/annuals/xmas/mobmanager.txt
+++ b/world/map/npc/annuals/xmas/mobmanager.txt
@@ -4,6 +4,9 @@
 {
 
 OnCommandSpawnStart:
+    if ($@xmas_spawn_started)
+        goto L_End;
+    set $@xmas_spawn_started, 1;
     goto L_InitSpawn;
 
 L_InitSpawn:
@@ -31,26 +34,6 @@ L_NextMap:
     set $@xmas_map_loop, ($@xmas_map_loop + 1);
     goto L_StartLoop;
 
-L_DespawnLoop:
-    killmonster $@xmas_map_spawns$[$@xmas_map_loop], "XmasSpawnCounter#" + $@xmas_map_loop + "::OnTally";
-    goto L_NextDespawn;
-
-L_NextDespawn:
-    if (($@xmas_map_loop + 1) == getarraysize($@xmas_map_spawns$))
-        goto L_SelfDestruct;
-    set $@xmas_map_loop, ($@xmas_map_loop + 1);
-    goto L_DespawnLoop;
-
-L_StopTracking:
-    set $@xmas_mob_lck, 1;
-    set $@xmas_map_loop, 0;
-    goto L_DespawnLoop;
-
-L_SelfDestruct:
-    stopnpctimer;
-    disablenpc "XmasSpawnManager";
-    goto L_End;
-
 OnCommandTally:
     set $@xmas_map_loop, 0;
     set $@xmas_current_count, ($@xmas_current_count - 1);