From f9dd378355a5238e6a7441d58396badee1711fac Mon Sep 17 00:00:00 2001 From: Antz Date: Sat, 25 Apr 2020 14:57:20 +0100 Subject: [PATCH] Make Mangos compatible with newer MySQL pt2. Based by work by @leprasmurf --- src/game/Object/Corpse.cpp | 4 ++-- src/modules/Bots/playerbot/PlayerbotFactory.cpp | 2 +- src/modules/Eluna | 2 +- src/modules/SD3 | 2 +- src/realmd | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/Object/Corpse.cpp b/src/game/Object/Corpse.cpp index 7931afef..940b5142 100644 --- a/src/game/Object/Corpse.cpp +++ b/src/game/Object/Corpse.cpp @@ -162,9 +162,9 @@ void Corpse::DeleteFromDB() bool Corpse::LoadFromDB(uint32 lowguid, Field* fields) { //// 0 1 2 3 4 5 6 - // QueryResult *result = CharacterDatabase.Query("SELECT corpse.guid, player, corpse.position_x, corpse.position_y, corpse.position_z, corpse.orientation, corpse.map," + // QueryResult *result = CharacterDatabase.Query("SELECT `corpse`.`guid`, `player`, `corpse`.`position_x`, `corpse`.`position_y`, `corpse`.`position_z`, `corpse`.`orientation`, `corpse`.`map`," //// 7 8 9 10 11 12 13 14 15 16 17 - // "time, corpse_type, instance, gender, race, class, playerBytes, playerBytes2, equipmentCache, guildId, playerFlags FROM corpse" + // "`time`, `corpse_type`, `instance`, `gender`, `race`, `class`, `playerBytes`, `playerBytes2`, `equipmentCache`, `guildId`, `playerFlags` FROM `corpse`" uint32 playerLowGuid = fields[1].GetUInt32(); float positionX = fields[2].GetFloat(); float positionY = fields[3].GetFloat(); diff --git a/src/modules/Bots/playerbot/PlayerbotFactory.cpp b/src/modules/Bots/playerbot/PlayerbotFactory.cpp index fd0af6d0..6e893543 100644 --- a/src/modules/Bots/playerbot/PlayerbotFactory.cpp +++ b/src/modules/Bots/playerbot/PlayerbotFactory.cpp @@ -1272,7 +1272,7 @@ void PlayerbotFactory::InitAmmo() return; } - QueryResult *results = WorldDatabase.PQuery("select max(entry), max(RequiredLevel) from item_template where class = '%u' and subclass = '%u' and RequiredLevel <= '%u'", + QueryResult *results = WorldDatabase.PQuery("select max(`entry`), max(`RequiredLevel`) from `item_template` where `class` = '%u' and `subclass` = '%u' and `RequiredLevel` <= '%u'", ITEM_CLASS_PROJECTILE, subClass, bot->getLevel()); if (!results) { diff --git a/src/modules/Eluna b/src/modules/Eluna index aab1441a..f7adf330 160000 --- a/src/modules/Eluna +++ b/src/modules/Eluna @@ -1 +1 @@ -Subproject commit aab1441a7a9f3fb5631d76e5a77ff884261263a6 +Subproject commit f7adf330284995eca84a68be538fdbe0978a107d diff --git a/src/modules/SD3 b/src/modules/SD3 index 4feb6a19..eafcd2d8 160000 --- a/src/modules/SD3 +++ b/src/modules/SD3 @@ -1 +1 @@ -Subproject commit 4feb6a19c9bd3f3eb6f51dbf9ff390c5fe4cb345 +Subproject commit eafcd2d8622bb2b3161206914c21a7a397ec1b32 diff --git a/src/realmd b/src/realmd index eed95dd3..3d46391e 160000 --- a/src/realmd +++ b/src/realmd @@ -1 +1 @@ -Subproject commit eed95dd377003c8a414d1684c7f64ca063b7ed1c +Subproject commit 3d46391e769b40f3d1ba170de67ef8d139f67540