From b083a07dfad4d73eaf1f7e70fdf20cacd1147e98 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Sat, 4 Feb 2017 02:36:43 +0100 Subject: [PATCH] missing parts --- src/server/game/Entities/Player/Player.cpp | 7 +------ src/server/game/Handlers/CharacterHandler.cpp | 2 +- src/server/game/Server/WorldSession.cpp | 2 +- src/server/game/Server/WorldSession.h | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 46e5705fe2..6383ca1047 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -7299,6 +7299,7 @@ void Player::SetInGuild(uint32 guildId) ApplyModFlag(PLAYER_FLAGS, PLAYER_FLAGS_GUILD_LEVEL_ENABLED, guildId != 0 && sWorld->getBoolConfig(CONFIG_GUILD_LEVELING_ENABLED)); SetUInt16Value(OBJECT_FIELD_TYPE, 1, guildId != 0); + sWorld->UpdateCharacterGuildId(GetGUID(), guildId); } ObjectGuid::LowType Player::GetGuildIdFromCharacterInfo(ObjectGuid guid) @@ -27279,12 +27280,6 @@ std::string Player::GetCoordsMapAreaAndZoneString() const return str.str(); } -void Player::SetInGuild(uint32 guildId) -{ - SetUInt32Value(PLAYER_GUILDID, guildId); - sWorld->UpdateCharacterGuildId(GetGUID(), guildId); -} - Guild* Player::GetGuild() { uint32 guildId = GetGuildId(); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index e5de4850e2..f0ab07c35f 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -457,7 +457,7 @@ void WorldSession::HandleCharCreateOpcode(WorldPacket& recvData) PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_SUM_CHARS); stmt->setUInt32(0, GetAccountId()); - queryCallback.SetNextQuery(CharacterDatabase.AsyncQuery(stmt));. + queryCallback.SetNextQuery(CharacterDatabase.AsyncQuery(stmt)); }) .WithChainingPreparedCallback([this, createInfo](QueryCallback& queryCallback, PreparedQueryResult result) { diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 691730ab61..9e5c9e2c90 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -208,7 +208,7 @@ ObjectGuid::LowType WorldSession::GetGUIDLow() const } /// Send a packet to the client -void WorldSession::SendPacket(WorldPacket* packet, bool forced /*= false*/) +void WorldSession::SendPacket(WorldPacket const* packet, bool forced /*= false*/) { if (!m_Socket) return; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 47d5e0ec08..1c53bdc105 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -292,7 +292,7 @@ class TC_GAME_API WorldSession void SendAddonsInfo(); bool IsAddonRegistered(const std::string& prefix) const; - void SendPacket(WorldPacket* packet, bool forced = false); + void SendPacket(WorldPacket const* packet, bool forced = false); void SendNotification(const char *format, ...) ATTR_PRINTF(2, 3); void SendNotification(uint32 string_id, ...); void SendPetNameInvalid(uint32 error, std::string const& name, DeclinedName *declinedName);