From c7540fc930744f9db2a9e1cc82e606d3307dfed7 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Tue, 26 Jan 2021 05:37:10 +0100 Subject: [PATCH] Core/Misc: corrected some oversights in recent commits --- src/server/game/Guilds/GuildMgr.cpp | 4 ++-- .../MovementGenerators/WaypointMovementGenerator.cpp | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index 2e3ec1c0e63..3f4becbde7c 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -419,8 +419,8 @@ void GuildMgr::LoadGuilds() // Delete orphan guild bank items CharacterDatabase.DirectExecute("DELETE gbi FROM guild_bank_item gbi LEFT JOIN guild g ON gbi.guildId = g.guildId WHERE g.guildId IS NULL"); - // 0 1 2 3 4 5 6 7 8 9 10 11 - QueryResult result = CharacterDatabase.Query("SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyType randomPropertyId, durability, creationTime, text, " + // 0 1 2 3 4 5 6 7 8 9 10 11 + QueryResult result = CharacterDatabase.Query("SELECT creatorGuid, giftCreatorGuid, count, duration, charges, flags, enchantments, randomPropertyType, randomPropertyId, durability, creationTime, text, " // 12 13 14 15 16 "guildid, TabId, SlotId, item_guid, itemEntry FROM guild_bank_item gbi INNER JOIN item_instance ii ON gbi.item_guid = ii.guid"); diff --git a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp index 29d720fd5ad..996b9d0ed65 100755 --- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp @@ -58,11 +58,13 @@ void WaypointMovementGenerator::DoInitialize(Creature* creature) } // Determine our first waypoint that we want to approach. - uint32 currentWaypointNode = creature->GetCreatureData()->currentwaypoint; - if (_path->Nodes.size() > currentWaypointNode) + if (CreatureData const* creatureData = creature->GetCreatureData()) { - creature->UpdateCurrentWaypointInfo(currentWaypointNode, _path->Id); - _currentNode = currentWaypointNode; + if (_path->Nodes.size() > creatureData->currentwaypoint) + { + creature->UpdateCurrentWaypointInfo(creatureData->currentwaypoint, _path->Id); + _currentNode = creatureData->currentwaypoint; + } } // We launch the first movement after a initial 1s delay.