Replaced last occurrences of shrubbot calls with auth module

timosmit · Sep 2, 2016 · 06d4413 · 06d4413
1 parent e33b948
commit 06d4413
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/luascripts/commands/admin/listaliases.lua b/luascripts/commands/admin/listaliases.lua
@@ -52,7 +52,7 @@ function commandListAliases(clientId, cmdArguments)
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dlistaliases: ^7"..et.gentity_get(cmdClient, "pers.netname").." ^9is immune to this command.\";")
 
         return true
-    elseif et.G_shrubbot_level(cmdClient) > et.G_shrubbot_level(clientId) then
+    elseif auth.getlevel(cmdClient) > auth.getlevel(clientId) then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dlistaliases: ^9sorry, but your intended victim has a higher admin level than you do.\";")
 
         return true

diff --git a/luascripts/commands/admin/plock.lua b/luascripts/commands/admin/plock.lua
@@ -50,7 +50,7 @@ function commandPlayerLock(clientId, cmdArguments)
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dplock: ^7"..et.gentity_get(cmdClient, "pers.netname").." ^9is immune to this command.\";")
 
         return true
-    elseif et.G_shrubbot_level(cmdClient) > et.G_shrubbot_level(clientId) then
+    elseif auth.getlevel(cmdClient) > auth.getlevel(clientId) then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dplock: ^9sorry, but your intended victim has a higher admin level than you do.\";")
 
         return true

diff --git a/luascripts/commands/admin/vmute.lua b/luascripts/commands/admin/vmute.lua
@@ -64,7 +64,7 @@ function commandVoiceMute(clientId, cmdArguments)
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dvmute: ^7"..et.gentity_get(cmdClient, "pers.netname").." ^9is immune to this command.\";")
 
         return true
-    elseif et.G_shrubbot_level(cmdClient) > et.G_shrubbot_level(clientId) then
+    elseif auth.getlevel(cmdClient) > auth.getlevel(clientId) then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dvmute: ^9sorry, but your intended victim has a higher admin level than you do.\";")
 
         return true

diff --git a/luascripts/players/greetings.lua b/luascripts/players/greetings.lua
@@ -31,7 +31,7 @@ local userGreetings = {}
 local levelGreetings = {}
 
 function greetings.get(clientId)
-    local lvl = et.G_shrubbot_level(clientId)
+    local lvl = auth.getlevel(clientId)
 
     if auth.isallowed(clientId, auth.PERM_INCOGNITO) ~= 1 then
         if userGreetings[stats.get(clientId, "playerGUID")] ~= nil then
@@ -118,4 +118,4 @@ function greetings.onbegin(clientId, firstTime)
     end
 end
 
-return greetings
+return greetings