Skip to content

fix: familiar cooldown #3569

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
dudantas merged 4 commits into from
Jul 13, 2025
+7 −4
Merged

fix: familiar cooldown #3569

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd45c97
fix: familiar was going into cooldown even when there was an error in…
gabrielew Jun 6, 2025
a27f2c8
Merge branch 'main' into fix/familiar-cooldown
gabrielew Jul 1, 2025
9c874ac
Lua code format - (Stylua)
github-actions[bot] Jul 1, 2025
693ad2d
Merge branch 'main' into fix/familiar-cooldown
dudantas Jul 13, 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
13 changes: 8 additions & 5 deletions data/libs/functions/player.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,15 @@ function Player:CreateFamiliarSpell(spellId)
reduction = (reduction > summonDuration and summonDuration) or reduction
cooldown = cooldown - reduction * 60
end
condition:setTicks(1000 * cooldown / configManager.getFloat(configKeys.RATE_SPELL_COOLDOWN))
self:addCondition(condition)

self:createFamiliar(familiarName, summonDuration)
local createdSuccessfully = self:createFamiliar(familiarName, summonDuration)
if createdSuccessfully then
condition:setTicks(1000 * cooldown / configManager.getFloat(configKeys.RATE_SPELL_COOLDOWN))
self:addCondition(condition)
return true
end

return true
return false
end

function Player:createFamiliar(familiarName, timeLeft)
Expand Down Expand Up @@ -292,7 +295,7 @@ function Player:createFamiliar(familiarName, timeLeft)
self:setStorageValue(
FAMILIAR_TIMER[sendMessage].storage,
addEvent(
-- Calling function
-- Calling function
SendMessageFunction,
-- Time for execute event
(timeLeft - FAMILIAR_TIMER[sendMessage].countdown) * 1000,
Expand Down
Loading