yolinlin/azerothcore-wotlk-pbot
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2025-11-29 17:38:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Guild charter should now work as intended."

Browse Source 
This reverts commit 8a307c7b18.

Also applied fix using original code.
This commit is contained in:
talamortis
2018-03-20 08:34:15 +00:00
parent 3cd8da7560
commit 5775da199a
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/server/game/Handlers/PetitionsHandler.cpp
View File

@@ -241,52 +241,49 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket & recvData)
void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData) void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData)
{ {
uint8 signs = 0; #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
sLog->outDebug(LOG_FILTER_NETWORKIO, "Received opcode CMSG_PETITION_SHOW_SIGNATURES");
#endif
uint64 petitionguid; uint64 petitionguid;
recvData >> petitionguid; // petition guid recvData >> petitionguid; // petition guid
// solve (possible) some strange compile problems with explicit use GUID_LOPART(petitionguid) at some GCC versions (wrong code optimization in compiler?) // solve (possible) some strange compile problems with explicit use GUID_LOPART(petitionguid) at some GCC versions (wrong code optimization in compiler?)
uint32 petitionguid_low = GUID_LOPART(petitionguid); uint32 petitionGuidLow = GUID_LOPART(petitionguid);
QueryResult result = CharacterDatabase.PQuery("SELECT type FROM petition WHERE petitionguid = '%u'", petitionguid_low); Petition const* petition = sPetitionMgr->GetPetition(petitionGuidLow);
if (!petition)
if (!result)
return; return;
uint32 type = petition->petitionType;
Field* fields = result->Fetch();
uint32 type = fields[0].GetUInt32();
// if guild petition and has guild => error, return; // if guild petition and has guild => error, return;
if (type == GUILD_CHARTER_TYPE && _player->GetGuildId()) if (type == GUILD_CHARTER_TYPE && _player->GetGuildId())
return; return;
result = CharacterDatabase.PQuery("SELECT playerguid FROM petition_sign WHERE petitionguid = '%u'", petitionguid_low); Signatures const* signatures = sPetitionMgr->GetSignature(petitionGuidLow);
uint8 signs = signatures ? signatures->signatureMap.size() : 0;
// result == NULL also correct in case no sign yet #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
if (result) sLog->outDebug(LOG_FILTER_NETWORKIO, "CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionGuidLow);
signs = result->GetRowCount(); #endif
WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8 + 8 + 4 + 1 + signs * 12)); WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+1+signs*12));
data << petitionguid; // petition guid data << uint64(petitionguid); // petition guid
data << _player->GetGUID(); // owner guid data << uint64(_player->GetGUID()); // owner guid
data << petitionguid_low; // guild guid data << uint32(petitionGuidLow); // guild guid
data << signs; // sign's count data << uint8(signs); // sign's count
for (uint8 i = 1; i <= signs; ++i) if (signs)
{ for (SignatureMap::const_iterator itr = signatures->signatureMap.begin(); itr != signatures->signatureMap.end(); ++itr)
Field* fields = result->Fetch(); {
uint64 plguid = fields[0].GetUInt64(); data << uint64(MAKE_NEW_GUID(itr->first, 0, HIGHGUID_PLAYER)); // Player GUID
data << uint32(0); // there 0 ...
}
data << plguid; // Player GUID
data << (uint32)0; // there 0 ...
result->NextRow();
}
SendPacket(&data); SendPacket(&data);
} }
void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recvData) void WorldSession::HandlePetitionQueryOpcode(WorldPacket & recvData)
{ {
#if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS) #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)