Skip to content

Fix timers stop existing on last repetition #3481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Astralcircle merged 5 commits into from
Dec 29, 2025
Merged

Fix timers stop existing on last repetition #3481

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f502208
Fix two timers bugs
Astralcircle Dec 27, 2025
cb3ad6b
Lint pass timers
Astralcircle Dec 27, 2025
c1a21f4
More lint passing
Astralcircle Dec 27, 2025
efcc689
Fix possible nil error
Astralcircle Dec 27, 2025
431b502
This should be fixed another way
Astralcircle Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions lua/entities/gmod_wire_expression2/core/timer.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ local timerid = 0
local function Execute(self, name)
self.data.timer.runner = name

self.data['timer'].timers[name] = nil
self.data["timer"].timers[name] = nil

if(self.entity and self.entity.Execute) then
self.entity:Execute()
end

if !self.data['timer'].timers[name] then
timer.Remove("e2_" .. self.data['timer'].timerid .. "_" .. name)
if not self.data["timer"].timers[name] then
timer.Remove("e2_" .. self.data["timer"].timerid .. "_" .. name)
end

self.data.timer.runner = nil
Expand All @@ -31,19 +31,19 @@ local function AddTimer(self, name, delay)
Execute(self, name)
end)
timer.Start(timerName)
elseif !self.data['timer'].timers[name] then
elseif not self.data["timer"].timers[name] then
timer.Create(timerName, delay / 1000, 2, function()
Execute(self, name)
end)
end

self.data['timer'].timers[name] = true
self.data["timer"].timers[name] = true
end

local function RemoveTimer(self, name)
if self.data['timer'].timers[name] then
timer.Remove("e2_" .. self.data['timer'].timerid .. "_" .. name)
self.data['timer'].timers[name] = nil
if self.data["timer"].timers[name] then
timer.Remove("e2_" .. self.data["timer"].timerid .. "_" .. name)
self.data["timer"].timers[name] = nil
end
end

Expand Down Expand Up @@ -71,7 +71,7 @@ local function luaTimerGetNextIncrementalKey(self)
end

local function luaTimerGetInternalName(entIndex, name)
return entIndex .. '_gmod_wire_expression2_luatimer_' .. name
return entIndex .. "_gmod_wire_expression2_luatimer_" .. name
end

local function luaTimerExists(self, name)
Expand Down Expand Up @@ -104,11 +104,11 @@ local function luaTimerCreate(self, name, delay, repetitions, callback)
}

timer.Create(internalName, delay, repetitions, function()
if timer.RepsLeft(internalName) == 0 then
ent:Execute(callback)

if timer.RepsLeft(internalName) == 0 and luaTimers[entIndex] then
luaTimers[entIndex][name] = nil
end

ent:Execute(callback)
end)
end

Expand All @@ -128,15 +128,15 @@ end
/******************************************************************************/

registerCallback("construct", function(self)
self.data['timer'] = {}
self.data['timer'].timerid = timerid
self.data['timer'].timers = {}
self.data["timer"] = {}
self.data["timer"].timerid = timerid
self.data["timer"].timers = {}

timerid = timerid + 1
end)

registerCallback("destruct", function(self)
for name,_ in pairs(self.data['timer'].timers) do
for name,_ in pairs(self.data["timer"].timers) do
RemoveTimer(self, name)
end

Expand Down
Loading