diff options
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index fe8f2056785..25d6bc1f889 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -1401,7 +1401,7 @@ template<class T> static uint32 GetInstanceId(T* /*object*/) { return 0xFFFFFFFF; } template<> -static uint32 GetInstanceId(Player* player) { return player->GetInstanceId(); } +uint32 GetInstanceId(Player* player) { return player->GetInstanceId(); } template<class T> bool AchievementMgr<T>::IsCompletedCriteria(AchievementCriteriaEntry const* achievementCriteria, AchievementEntry const* achievement) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e3101c20a15..ed3ae280c5b 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17457,8 +17457,8 @@ bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder) } else { - TC_LOG_ERROR("entities.player", "Player (guidlow %d) have problems with transport guid (%u). Teleport to bind location.", - guid, transLowGUID); + TC_LOG_ERROR("entities.player", "Player (%s) have problems with transport guid (%u). Teleport to bind location.", + guid.ToString().c_str(), transLowGUID); RelocateToHomebind(); } @@ -18290,7 +18290,7 @@ void Player::_LoadVoidStorage(PreparedQueryResult result) std::string name; if (creatorGuid && !sObjectMgr->GetPlayerNameByGUID(creatorGuid, name)) { - TC_LOG_ERROR("entities.player", "Player::_LoadVoidStorage - Player (GUID: %u, name: %s) has an item with an invalid creator guid, set to 0 (item id: " UI64FMTD ", entry: %u, creatorGuid: %u).", GetGUIDLow(), GetName().c_str(), itemId, itemEntry, creatorGuid); + TC_LOG_ERROR("entities.player", "Player::_LoadVoidStorage - Player (GUID: %u, name: %s) has an item with an invalid creator guid, set to 0 (item id: " UI64FMTD ", entry: %u, creator: %s).", GetGUIDLow(), GetName().c_str(), itemId, itemEntry, creatorGuid.ToString().c_str()); creatorGuid.Clear(); } diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 7048fd3ee9d..411b986bc1f 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1796,7 +1796,7 @@ void Guild::HandleInviteMember(WorldSession* session, std::string const& name) ObjectGuid oldGuildGuid; if (uint32 oldId = pInvitee->GetGuildId()) - oldGuildGuid = ObjectGuid(HIGHGUID_GUILD, pInvitee->GetGuildId()); + oldGuildGuid = ObjectGuid(HIGHGUID_GUILD, oldId); ObjectGuid newGuildGuid = GetGUID(); |