From 9666676766bf21364f4fc4d0d1d336e72f2a91b4 Mon Sep 17 00:00:00 2001 From: historia <[not public]> Date: Tue, 6 Oct 2026 12:57:23 -0400 Subject: refactor: split casino.go, dedup helpers, remove audit docs --- internal/game/sys_combat.go | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'internal/game/sys_combat.go') diff --git a/internal/game/sys_combat.go b/internal/game/sys_combat.go index af8cc75..4ccce64 100644 --- a/internal/game/sys_combat.go +++ b/internal/game/sys_combat.go @@ -145,6 +145,15 @@ func (g *Game) checkAggro(sess *net.Session) { if g.Combat.IsMobInCombat(aggMob.InstanceID) { return false } + // The retry outlives the immediate roll: a player can god or enter a + // safespot after the first miss, so re-check both gates on every + // retry before rolling again. + if p.GodMode { + return false + } + if g.isSafespotted(p.Name) && g.safespotBlocksMob(p, aggMob) { + return false + } if rollAggroRand() >= aggroChancePerTick { return true } -- cgit v1.2.3