diff --git a/mods/CORE/Control/src/Control.lua b/mods/CORE/Control/src/Control.lua index a16ff34..f65b82d 100644 --- a/mods/CORE/Control/src/Control.lua +++ b/mods/CORE/Control/src/Control.lua @@ -2,7 +2,6 @@ local Control = {} -- control.on_press -Events.registerEvent('control.on_press') ---@param callbackFunc fun(player:Player, controlName:string) function Control.subcribeOnPress(callbackFunc) @@ -11,7 +10,6 @@ end -- control.on_release -Events.registerEvent('control.on_release') ---@param callbackFunc fun(player:Player, controlName:string, holdTime:number) function Control.subcribeOnRelease(callbackFunc) @@ -20,7 +18,6 @@ end -- control.on_hold -Events.registerEvent('control.on_hold') ---@param callbackFunc fun(player:Player, controlName:string, holdTime:number, dtime:number) function Control.subcribeOnHold(callbackFunc) @@ -29,7 +26,6 @@ end -- control.on_wield_change -Events.registerEvent('control.on_wield_change') ---@param callbackFunc fun(player:Player, player_wield_index:number, player_last_wield_index:number) function Control.subcribeOnWieldChange(callbackFunc) diff --git a/mods/SYSTEM/Events/init.lua b/mods/SYSTEM/Events/init.lua index 42bea3f..779999b 100644 --- a/mods/SYSTEM/Events/init.lua +++ b/mods/SYSTEM/Events/init.lua @@ -5,20 +5,16 @@ Events = {} ---@type table local registeredEvents = {} ----@param eventName string -function Events.registerEvent(eventName) - assert(registeredEvents[eventName] == nil, ('Event %s is already registered.'):format(eventName)) - - registeredEvents[eventName] = {} -end - ---@param eventName string ---@param callback Events.callback function Events.subscribe(eventName, callback) local callbacks = registeredEvents[eventName] - assert(callbacks ~= nil, ('Event %s does not exist'):format(eventName)) - table.insert(callbacks, callback) + if callbacks == nil then + registeredEvents[eventName] = {callback} + else + table.insert(callbacks, callback) + end end ---@param eventName string @@ -30,4 +26,4 @@ function Events.call(eventName, ...) for _, func in ipairs(callbacks) do func(eventName, ...) end -end \ No newline at end of file +end