1 files changed, 9 insertions, 0 deletions
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
 			}