Merge pull request #483 from mekolat/rate-abuse

prevent magic rate abuse

1 files changed, 2 insertions, 1 deletions

diff --git a/world/map/npc/functions/global_event_handler.txt b/world/map/npc/functions/global_event_handler.txt
index 4d453c83..ad1ba65c 100644
--- a/world/map/npc/functions/global_event_handler.txt
+++ b/world/map/npc/functions/global_event_handler.txt
@@ -13,6 +13,7 @@ OnPCLoginEvent:
     callfunc "ClearVariables"; // removes / converts old variables
     callfunc "DisplayMOTD"; // send the motd to the client, if enabled
     callfunc "getBroadcast"; // get the scheduled broadcast, if any
+    addtimer 0, "Magic Timer::OnLogin"; // prevent cast rate abuse
     // add more here
     set @login_event, 2;
     end;
@@ -29,7 +30,7 @@ OnPCDieEvent:
     callfunc "fightclub_GoBack"; // this used by the battle master
     //callfunc "fightclub_event_die"; // this is used by the 1v1 arena
     set @necromancer, 0;
-    set @_M_BLOCK, 0; // reset magic block on death
+    addtimer 0, "Magic Timer::OnClear"; // reset magic block on death
     set @killerrid, 0; // reset killer rid
     end;