From 00b83568a6fa3486ec1626632c6dfdb2c1b7e87f Mon Sep 17 00:00:00 2001
From: mostlikely4r <sebastiaan.keek@gmail.com>
Date: Tue, 8 Oct 2024 09:38:58 +0200
Subject: [PATCH] Creature summon: Keep creature pet active so it can properly
 be removed from active during Map::Remove

---
 src/game/MotionGenerators/HomeMovementGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/MotionGenerators/HomeMovementGenerator.cpp b/src/game/MotionGenerators/HomeMovementGenerator.cpp
index e22af10dd5..b31305f8ba 100644
--- a/src/game/MotionGenerators/HomeMovementGenerator.cpp
+++ b/src/game/MotionGenerators/HomeMovementGenerator.cpp
@@ -103,7 +103,7 @@ void HomeMovementGenerator<Creature>::Finalize(Creature& owner)
                         pSummoner->AI()->SummonedJustReachedHome(&owner);
         }
 
-        if (!wasActive)
+        if (!wasActive && owner.IsInWorld())
             owner.SetActiveObjectState(false);
 
         owner.SetCombatStartPosition(Position());