final build fixes and codestyle

data/sql/updates/pending_db_world/rev_1675639737114759100.sql

@@ -183,11 +183,12 @@ INSERT INTO `spawn_group` (`groupId`, `spawnType`, `spawnId`) VALUES
 (3, 0, 202337),
 (3, 0, 2017),
 (3, 0, 132683);
+
 -- remove potential duplicates
 DELETE FROM `spawn_group` WHERE `groupId` != 3 AND `spawnType`=0 AND `spawnId` IN (SELECT `spawnId` FROM (SELECT `spawnId` FROM `spawn_group` WHERE `groupId`=3  AND `spawnType`=0) as `temp`);
 DELETE FROM `spawn_group` WHERE `groupId` != 4 AND `spawnType`=1 AND `spawnId` IN (SELECT `spawnId` FROM (SELECT `spawnId` FROM `spawn_group` WHERE `groupId`=4  AND `spawnType`=1) as `temp`);
 
--- Update trinity strings for various cs_list strings, to support showing spawn ID and guid.
+-- Update Acore strings for various cs_list strings, to support showing spawn ID and guid.
 UPDATE `acore_string`
 SET `content_default` = '%d (Entry: %d) - |cffffffff|Hgameobject:%d|h[%s X:%f Y:%f Z:%f MapId:%d]|h|r %s %s'
 WHERE `entry` = 517;

data/sql/updates/pending_db_world/rev_1675863321192995800.sql

@@ -0,0 +1,5 @@
+-- Cherry-pick: https://github.com/TrinityCore/TrinityCore/commit/3d4bebd8d9210fbb84f8fc75742e248071192b09
+-- (Co-authored-by: Treeston <treeston@users.noreply.github.com>)
+DELETE FROM `spawn_group` WHERE `spawnType`=0 AND `spawnId` IN (22831,36626,23708,39059);
+INSERT INTO `spawn_group` (`groupId`,`spawnType`,`spawnId`) VALUES
+(3,0,22831), (3,0,36626), (3,0,23708), (3,0,39059);

src/server/game/AI/CreatureAI.h

@@ -140,6 +140,8 @@ class CreatureAI : public UnitAI
 
     // Called when the creature is target of hostile action: swing, hostile spell landed, fear/etc)
     virtual void AttackedBy(Unit* /*attacker*/) {}
+
+    // Should return true if the NPC is currently being escorted
     virtual bool IsEscorted() { return false; }
 
     // Called when creature is spawned or respawned (for reseting variables)

src/server/game/Entities/Creature/Creature.cpp

@@ -3755,6 +3755,14 @@ uint32 Creature::GetPlayerDamageReq() const
     return _playerDamageReq;
 }
 
+bool Creature::IsEscorted() const
+{
+    if (!IsAIEnabled)
+        return false;
+
+    return AI()->IsEscorted();
+}
+
 std::string Creature::GetDebugInfo() const
 {
     std::stringstream sstr;

src/server/game/Entities/Creature/Creature.h

@@ -391,7 +391,7 @@ class Creature : public Unit, public GridObject<Creature>, public MovableMapObje
 
     void ModifyThreatPercentTemp(Unit* victim, int32 percent, Milliseconds duration);
 
-    bool IsEscorted(bool onlyIfActive = true) const;
+    bool IsEscorted() const;
 
     std::string GetDebugInfo() const override;
 

src/server/game/Entities/GameObject/GameObject.cpp

@@ -1088,7 +1088,7 @@ void GameObject::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask, bool
     if (!data.spawnId)
         data.spawnId = m_spawnId;
     ASSERT(data.spawnId == m_spawnId);
-    
+
     data.id = GetEntry();
     data.spawnPoint.WorldRelocate(this);
     data.phaseMask = phaseMask;

src/server/game/Entities/Object/ObjectGuid.cpp

@@ -98,9 +98,9 @@ void ObjectGuidGeneratorBase::HandleCounterOverflow(HighGuid high)
 
 void ObjectGuidGeneratorBase::CheckGuidTrigger(ObjectGuid::LowType guidlow)
 {
-    if (!World::IsGuidAlert() && guidlow > sWorld->getIntConfig(CONFIG_RESPAWN_GUIDALERTLEVEL))
+    if (!sWorld->IsGuidAlert() && guidlow > sWorld->getIntConfig(CONFIG_RESPAWN_GUIDALERTLEVEL))
         sWorld->TriggerGuidAlert();
-    else if (!World::IsGuidWarning() && guidlow > sWorld->getIntConfig(CONFIG_RESPAWN_GUIDWARNLEVEL))
+    else if (!sWorld->IsGuidWarning() && guidlow > sWorld->getIntConfig(CONFIG_RESPAWN_GUIDWARNLEVEL))
         sWorld->TriggerGuidWarning();
 }
 

src/server/game/Globals/ObjectMgr.cpp

@@ -8167,7 +8167,7 @@ void ObjectMgr::DeleteCreatureData(ObjectGuid::LowType guid)
     {
         RemoveCreatureFromGrid(guid, data);
         OnDeleteSpawnData(data);
-    }  
+    }
 
     _creatureDataStore.erase(guid);
 }
