Fix some security issues and transfer some GM commands.

- @getvar against self is now GM 80
- @event wrapper is now GM 80
- @blessing is now GM 80 and can be used by others beside Jesusalva

5 files changed, 12 insertions, 7 deletions

diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index 338765c0d..b30c8df58 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -640,8 +640,8 @@ OnKillManaBug:
     end;
 
 OnInit:
-    bindatcmd "info", "Trainer::OnRemoteHelp", 0, 0, 0;
-    bindatcmd "tutorial", "Trainer::OnRemoteHelp", 0, 0, 0;
+    bindatcmd "info", "Trainer::OnRemoteHelp", 0, 60, 0;
+    bindatcmd "tutorial", "Trainer::OnRemoteHelp", 0, 60, 0;
 
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, LeatherShirt);
diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index 77ffe8727..586e98031 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -146,8 +146,8 @@ OnSClear:
 
 OnInit:
     bindatcmd "debug", "@debug::OnCall", 99, 99, 1;
-    bindatcmd "getvar", "@debug::OnGetVar", 99, 99, 1;
-    bindatcmd "get-var", "@debug::OnGetVar", 99, 99, 1;
+    bindatcmd "getvar", "@debug::OnGetVar", 80, 99, 1;
+    bindatcmd "get-var", "@debug::OnGetVar", 80, 99, 1;
     bindatcmd "setvar", "@debug::OnSetVar", 99, 99, 1;
     bindatcmd "set-var", "@debug::OnSetVar", 99, 99, 1;
     bindatcmd "sclear", "@debug::OnSClear", 99, 99, 1;
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 45c1d9910..95704009b 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -535,6 +535,6 @@ OnEffect:
     end;
 
 OnInit:
-    bindatcmd "event", "@event::OnCall", 99, 99, 0;
+    bindatcmd "event", "@event::OnCall", 80, 99, 0;
     bindatcmd "toevent", "@toevent::OnCall", 0, 99, 0;
 }
diff --git a/npc/commands/kami.txt b/npc/commands/kami.txt
index 0e9b567c8..6af990194 100644
--- a/npc/commands/kami.txt
+++ b/npc/commands/kami.txt
@@ -27,6 +27,7 @@ OnServMsg:
     end;
 
 OnBuff:
+    .@n$=strtoupper(strcharinfo(0, "JESUSALVA", playerattached()));
     // Disabled command, used for debug purposes
     .@c = getunits(BL_PC, .@players, MAX_CYCLE_PC);
     for (.@i = 0; .@i < .@c; .@i++) {
@@ -38,7 +39,7 @@ OnBuff:
         sc_start SC_WALKSPEED, 300000, 150;
         sc_start SC_ATTHASTE_POTION3, 300000, 50;
         percentheal 100, 100;
-        dispbottom l("YOU WERE BLESSED BY JESUSALVA");
+        dispbottom l("YOU WERE BLESSED BY %s", .@n$);
         dispbottom l("YOU CAN FEEL THE POWER FLOWING TROUGH YOU.");
         detachrid();
     }
@@ -81,7 +82,7 @@ OnInit:
     bindatcmd "k", "@k::OnCall", 60, 80, 1;
     bindatcmd "servmsg", "@k::OnServMsg", 80, 99, 1;
 
-    bindatcmd "blessing", "@k::OnBuff", 99, 100, 1;
+    bindatcmd "blessing", "@k::OnBuff", 80, 99, 1;
     bindatcmd "harm", "@k::OnHarm", 80, 80, 1;
     bindatcmd "cruelty", "@k::OnHarm2", 99, 99, 1;
 
diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt
index adca7ab9f..4f98ac533 100644
--- a/npc/commands/warp.txt
+++ b/npc/commands/warp.txt
@@ -54,6 +54,10 @@ OnCall:
         ++.@e;
     }
 
+    if (getmapflag(.@map$, mf_nowarpto) && !(is_admin() || $@GM_OVERRIDE)) {
+        dispbottom("This map is restricted and cannot be warped to.");
+        close;
+    }
     cwarp .@map$, .@x, .@y; // XXX: maybe here use a slide_or_warp function
 
 OnInit: