diff --git a/modules/ExpGamingAdmin/Warnings/control.lua b/modules/ExpGamingAdmin/Warnings/control.lua index b749a2f7..0d7b0494 100644 --- a/modules/ExpGamingAdmin/Warnings/control.lua +++ b/modules/ExpGamingAdmin/Warnings/control.lua @@ -13,7 +13,7 @@ local Color -- FactorioStdLib.Color@^0.8.0 local Sync -- ExpGamingCore.Sync@^4.0.0 -- Local Varibles -local take_action = 8 -- below this number no action is taken, the first admin given warning jumps to this number +local take_action = 7 -- the first admin given warning jumps to this number, this case kick-warn is giving local remove_warnings_time = {} local min_time_to_remove_warning = 18000 -- this is in ticks local punishments = { diff --git a/modules/ExpGamingAdmin/control.lua b/modules/ExpGamingAdmin/control.lua index af576c94..bbacd4c2 100644 --- a/modules/ExpGamingAdmin/control.lua +++ b/modules/ExpGamingAdmin/control.lua @@ -84,7 +84,7 @@ end function Admin.clear_player(player,by_player) local player, by_player = Admin.valid_players(player,by_player) if not player then return end - if Server and Admin.is_banned(player,true) == true then Server.interface(game.unban_player,true,player,by_player) end + if Server and Admin.is_banned(player,true) == true then Server.interface(game.unban_player,true,player) end if Admin.clear_warings then Admin.clear_warings(player,by_player,true) end if Admin.clear_reports then Admin.clear_reports(player,by_player,true) end if Server and Role.has_flag(player,'is_jail') then Server.interface(Role.revert,true,player,by_player,2) end diff --git a/modules/ExpGamingCore/Server/control.lua b/modules/ExpGamingCore/Server/control.lua index 208c07b9..57f46fdf 100644 --- a/modules/ExpGamingCore/Server/control.lua +++ b/modules/ExpGamingCore/Server/control.lua @@ -451,7 +451,10 @@ function Server._thread:error(err) if is_type(self._error,'function') then Manager.sandbox(self._error,self._env,self,err) _return = true - else error(err) end + else + self:close() -- no matter what happens next this thread will be closed + error('Thread Error (no handler): '..err) + end return _return end