From 5b1a5532c8bb8abb6bed418c9f672f3dc31dd2bb Mon Sep 17 00:00:00 2001 From: Redox <69946827+wrefgtzweve@users.noreply.github.com> Date: Sat, 16 May 2026 16:34:38 +0200 Subject: [PATCH 1/2] Small bind/event logic cleanup --- .../gmod_wire_expression2/core/init.lua | 8 ++++++-- .../gmod_wire_expression2/core/player.lua | 13 ++++++------ lua/wire/wireshared.lua | 20 +++++++++++-------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/lua/entities/gmod_wire_expression2/core/init.lua b/lua/entities/gmod_wire_expression2/core/init.lua index 01b703489d..afbda09b2c 100644 --- a/lua/entities/gmod_wire_expression2/core/init.lua +++ b/lua/entities/gmod_wire_expression2/core/init.lua @@ -245,7 +245,9 @@ end ---@param name string ---@param args table? function E2Lib.triggerEvent(name, args) - assert(E2Lib.Env.Events[name], "E2Lib.triggerEvent on nonexisting event: '" .. name .. "'") + if not E2Lib.Env.Events[name] then + error("E2Lib.triggerEvent on nonexisting event: '" .. name .. "'", 2) + end local event_listeners = E2Lib.Env.Events[name].listening @@ -264,7 +266,9 @@ end ---@param args table ---@param ignore table function E2Lib.triggerEventOmit(name, args, ignore) - assert(E2Lib.Env.Events[name], "E2Lib.triggerEventOmit on nonexisting event: '" .. name .. "'") + if not E2Lib.Env.Events[name] then + error("E2Lib.triggerEventOmit on nonexisting event: '" .. name .. "'", 2) + end local event_listeners = E2Lib.Env.Events[name].listening diff --git a/lua/entities/gmod_wire_expression2/core/player.lua b/lua/entities/gmod_wire_expression2/core/player.lua index 1a18ea0580..e464b43b2b 100644 --- a/lua/entities/gmod_wire_expression2/core/player.lua +++ b/lua/entities/gmod_wire_expression2/core/player.lua @@ -330,6 +330,7 @@ number_of_keys = number_of_keys + 3 local function UpdateKeys(ply, bind, key, state) local uid = ply:SteamID() + if table.Empty(KeyAlert) then return end local keystate = { runByKey = ply, @@ -363,14 +364,14 @@ local function triggerKey(ply,bind,key,state) end) end -hook.Add("PlayerBindDown", "Exp2KeyReceivingDown", function(player, binding, button) - triggerKey(player,binding,button,true) - E2Lib.triggerEvent("keyPressed", {player, keys_lookup[button], 1, binding or ""}) +hook.Add("PlayerBindDown", "Exp2KeyReceivingDown", function(ply, binding, button) + triggerKey(ply,binding,button,true) + E2Lib.triggerEvent("keyPressed", {ply, keys_lookup[button], 1, binding or ""}) end) -hook.Add("PlayerBindUp", "Exp2KeyReceivingUp", function(player, binding, button) - triggerKey(player,binding,button,false) - E2Lib.triggerEvent("keyPressed", {player, keys_lookup[button], 0, binding or ""}) +hook.Add("PlayerBindUp", "Exp2KeyReceivingUp", function(ply, binding, button) + triggerKey(ply,binding,button,false) + E2Lib.triggerEvent("keyPressed", {ply, keys_lookup[button], 0, binding or ""}) end) local function toggleRunOnKeys(self,ply,on,filter) diff --git a/lua/wire/wireshared.lua b/lua/wire/wireshared.lua index ace09b5a39..bb7e4ad308 100644 --- a/lua/wire/wireshared.lua +++ b/lua/wire/wireshared.lua @@ -1197,16 +1197,20 @@ do end end) - hook.Add("PlayerButtonDown", MESSAGE_NAME, function(player, button) - if not player.SyncedBindings then return end - local binding = player.SyncedBindings[button] - hook.Run("PlayerBindDown", player, binding, button) + hook.Add("PlayerButtonDown", MESSAGE_NAME, function(ply, button) + local syncedBinds = ply.SyncedBindings + if not syncedBinds then return end + + local binding = syncedBinds[button] + hook.Run("PlayerBindDown", ply, binding, button) end) - hook.Add("PlayerButtonUp", MESSAGE_NAME, function(player, button) - if not player.SyncedBindings then return end - local binding = player.SyncedBindings[button] - hook.Run("PlayerBindUp", player, binding, button) + hook.Add("PlayerButtonUp", MESSAGE_NAME, function(ply, button) + local syncedBinds = ply.SyncedBindings + if not syncedBinds then return end + + local binding = syncedBinds[button] + hook.Run("PlayerBindUp", ply, binding, button) end) end end From 1e5ee2494db63f74890ec23f7455c997cbabe8b7 Mon Sep 17 00:00:00 2001 From: Redox <69946827+wrefgtzweve@users.noreply.github.com> Date: Sat, 16 May 2026 16:37:10 +0200 Subject: [PATCH 2/2] Fix typo --- lua/entities/gmod_wire_expression2/core/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/entities/gmod_wire_expression2/core/player.lua b/lua/entities/gmod_wire_expression2/core/player.lua index e464b43b2b..c9de49b9ba 100644 --- a/lua/entities/gmod_wire_expression2/core/player.lua +++ b/lua/entities/gmod_wire_expression2/core/player.lua @@ -330,7 +330,7 @@ number_of_keys = number_of_keys + 3 local function UpdateKeys(ply, bind, key, state) local uid = ply:SteamID() - if table.Empty(KeyAlert) then return end + if table.IsEmpty(KeyAlert) then return end local keystate = { runByKey = ply,