diff options
| author | Warpten <vertozor@gmail.com> | 2013-01-01 22:26:15 +0100 |
|---|---|---|
| committer | Warpten <vertozor@gmail.com> | 2013-01-01 22:27:26 +0100 |
| commit | 2fa39727070995003ab3833004fc2c3ec469bde6 (patch) | |
| tree | 83c36c499eaaf69e13938d9e4f09b6c819266cbc | |
| parent | 312e8509dddf910a5ab199d646c5a4d237d5fda9 (diff) | |
Core/Guilds: Fixed a possible crash on guild invite.
Closes #8699
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/PetitionsHandler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 3057a97eb27..9d7592db138 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2650,7 +2650,7 @@ bool Guild::AddMember(uint64 guid, uint8 rankId) _UpdateAccountsNumber(); _LogEvent(GUILD_EVENT_LOG_JOIN_GUILD, lowguid); _BroadcastEvent(GE_JOINED, guid, name.c_str()); - sGuildFinderMgr->RemoveMembershipRequest(player->GetGUIDLow(), GUID_LOPART(this->GetGUID())); + sGuildFinderMgr->RemoveMembershipRequest(lowguid, GUID_LOPART(GetGUID())); // Call scripts if member was succesfully added (and stored to database) sScriptMgr->OnGuildAddMember(this, player, rankId); diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 9b7338f1104..e301f7eb18d 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -775,7 +775,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) if (_player->GetGuildId()) { data.Initialize(SMSG_TURN_IN_PETITION_RESULTS, 4); - data << (uint32)PETITION_TURN_ALREADY_IN_GUILD; + data << uint32(PETITION_TURN_ALREADY_IN_GUILD); _player->GetSession()->SendPacket(&data); return; } |