@@ -8181,7 +8181,6 @@ void ObjectMgr::DeleteGameObjectData(ObjectGuid::LowType guid)
         RemoveGameobjectFromGrid(guid, data);
         OnDeleteSpawnData(data);
     }
-
 
     _gameObjectDataStore.erase(guid);
 }

src/server/game/Maps/Map.cpp

@@ -3754,8 +3754,6 @@ void Map::SaveRespawnTime(SpawnObjectType type, ObjectGuid::LowType spawnId, uin
 
 void Map::SaveRespawnTimeDB(SpawnObjectType type, ObjectGuid::LowType spawnId, time_t respawnTime, CharacterDatabaseTransaction dbTrans)
 {
-    // CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); -> is it neeeded ?
-
     // Just here for support of compatibility mode
     CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement((type == SPAWN_TYPE_GAMEOBJECT) ? CHAR_REP_GO_RESPAWN : CHAR_REP_CREATURE_RESPAWN);
     stmt->SetData(0, spawnId);

src/server/game/World/IWorld.h

@@ -613,6 +613,8 @@ class IWorld
     virtual void RemoveOldCorpses() = 0;
     virtual void TriggerGuidWarning() = 0;
     virtual void TriggerGuidAlert() = 0;
+    virtual bool IsGuidWarning() const = 0;
+    virtual bool IsGuidAlert() const = 0;
 };
 
 #endif //AZEROTHCORE_IWORLD_H

src/server/game/World/World.h

@@ -355,8 +355,8 @@ class World: public IWorld
     void RemoveOldCorpses() override;
     void TriggerGuidWarning() override;
     void TriggerGuidAlert() override;
-    static bool IsGuidWarning() { return _guidWarn; }
-    static bool IsGuidAlert() { return _guidAlert; }
+    bool IsGuidWarning() const override { return _guidWarn; }
+    bool IsGuidAlert() const override { return _guidAlert; }
 
 protected:
     void _UpdateGameTime();
@@ -460,8 +460,8 @@ class World: public IWorld
 
     std::mutex _guidAlertLock;
 
-    static bool _guidWarn;
-    static bool _guidAlert;
+    bool _guidWarn;
+    bool _guidAlert;
     uint32 _warnDiff;
     time_t _warnShutdownTime;
 

src/server/scripts/Commands/cs_npc.cpp

@@ -227,7 +227,6 @@ class npc_commandscript : public CommandScript
                 CreatureData& data = sObjectMgr->NewOrExistCreatureData(guid);
                 data.id1 = id;
                 data.phaseMask = chr->GetPhaseMaskForSpawn();
-
 
                 Creature* creature = trans->CreateNPCPassenger(guid, &data);
 

src/server/scripts/Commands/cs_wp.cpp

@@ -707,7 +707,7 @@ class wp_commandscript : public CommandScript
                     wpCreature2->SaveToDB(map->GetId(), (1 << map->GetSpawnMode()), chr->GetPhaseMaskForSpawn());
                     // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells();
                     //TODO: Should we first use "Create" then use "LoadFromDB"?
-                    if (!wpCreature2->LoadFromDB(wpCreature2->GetSpawnId(), map, true, false))  
+                    if (!wpCreature2->LoadFromDB(wpCreature2->GetSpawnId(), map, true, false))
                     {
                         handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, VISUAL_WAYPOINT);
                         delete wpCreature2;