NPCBots: Check if bot is in grid before trying to remove from one

Author: trickerer

src/server/game/AI/NpcBots/botmgr.cpp

@@ -1661,10 +1661,7 @@ void BotMgr::_teleportBot(Creature* bot, Map* newMap, float x, float y, float z,
                 bot->RemoveFromWorld();
             }
 
-            ASSERT(bot->GetGUID());
-
             bot->RemoveAllGameObjects();
-
             bot->m_Events.KillAllEvents(false);
             bot->CombatStop();
             bot->ClearComboPoints();

src/server/game/Maps/Map.cpp

@@ -1032,6 +1032,40 @@ template<class T>
 void Map::RemoveFromMap(T *obj, bool remove)
 {
     bool const inWorld = obj->IsInWorld() && obj->GetTypeId() >= TYPEID_UNIT && obj->GetTypeId() <= TYPEID_GAMEOBJECT;
+
+    //npcbot: tempfix for bots out of grid during remove from map
+    if constexpr (std::is_base_of_v<Creature, T>)
+    {
+        if (obj->IsNPCBot())
+        {
+            obj->RemoveFromWorld();
+
+            if (obj->isActiveObject())
+                RemoveFromActive(obj);
+
+            if (!inWorld) // if was in world, RemoveFromWorld() called DestroyForNearbyPlayers()
+                obj->DestroyForNearbyPlayers(); // previous obj->UpdateObjectVisibility(true)
+
+            if (obj->IsInGrid())
+                obj->RemoveFromGrid();
+            else
+            {
+                Player const* owner = obj->ToCreature()->GetBotOwner();
+                BOT_LOG_ERROR("npcbots", "Map::Remove<Bot>FromMap() bot {} id {} is in map id {} \"{}\" instanceId {} but not in grid!\nmaster: {}\nmaster map id {} \"{}\"",
+                    obj->GetName(), obj->GetEntry(), GetId(), GetMapName(), i_InstanceId, owner ? owner->GetGUID().ToString() : std::string{ "Unknown" },
+                    (owner && owner->IsInWorld()) ? owner->GetMap()->GetId() : 0u, (owner && owner->IsInWorld()) ? std::string(owner->GetMap()->GetMapName()) : std::string{"Unknown"});
+            }
+
+            obj->ResetMap();
+
+            if (remove)
+                DeleteFromWorld(obj);
+
+            return;
+        }
+    }
+    //end npcbot
+
     obj->RemoveFromWorld();
 
     if (obj->isActiveObject())