diff --git a/config.lua b/config.lua index 3d8571fb..52935178 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,5 @@ +_DEBUG = false + global.scenario = {} global.spys = {"valansch", "air20"} global.scenario.variables = {} diff --git a/custom_commands.lua b/custom_commands.lua index 626fec1f..fd5498e2 100644 --- a/custom_commands.lua +++ b/custom_commands.lua @@ -448,14 +448,16 @@ local function pool() end end -local old_add_command = commands.add_command -commands.add_command = function(name, desc, func) - old_add_command(name, desc, function(cmd) - local success, error = pcall(func, cmd) - if not success then - log(error) - end - end) +if not _DEBUG then + local old_add_command = commands.add_command + commands.add_command = function(name, desc, func) + old_add_command(name, desc, function(cmd) + local success, error = pcall(func, cmd) + if not success then + log(error) + end + end) + end end commands.add_command("kill", "Will kill you.", kill) @@ -468,7 +470,7 @@ commands.add_command("regular", ', Change regular stat commands.add_command("mods", 'Prints a list of game mods.', print_mods) commands.add_command("mod", ', Changes moderator status of a player. (Admins only)', mod) commands.add_command("afk", 'Shows how long players have been afk.', afk) -commands.add_command("tag", ' Sets a players tag. (Admins only)', tag) +--commands.add_command("tag", ' Sets a players tag. (Admins only)', tag) commands.add_command("follow", ' makes you follow the player. Use /unfollow to stop following a player.', follow) commands.add_command("unfollow", 'stops following a player.', unfollow) commands.add_command("tpmode", "Toggles tp mode. When on place a ghost entity to teleport there (Admins and moderators)", toggle_tp_mode) diff --git a/utils/event.lua b/utils/event.lua index 2feb5439..5c950d69 100644 --- a/utils/event.lua +++ b/utils/event.lua @@ -1,7 +1,5 @@ local Event = {} -local debug_mode = false - local init_event_name = -1 local load_event_name = -2 @@ -13,7 +11,7 @@ local event_handlers = {} local on_nth_tick_event_handlers = {} local function call_handlers(handlers, event) - if debug_mode then + if _DEBUG then for _, handler in ipairs(handlers) do handler(event) end diff --git a/utils/gui.lua b/utils/gui.lua index a69e8fe0..87ff374b 100644 --- a/utils/gui.lua +++ b/utils/gui.lua @@ -9,7 +9,13 @@ local click_handlers local close_handlers function Gui.uid_name() - return tostring(Token.uid()) + if _DEBUG then + -- https://stackoverflow.com/questions/48402876/getting-current-file-name-in-lua + local filename = debug.getinfo(2, 'S').source:match('^.+/(.+)$'):sub(1, -5) + return filename .. ',' .. Token.uid() + else + return tostring(Token.uid()) + end end -- Associates data with the LuaGuiElement. If data is nil then removes the data