From 0531d2722075111b13e19e348c2bfdeeea95c7de Mon Sep 17 00:00:00 2001
From: Timo Smit <t.smitje@hotmail.com>
Date: Sat, 21 Jan 2017 14:36:57 +0100
Subject: [PATCH] Fixed unknown client on several commands

* legacy returns nil instead of -1 for et.ClientNumberFromString()
---
 luamods/wolfadmin/commands/admin/ban.lua         | 2 +-
 luamods/wolfadmin/commands/admin/finger.lua      | 2 +-
 luamods/wolfadmin/commands/admin/gib.lua         | 2 +-
 luamods/wolfadmin/commands/admin/kick.lua        | 2 +-
 luamods/wolfadmin/commands/admin/listaliases.lua | 2 +-
 luamods/wolfadmin/commands/admin/listlevels.lua  | 2 +-
 luamods/wolfadmin/commands/admin/mute.lua        | 2 +-
 luamods/wolfadmin/commands/admin/plock.lua       | 2 +-
 luamods/wolfadmin/commands/admin/punlock.lua     | 2 +-
 luamods/wolfadmin/commands/admin/put.lua         | 2 +-
 luamods/wolfadmin/commands/admin/setlevel.lua    | 4 ++--
 luamods/wolfadmin/commands/admin/showhistory.lua | 2 +-
 luamods/wolfadmin/commands/admin/slap.lua        | 2 +-
 luamods/wolfadmin/commands/admin/stats.lua       | 2 +-
 luamods/wolfadmin/commands/admin/unmute.lua      | 2 +-
 luamods/wolfadmin/commands/admin/vmute.lua       | 2 +-
 luamods/wolfadmin/commands/admin/vunmute.lua     | 2 +-
 luamods/wolfadmin/commands/admin/warn.lua        | 4 ++--
 18 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/luamods/wolfadmin/commands/admin/ban.lua b/luamods/wolfadmin/commands/admin/ban.lua
