1 files changed, 2 insertions, 6 deletions
diff --git a/world/map/npc/magic/level2-magic-knuckles.txt b/world/map/npc/magic/level2-magic-knuckles.txt
index dc2e61e2..29b0cc93 100644
--- a/world/map/npc/magic/level2-magic-knuckles.txt
+++ b/world/map/npc/magic/level2-magic-knuckles.txt
@@ -81,12 +81,6 @@ OnSetRecast:
     overrideattack (@upmarmuspell[2] * @upmarmuspell[2]), 1, ATTACK_ICON_GENERIC, OVERRIDE_KNUCKLES, strnpcinfo(0)+"::OnAttack", @upmarmuspell[1]; // delay needs to be squared
     end;
 
-OnTimer25000:
-    if (attachrid(getcharid(3)) < 1) end;
-    set @num_upmarmu_hits, 0;
-    detachrid;
-    goto L_StopTimer;
-
 OnInit:
     set .school, SKILL_MAGIC_WAR;
     set .invocation$, chr(MAGIC_SYMBOL) + "upmarmu"; // used in npcs that refer to this spell
@@ -103,5 +97,7 @@ OnInit:
 OnClear:
     set @_U_BLOCK, 0;
     set @num_upmarmu_hits, 0;
+    stopnpctimer;
+    setnpctimer 0;
     end;
 }