diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2015-02-19 17:12:18 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2015-02-19 17:12:18 +0100 |
| commit | 1cb513295bef82b1b4defd9c9a7854010cf5296e (patch) | |
| tree | f26f3913c7c301537ccbaa53caa4266c0dd26cb1 | |
| parent | f9e5f216b7e19128697225c20c7ca24384b14fd9 (diff) | |
| parent | 287165d25466e8b053b054e1b1ccbc5e2d3ac938 (diff) | |
Merge pull request #14179 from Aaron126/6.x
Core/Misc: Correct some wrong integer types in DB query results
| -rw-r--r-- | sql/updates/world/2015_02_19_00_world.sql | 1 | ||||
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/CharacterPackets.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sql/updates/world/2015_02_19_00_world.sql b/sql/updates/world/2015_02_19_00_world.sql new file mode 100644 index 00000000000..56e08c982f2 --- /dev/null +++ b/sql/updates/world/2015_02_19_00_world.sql @@ -0,0 +1 @@ +ALTER TABLE `quest_template` CHANGE COLUMN `RewardXPDifficulty` `RewardXPDifficulty` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardNextQuest`; diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index e9d52a5539d..4932a83d665 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -733,7 +733,7 @@ void AchievementMgr<Guild>::LoadFromDB(PreparedQueryResult achievementResult, Pr { Field* fields = criteriaResult->Fetch(); uint32 id = fields[0].GetUInt32(); - uint32 counter = fields[1].GetUInt32(); + uint64 counter = fields[1].GetUInt64(); time_t date = time_t(fields[2].GetUInt32()); ObjectGuid::LowType guid = fields[3].GetUInt64(); diff --git a/src/server/game/Server/Packets/CharacterPackets.cpp b/src/server/game/Server/Packets/CharacterPackets.cpp index 8b3d92dd1ff..0eabb1ee351 100644 --- a/src/server/game/Server/Packets/CharacterPackets.cpp +++ b/src/server/game/Server/Packets/CharacterPackets.cpp @@ -46,7 +46,7 @@ WorldPackets::Character::EnumCharactersResult::CharacterInfo::CharacterInfo(Fiel PreLoadPosition.y = fields[11].GetFloat(); PreLoadPosition.z = fields[12].GetFloat(); - if (uint32 guildId = fields[13].GetUInt32()) + if (ObjectGuid::LowType guildId = fields[13].GetUInt64()) GuildGuid = ObjectGuid::Create<HighGuid::Guild>(guildId); uint32 playerFlags = fields[14].GetUInt32(); |