index f2764e1..b916cc1 100644
--- a/luamods/wolfadmin/commands/admin/ban.lua
+++ b/luamods/wolfadmin/commands/admin/ban.lua
@@ -36,7 +36,7 @@ function commandBan(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dban: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/finger.lua b/luamods/wolfadmin/commands/admin/finger.lua
index 17ecf05..f0c0cd5 100644
--- a/luamods/wolfadmin/commands/admin/finger.lua
+++ b/luamods/wolfadmin/commands/admin/finger.lua
@@ -35,7 +35,7 @@ function commandFinger(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dfinger: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/gib.lua b/luamods/wolfadmin/commands/admin/gib.lua
index 351e30c..eeb7fd3 100644
--- a/luamods/wolfadmin/commands/admin/gib.lua
+++ b/luamods/wolfadmin/commands/admin/gib.lua
@@ -34,7 +34,7 @@ function commandGib(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dgib: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/kick.lua b/luamods/wolfadmin/commands/admin/kick.lua
index 27eb142..b998324 100644
--- a/luamods/wolfadmin/commands/admin/kick.lua
+++ b/luamods/wolfadmin/commands/admin/kick.lua
@@ -35,7 +35,7 @@ function commandKick(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dkick: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/listaliases.lua b/luamods/wolfadmin/commands/admin/listaliases.lua
index 9be3251..13642dd 100644
--- a/luamods/wolfadmin/commands/admin/listaliases.lua
+++ b/luamods/wolfadmin/commands/admin/listaliases.lua
@@ -42,7 +42,7 @@ function commandListAliases(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dlistaliases: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/listlevels.lua b/luamods/wolfadmin/commands/admin/listlevels.lua
index a0ac2f2..5b07c14 100644
--- a/luamods/wolfadmin/commands/admin/listlevels.lua
+++ b/luamods/wolfadmin/commands/admin/listlevels.lua
@@ -74,7 +74,7 @@ function commandListLevels(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dlistlevels: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/mute.lua b/luamods/wolfadmin/commands/admin/mute.lua
index 9dbd055..4e26362 100644
--- a/luamods/wolfadmin/commands/admin/mute.lua
+++ b/luamods/wolfadmin/commands/admin/mute.lua
@@ -39,7 +39,7 @@ function commandMute(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dmute: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/plock.lua b/luamods/wolfadmin/commands/admin/plock.lua
index 4dd27b5..f355f16 100644
--- a/luamods/wolfadmin/commands/admin/plock.lua
+++ b/luamods/wolfadmin/commands/admin/plock.lua
@@ -34,7 +34,7 @@ function commandPlayerLock(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dplock: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/punlock.lua b/luamods/wolfadmin/commands/admin/punlock.lua
index 35f36aa..7e90884 100644
--- a/luamods/wolfadmin/commands/admin/punlock.lua
+++ b/luamods/wolfadmin/commands/admin/punlock.lua
@@ -34,7 +34,7 @@ function commandPlayerUnlock(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dpunlock: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/put.lua b/luamods/wolfadmin/commands/admin/put.lua
index 2d9a4e6..9f4cb70 100644
--- a/luamods/wolfadmin/commands/admin/put.lua
+++ b/luamods/wolfadmin/commands/admin/put.lua
@@ -32,7 +32,7 @@ function commandPlayerLock(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dput: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/setlevel.lua b/luamods/wolfadmin/commands/admin/setlevel.lua
index ff6a336..678c5d9 100644
--- a/luamods/wolfadmin/commands/admin/setlevel.lua
+++ b/luamods/wolfadmin/commands/admin/setlevel.lua
@@ -30,7 +30,7 @@ function commandSetLevel(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         return false
     elseif not et.gentity_get(cmdClient, "pers.netname") then
         return false
@@ -55,7 +55,7 @@ function commandSetLevel(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dsetlevel: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/showhistory.lua b/luamods/wolfadmin/commands/admin/showhistory.lua
index a4f5eb8..83fae22 100644
--- a/luamods/wolfadmin/commands/admin/showhistory.lua
+++ b/luamods/wolfadmin/commands/admin/showhistory.lua
@@ -42,7 +42,7 @@ function commandListHistory(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dshowhistory: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/slap.lua b/luamods/wolfadmin/commands/admin/slap.lua
index abcc493..f151e3e 100644
--- a/luamods/wolfadmin/commands/admin/slap.lua
+++ b/luamods/wolfadmin/commands/admin/slap.lua
@@ -34,7 +34,7 @@ function commandSlap(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dslap: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true
diff --git a/luamods/wolfadmin/commands/admin/stats.lua b/luamods/wolfadmin/commands/admin/stats.lua
index c0087f5..51cc806 100644
--- a/luamods/wolfadmin/commands/admin/stats.lua
+++ b/luamods/wolfadmin/commands/admin/stats.lua
@@ -30,7 +30,7 @@ function commandShowStats(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dstats: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/unmute.lua b/luamods/wolfadmin/commands/admin/unmute.lua
index fcbb107..53d07da 100644
--- a/luamods/wolfadmin/commands/admin/unmute.lua
+++ b/luamods/wolfadmin/commands/admin/unmute.lua
@@ -36,7 +36,7 @@ function commandUnmute(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dunmute: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/vmute.lua b/luamods/wolfadmin/commands/admin/vmute.lua
index 3f3cf3e..7095954 100644
--- a/luamods/wolfadmin/commands/admin/vmute.lua
+++ b/luamods/wolfadmin/commands/admin/vmute.lua
@@ -37,7 +37,7 @@ function commandVoiceMute(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dvmute: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/vunmute.lua b/luamods/wolfadmin/commands/admin/vunmute.lua
index 4040868..bfa84be 100644
--- a/luamods/wolfadmin/commands/admin/vunmute.lua
+++ b/luamods/wolfadmin/commands/admin/vunmute.lua
@@ -32,7 +32,7 @@ function commandVoiceUnmute(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
     
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dvunmute: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
         
         return true
diff --git a/luamods/wolfadmin/commands/admin/warn.lua b/luamods/wolfadmin/commands/admin/warn.lua
index 56ee1ae..cd9b5a7 100644
--- a/luamods/wolfadmin/commands/admin/warn.lua
+++ b/luamods/wolfadmin/commands/admin/warn.lua
@@ -39,7 +39,7 @@ function commandWarn(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         return false
     elseif not et.gentity_get(cmdClient, "pers.netname") then
         return false
@@ -62,7 +62,7 @@ function commandWarn(clientId, cmdArguments)
         cmdClient = tonumber(cmdArguments[1])
     end
 
-    if cmdClient == -1 then
+    if cmdClient == -1 or cmdClient == nil then
         et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dwarn: ^9no or multiple matches for '^7"..cmdArguments[1].."^9'.\";")
 
         return true