From 231abbfab58f40acc9de5008ea7c709bbd5b26a9 Mon Sep 17 00:00:00 2001
From: Andrew <47818697+Nyeriah@users.noreply.github.com>
Date: Wed, 25 Mar 2026 07:44:51 -0300
Subject: [PATCH] fix(Scripts/Pet): prevent recursive EnterEvadeMode in snake
 trap AI (#25217)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/server/scripts/Pet/pet_hunter.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index 239ae9660..b325c2bc3 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -68,14 +68,13 @@ struct npc_pet_hunter_snake_trap : public ScriptedAI
     void EnterEvadeMode(EvadeReason /*why*/) override
     {
         // _EnterEvadeMode();
+        me->AddUnitState(UNIT_STATE_EVADE);
         me->GetThreatMgr().ClearAllThreat();
         me->CombatStop(true);
         me->LoadCreaturesAddon(true);
         me->SetLootRecipient(nullptr);
         me->ResetPlayerDamageReq();
         me->ClearLastLeashExtensionTimePtr();
-
-        me->AddUnitState(UNIT_STATE_EVADE);
         me->GetMotionMaster()->MoveTargetedHome();
 
         Reset();