Skip to content

Add PvP validation to ante timer actions #477

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
V-rtualized merged 5 commits into from
Jul 1, 2026
Merged

Add PvP validation to ante timer actions #477

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1099127
Fix life loss from PvP timer firing after PvP has ended
claude Jul 1, 2026
4cdd241
Revert "Fix life loss from PvP timer firing after PvP has ended"
claude Jul 1, 2026
1aedefc
Fix PvP timer causing life loss after PvP ends
claude Jul 1, 2026
e20ab29
Use end_pvp flag instead of is_pvp_boss to gate PvP timer starts
claude Jul 1, 2026
5f9ecaa
Also ignore PvP timer starts when player has 0 hands left
claude Jul 1, 2026
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
4 changes: 4 additions & 0 deletions networking/action_handlers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,8 @@ end
-- Dual-call: dispatched from network (fromNemesis defaults to true) or self-triggered
-- by MP.ACTIONS.start_ante_timer (passes fromNemesis = false explicitly).
local function action_start_ante_timer(p)
if p.isPvP and (MP.GAME.end_pvp or not MP.is_pvp_boss() or G.GAME.current_round.hands_left <= 0) then return end

local time = p.time
local from_nemesis = p.fromNemesis
if from_nemesis == nil then from_nemesis = true end
Expand Down Expand Up @@ -1290,9 +1292,11 @@ function MP.ACTIONS.request_nemesis_stats()
end

function MP.ACTIONS.start_ante_timer()
local is_pvp = MP.is_pvp_boss() and MP.is_layer_active("pvp_timer")
Client.send({
action = "startAnteTimer",
time = MP.GAME.timer,
isPvP = is_pvp or nil,
})
action_start_ante_timer({ time = MP.GAME.timer, fromNemesis = false })
end
Expand Down