From e5f3de026f982d555a282e5f7f5cd31f227593e4 Mon Sep 17 00:00:00 2001 From: xinef1 Date: Thu, 27 Apr 2017 07:02:33 +0200 Subject: [PATCH] Core/Misc: implemented petition manager (#19010) - Implemented manager for petitions to perform all petition related tasks and synchronize data with database. - This kills ugly synchronous querys on packet handlers (cherry picked from commit a4aa95a5a39d75b9e38fe03aac57ceb7d9bba90f) --- src/server/game/Battlegrounds/ArenaTeam.cpp | 2 +- src/server/game/Entities/Player/Player.cpp | 77 +--- src/server/game/Entities/Player/Player.h | 2 +- src/server/game/Guilds/Guild.h | 21 -- src/server/game/Handlers/PetitionsHandler.cpp | 354 +++++------------- src/server/game/Miscellaneous/SharedDefines.h | 11 + src/server/game/Petitions/PetitionMgr.cpp | 265 +++++++++++++ src/server/game/Petitions/PetitionMgr.h | 89 +++++ src/server/game/Server/WorldSession.h | 10 +- src/server/game/World/World.cpp | 7 + 10 files changed, 470 insertions(+), 368 deletions(-) create mode 100644 src/server/game/Petitions/PetitionMgr.cpp create mode 100644 src/server/game/Petitions/PetitionMgr.h diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 634d45c643..4059faa8f8 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -145,7 +145,7 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid) // Remove all player signatures from other petitions // This will prevent player from joining too many arena teams and corrupt arena team data integrity - Player::RemovePetitionsAndSigns(playerGuid, GetType()); + Player::RemovePetitionsAndSigns(playerGuid, static_cast(GetType())); // Feed data to the struct ArenaTeamMember newMember; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index bd6d854686..ffd1e9cd94 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -83,6 +83,7 @@ #include "OutdoorPvP.h" #include "OutdoorPvPMgr.h" #include "Pet.h" +#include "PetitionMgr.h" #include "PhasingHandler.h" #include "PoolMgr.h" #include "QueryCallback.h" @@ -3686,7 +3687,7 @@ void Player::DeleteFromDB(ObjectGuid playerguid, uint32 accountId, bool updateRe RemoveFromGroup(group, playerguid); // Remove signs from petitions (also remove petitions if owner); - RemovePetitionsAndSigns(playerguid, 10); + RemovePetitionsAndSigns(playerguid, CHARTER_TYPE_ANY); switch (charDelete_method) { @@ -21713,78 +21714,10 @@ void Player::SendProficiency(ItemClass itemClass, uint32 itemSubclassMask) const SendDirectMessage(packet.Write()); } -void Player::RemovePetitionsAndSigns(ObjectGuid guid, uint32 type) +void Player::RemovePetitionsAndSigns(ObjectGuid guid, CharterTypes type) { - CharacterDatabasePreparedStatement* stmt; - - if (type == 10) - stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIG_BY_GUID); - else - { - stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIG_BY_GUID_TYPE); - stmt->setUInt8(1, uint8(type)); - } - - stmt->setUInt32(0, guid.GetCounter()); - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (result) - { - do // this part effectively does nothing, since the deletion / modification only takes place _after_ the PetitionQuery. Though I don't know if the result remains intact if I execute the delete query beforehand. - { // and SendPetitionQueryOpcode reads data from the DB - Field* fields = result->Fetch(); - ObjectGuid ownerguid = ObjectGuid(HighGuid::Player, fields[0].GetUInt32()); - ObjectGuid petitionguid = ObjectGuid(HighGuid::Item, fields[1].GetUInt32()); - - // send update if charter owner in game - Player* owner = ObjectAccessor::FindConnectedPlayer(ownerguid); - if (owner) - owner->GetSession()->SendPetitionQueryOpcode(petitionguid); - } while (result->NextRow()); - - if (type == 10) - { - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ALL_PETITION_SIGNATURES); - - stmt->setUInt32(0, guid.GetCounter()); - - CharacterDatabase.Execute(stmt); - } - else - { - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE); - - stmt->setUInt32(0, guid.GetCounter()); - stmt->setUInt8(1, uint8(type)); - - CharacterDatabase.Execute(stmt); - } - } - - CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); - if (type == 10) - { - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_BY_OWNER); - stmt->setUInt32(0, guid.GetCounter()); - trans->Append(stmt); - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE_BY_OWNER); - stmt->setUInt32(0, guid.GetCounter()); - trans->Append(stmt); - } - else - { - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_BY_OWNER_AND_TYPE); - stmt->setUInt32(0, guid.GetCounter()); - stmt->setUInt8(1, uint8(type)); - trans->Append(stmt); - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE_BY_OWNER_AND_TYPE); - stmt->setUInt32(0, guid.GetCounter()); - stmt->setUInt8(1, uint8(type)); - trans->Append(stmt); - } - CharacterDatabase.CommitTransaction(trans); + sPetitionMgr->RemoveSignaturesBySignerAndType(guid, type); + sPetitionMgr->RemovePetitionsByOwnerAndType(guid, type); } void Player::LeaveAllArenaTeams(ObjectGuid guid) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index db67cc48d4..ad087bbd05 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1736,7 +1736,7 @@ class TC_GAME_API Player : public Unit, public GridObject uint32 GetGuildId() const { return GetUInt32Value(OBJECT_FIELD_DATA); /* return only lower part */ } Guild* GetGuild(); int GetGuildIdInvited() const { return m_GuildIdInvited; } - static void RemovePetitionsAndSigns(ObjectGuid guid, uint32 type); + static void RemovePetitionsAndSigns(ObjectGuid guid, CharterTypes type); // Arena Team void SetInArenaTeam(uint32 ArenaTeamId, uint8 slot, uint8 type); diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 46033366c1..96733ecdde 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -198,27 +198,6 @@ enum GuildEvents GE_SIGNED_Off_MOBILE = 26, }; -enum PetitionTurns -{ - PETITION_TURN_OK = 0, - PETITION_TURN_ALREADY_IN_GUILD = 2, - PETITION_TURN_NEED_MORE_SIGNATURES = 4, - PETITION_TURN_GUILD_PERMISSIONS = 11, - PETITION_TURN_GUILD_NAME_INVALID = 12 -}; - -enum PetitionSigns -{ - PETITION_SIGN_OK = 0, - PETITION_SIGN_ALREADY_SIGNED = 1, - PETITION_SIGN_ALREADY_IN_GUILD = 2, - PETITION_SIGN_CANT_SIGN_OWN = 3, - PETITION_SIGN_NOT_SERVER = 4, - PETITION_SIGN_FULL = 5, - PETITION_SIGN_ALREADY_SIGNED_OTHER = 6, - PETITION_SIGN_RESTRICTED_ACCOUNT = 7 -}; - enum GuildBankRights { GUILD_BANK_RIGHT_VIEW_TAB = 0x01, diff --git a/src/server/game/Handlers/PetitionsHandler.cpp b/src/server/game/Handlers/PetitionsHandler.cpp index 70912d6841..83957210d6 100644 --- a/src/server/game/Handlers/PetitionsHandler.cpp +++ b/src/server/game/Handlers/PetitionsHandler.cpp @@ -29,6 +29,7 @@ #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" +#include "PetitionMgr.h" #include "Player.h" #include "SpellAuraDefines.h" #include "World.h" @@ -92,7 +93,7 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) uint32 charterid = 0; uint32 cost = 0; - uint32 type = 0; + CharterTypes type = CHARTER_TYPE_NONE; if (creature->IsTabardDesigner()) { // if tabard designer, then trying to buy a guild charter. @@ -205,98 +206,57 @@ void WorldSession::HandlePetitionBuyOpcode(WorldPacket& recvData) // a petition is invalid, if both the owner and the type matches // we checked above, if this player is in an arenateam, so this must be // datacorruption - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_BY_OWNER); - stmt->setUInt32(0, _player->GetGUID().GetCounter()); - stmt->setUInt8(1, type); - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - std::ostringstream ssInvalidPetitionGUIDs; - - if (result) + CharacterDatabase.EscapeString(name); + if (Petition const* petition = sPetitionMgr->GetPetitionByOwnerWithType(_player->GetGUID(), type)) { - do - { - Field* fields = result->Fetch(); - ssInvalidPetitionGUIDs << '\'' << fields[0].GetUInt32() << "', "; - } while (result->NextRow()); + // clear from petition store + sPetitionMgr->RemovePetition(petition->petitionGuid); + TC_LOG_DEBUG("network", "Invalid petition GUID: %u", petition->petitionGuid.GetCounter()); } - // delete petitions with the same guid as this one - ssInvalidPetitionGUIDs << '\'' << charter->GetGUID().GetCounter() << '\''; - - TC_LOG_DEBUG("network", "Invalid petition GUIDs: %s", ssInvalidPetitionGUIDs.str().c_str()); - CharacterDatabase.EscapeString(name); - CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); - trans->PAppend("DELETE FROM petition WHERE petitionguid IN (%s)", ssInvalidPetitionGUIDs.str().c_str()); - trans->PAppend("DELETE FROM petition_sign WHERE petitionguid IN (%s)", ssInvalidPetitionGUIDs.str().c_str()); - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PETITION); - stmt->setUInt32(0, _player->GetGUID().GetCounter()); - stmt->setUInt32(1, charter->GetGUID().GetCounter()); - stmt->setString(2, name); - stmt->setUInt8(3, uint8(type)); - trans->Append(stmt); - - CharacterDatabase.CommitTransaction(trans); + // fill petition store + sPetitionMgr->AddPetition(charter->GetGUID(), _player->GetGUID(), name, type, false); } void WorldSession::HandlePetitionShowSignOpcode(WorldPacket& recvData) { TC_LOG_DEBUG("network", "Received opcode CMSG_PETITION_SHOW_SIGNATURES"); - uint8 signs = 0; - ObjectGuid petitionguid; - recvData >> petitionguid; // petition guid + ObjectGuid petitionGuid; + recvData >> petitionGuid; // petition guid - ObjectGuid::LowType petitionGuidLow = petitionguid.GetCounter(); - - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_TYPE); - - stmt->setUInt32(0, petitionGuidLow); - - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (!result) + Petition const* petition = sPetitionMgr->GetPetition(petitionGuid); + if (!petition) { - TC_LOG_DEBUG("entities.player.items", "Petition %s is not found for player %u %s", petitionguid.ToString().c_str(), GetPlayer()->GetGUID().GetCounter(), GetPlayer()->GetName().c_str()); + TC_LOG_DEBUG("entities.player.items", "Petition %s is not found for player %u %s", petitionGuid.ToString().c_str(), GetPlayer()->GetGUID().GetCounter(), GetPlayer()->GetName().c_str()); return; } - Field* fields = result->Fetch(); - uint32 type = fields[0].GetUInt8(); // if guild petition and has guild => error, return; - if (type == GUILD_CHARTER_TYPE && _player->GetGuildId()) + if (petition->petitionType == GUILD_CHARTER_TYPE && _player->GetGuildId()) return; - stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIGNATURE); + TC_LOG_DEBUG("network", "CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionGuid.GetCounter()); - stmt->setUInt32(0, petitionGuidLow); + SendPetitionSigns(petition, _player); +} - result = CharacterDatabase.Query(stmt); +void WorldSession::SendPetitionSigns(Petition const* petition, Player* sendTo) +{ + SignaturesVector const& signatures = petition->signatures; + WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8 + 8 + 4 + 1 + signatures.size() * 12)); + data << uint64(petition->petitionGuid); // petition guid + data << uint64(petition->ownerGuid); // owner guid + data << uint32(petition->petitionGuid.GetCounter()); // guild guid + data << uint8(signatures.size()); // sign's count - // result == nullptr also correct in case no sign yet - if (result) - signs = uint8(result->GetRowCount()); - - TC_LOG_DEBUG("network", "CMSG_PETITION_SHOW_SIGNATURES petition entry: '%u'", petitionGuidLow); - - WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+1+signs*12)); - data << uint64(petitionguid); // petition guid - data << uint64(_player->GetGUID()); // owner guid - data << uint32(petitionGuidLow); // guild guid - data << uint8(signs); // sign's count - - for (uint8 i = 1; i <= signs; ++i) + for (Signature const& signature : signatures) { - Field* fields2 = result->Fetch(); - ObjectGuid::LowType lowGuid = fields2[0].GetUInt32(); - - data << ObjectGuid(HighGuid::Player, 0, lowGuid); // Player GUID - data << uint32(0); // there 0 ... - - result->NextRow(); + data << signature.second; // Player GUID + data << uint32(0); // there 0 ... } - SendPacket(&data); + + sendTo->GetSession()->SendPacket(&data); } void WorldSession::HandlePetitionQueryOpcode(WorldPacket& recvData) @@ -314,34 +274,20 @@ void WorldSession::HandlePetitionQueryOpcode(WorldPacket& recvData) void WorldSession::SendPetitionQueryOpcode(ObjectGuid petitionguid) { - ObjectGuid ownerguid; - uint32 type; - std::string name = "NO_NAME_FOR_GUID"; - - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION); - - stmt->setUInt32(0, petitionguid.GetCounter()); - - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (result) - { - Field* fields = result->Fetch(); - ownerguid = ObjectGuid(HighGuid::Player, fields[0].GetUInt32()); - name = fields[1].GetString(); - type = fields[2].GetUInt8(); - } - else + Petition const* petition = sPetitionMgr->GetPetition(petitionguid); + if (!petition) { TC_LOG_DEBUG("network", "CMSG_PETITION_QUERY failed for petition (%s)", petitionguid.ToString().c_str()); return; } - WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4+8+name.size()+1+1+4*12+2+10)); + WorldPacket data(SMSG_PETITION_QUERY_RESPONSE, (4 + 8 + petition->petitionName.size() + 1 + 1 + 4 * 12 + 2 + 10)); data << uint32(petitionguid.GetCounter()); // guild/team guid (in Trinity always same as GUID_LOPART(petition guid) - data << uint64(ownerguid); // charter owner guid - data << name; // name (guild/arena team) + data << uint64(petition->ownerGuid); // charter owner guid + data << petition->petitionName; // name (guild/arena team) data << uint8(0); // some string + + CharterTypes type = petition->petitionType; if (type == GUILD_CHARTER_TYPE) { uint32 needed = sWorld->getIntConfig(CONFIG_MIN_PETITION_SIGNS); @@ -379,7 +325,6 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "Received opcode MSG_PETITION_RENAME"); ObjectGuid petitionGuid; - uint32 type; std::string newName; recvData >> petitionGuid; // guid @@ -389,23 +334,14 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket& recvData) if (!item) return; - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_TYPE); - - stmt->setUInt32(0, petitionGuid.GetCounter()); - - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (result) - { - Field* fields = result->Fetch(); - type = fields[0].GetUInt8(); - } - else + Petition* petition = sPetitionMgr->GetPetition(petitionGuid); + if (!petition) { TC_LOG_DEBUG("network", "CMSG_PETITION_QUERY failed for petition %s", petitionGuid.ToString().c_str()); return; } + CharterTypes type = petition->petitionType; if (type == GUILD_CHARTER_TYPE) { if (sGuildMgr->GetGuildByName(newName)) @@ -433,12 +369,10 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket& recvData) } } - stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_PETITION_NAME); + CharacterDatabase.EscapeString(newName); - stmt->setString(0, newName); - stmt->setUInt32(1, petitionGuid.GetCounter()); - - CharacterDatabase.Execute(stmt); + // update petition storage + petition->UpdateName(newName); TC_LOG_DEBUG("network", "Petition %s renamed to '%s'", petitionGuid.ToString().c_str(), newName.c_str()); WorldPacket data(MSG_PETITION_RENAME, (8+newName.size()+1)); @@ -451,32 +385,24 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) { TC_LOG_DEBUG("network", "Received opcode CMSG_PETITION_SIGN"); // ok - Field* fields; ObjectGuid petitionGuid; uint8 unk; recvData >> petitionGuid; // petition guid recvData >> unk; - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIGNATURES); - - stmt->setUInt32(0, petitionGuid.GetCounter()); - stmt->setUInt32(1, petitionGuid.GetCounter()); - - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (!result) + Petition* petition = sPetitionMgr->GetPetition(petitionGuid); + if (!petition) { TC_LOG_ERROR("network", "Petition %s is not found for player %u %s", petitionGuid.ToString().c_str(), GetPlayer()->GetGUID().GetCounter(), GetPlayer()->GetName().c_str()); return; } - fields = result->Fetch(); - ObjectGuid ownerGuid(HighGuid::Player, fields[0].GetUInt32()); - uint64 signs = fields[1].GetUInt64(); - uint8 type = fields[2].GetUInt8(); + ObjectGuid ownerGuid = petition->ownerGuid; + CharterTypes type = petition->petitionType; + uint8 signs = petition->signatures.size(); - ObjectGuid::LowType playerGuid = _player->GetGUID().GetCounter(); - if (ownerGuid == _player->GetGUID()) + ObjectGuid playerGuid = _player->GetGUID(); + if (ownerGuid == playerGuid) return; // not let enemies sign guild charter @@ -497,7 +423,7 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) return; } - uint8 slot = ArenaTeam::GetSlotByType(type); + uint8 slot = ArenaTeam::GetSlotByType(static_cast(type)); if (slot >= MAX_ARENA_SLOT) return; @@ -527,19 +453,13 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) } } - if (++signs > type) // client signs maximum + if (++signs > static_cast(type)) // client signs maximum return; // Client doesn't allow to sign petition two times by one character, but not check sign by another character from same account // not allow sign another player from already sign player account - stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIG_BY_ACCOUNT); - - stmt->setUInt32(0, GetAccountId()); - stmt->setUInt32(1, petitionGuid.GetCounter()); - - result = CharacterDatabase.Query(stmt); - - if (result) + bool isSigned = petition->IsPetitionSignedByAccount(GetAccountId()); + if (isSigned) { WorldPacket data(SMSG_PETITION_SIGN_RESULTS, (8+8+4)); data << uint64(petitionGuid); @@ -551,30 +471,18 @@ void WorldSession::HandlePetitionSignOpcode(WorldPacket& recvData) return; } - stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PETITION_SIGNATURE); + // fill petition store + petition->AddSignature(petitionGuid, GetAccountId(), playerGuid, false); - stmt->setUInt32(0, ownerGuid.GetCounter()); - stmt->setUInt32(1, petitionGuid.GetCounter()); - stmt->setUInt32(2, playerGuid); - stmt->setUInt32(3, GetAccountId()); - - CharacterDatabase.Execute(stmt); - - TC_LOG_DEBUG("network", "PETITION SIGN: %s by player: %s (GUID: %u Account: %u)", petitionGuid.ToString().c_str(), _player->GetName().c_str(), playerGuid, GetAccountId()); + TC_LOG_DEBUG("network", "PETITION SIGN: %s by player: %s (GUID: %u Account: %u)", petitionGuid.ToString().c_str(), _player->GetName().c_str(), playerGuid.GetCounter(), GetAccountId()); WorldPacket data(SMSG_PETITION_SIGN_RESULTS, (8+8+4)); data << uint64(petitionGuid); data << uint64(_player->GetGUID()); data << uint32(PETITION_SIGN_OK); - // close at signer side SendPacket(&data); - // update signs count on charter, required testing... - //Item* item = _player->GetItemByGuid(petitionguid)); - //if (item) - // item->SetUInt32Value(ITEM_FIELD_ENCHANTMENT_1_1+1, signs); - // update for owner if online if (Player* owner = ObjectAccessor::FindConnectedPlayer(ownerGuid)) owner->SendDirectMessage(&data); @@ -588,20 +496,12 @@ void WorldSession::HandlePetitionDeclineOpcode(WorldPacket& recvData) recvData >> petitionguid; // petition guid TC_LOG_DEBUG("network", "Petition %s declined by %u", petitionguid.ToString().c_str(), _player->GetGUID().GetCounter()); - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_OWNER_BY_GUID); - - stmt->setUInt32(0, petitionguid.GetCounter()); - - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (!result) + Petition const* petition = sPetitionMgr->GetPetition(petitionguid); + if (!petition) return; - Field* fields = result->Fetch(); - ObjectGuid ownerguid(HighGuid::Player, 0, fields[0].GetUInt32()); - - Player* owner = ObjectAccessor::FindConnectedPlayer(ownerguid); - if (owner) // petition owner online + // petition owner online + if (Player* owner = ObjectAccessor::FindConnectedPlayer(petition->ownerGuid)) { WorldPacket data(MSG_PETITION_DECLINE, 8); data << uint64(_player->GetGUID()); @@ -613,31 +513,23 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) { TC_LOG_DEBUG("network", "Received opcode CMSG_OFFER_PETITION"); // ok - uint8 signs = 0; - ObjectGuid petitionguid, plguid; - uint32 type, junk; - Player* player; + ObjectGuid petitionGuid, offererGuid; + uint32 junk; recvData >> junk; // this is not petition type! - recvData >> petitionguid; // petition guid - recvData >> plguid; // player guid + recvData >> petitionGuid; // petition guid + recvData >> offererGuid; // player guid - player = ObjectAccessor::FindConnectedPlayer(plguid); + Player* player = ObjectAccessor::FindConnectedPlayer(offererGuid); if (!player) return; - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_TYPE); - - stmt->setUInt32(0, petitionguid.GetCounter()); - - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (!result) + Petition const* petition = sPetitionMgr->GetPetition(petitionGuid); + if (!petition) return; - Field* fields = result->Fetch(); - type = fields[0].GetUInt8(); + CharterTypes type = petition->petitionType; - TC_LOG_DEBUG("network", "OFFER PETITION: type %u, %s, to %s", type, petitionguid.ToString().c_str(), plguid.ToString().c_str()); + TC_LOG_DEBUG("network", "OFFER PETITION: type %u, %s, to %s", static_cast(type), petitionGuid.ToString().c_str(), offererGuid.ToString().c_str()); if (!sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GUILD) && GetPlayer()->GetTeam() != player->GetTeam()) { @@ -657,7 +549,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) return; } - uint8 slot = ArenaTeam::GetSlotByType(type); + uint8 slot = ArenaTeam::GetSlotByType(static_cast(type)); if (slot >= MAX_ARENA_SLOT) return; @@ -689,33 +581,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recvData) } } - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIGNATURE); - - stmt->setUInt32(0, petitionguid.GetCounter()); - - result = CharacterDatabase.Query(stmt); - - // result == nullptr also correct charter without signs - if (result) - signs = uint8(result->GetRowCount()); - - WorldPacket data(SMSG_PETITION_SHOW_SIGNATURES, (8+8+4+signs+signs*12)); - data << uint64(petitionguid); // petition guid - data << uint64(_player->GetGUID()); // owner guid - data << uint32(petitionguid.GetCounter()); // guild guid - data << uint8(signs); // sign's count - - for (uint8 i = 1; i <= signs; ++i) - { - Field* fields2 = result->Fetch(); - data << uint64(ObjectGuid(HighGuid::Player, fields2[0].GetUInt32())); // Player GUID - data << uint32(0); // there 0 ... - - result->NextRow(); - } - - player->SendDirectMessage(&data); + SendPetitionSigns(petition, player); } void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) @@ -735,30 +601,18 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "Petition %s turned in by %u", petitionGuid.ToString().c_str(), _player->GetGUID().GetCounter()); - // Get petition data from db - ObjectGuid::LowType ownerguidlo; - uint32 type; - std::string name; - - CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION); - stmt->setUInt32(0, petitionGuid.GetCounter()); - PreparedQueryResult result = CharacterDatabase.Query(stmt); - - if (result) - { - Field* fields = result->Fetch(); - ownerguidlo = fields[0].GetUInt32(); - name = fields[1].GetString(); - type = fields[2].GetUInt8(); - } - else + Petition const* petition = sPetitionMgr->GetPetition(petitionGuid); + if (!petition) { TC_LOG_ERROR("entities.player.cheat", "Player %s (guid: %u) tried to turn in petition (%s) that is not present in the database", _player->GetName().c_str(), _player->GetGUID().GetCounter(), petitionGuid.ToString().c_str()); return; } + CharterTypes type = petition->petitionType; + std::string const name = petition->petitionName; // we need a copy, it will be removed on guild/arena remove + // Only the petition owner can turn in the petition - if (_player->GetGUID().GetCounter() != ownerguidlo) + if (_player->GetGUID() != petition->ownerGuid) return; // Petition type (guild/arena) specific checks @@ -783,7 +637,7 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) else { // Check for valid arena bracket (2v2, 3v3, 5v5) - uint8 slot = ArenaTeam::GetSlotByType(type); + uint8 slot = ArenaTeam::GetSlotByType(static_cast(type)); if (slot >= MAX_ARENA_SLOT) return; @@ -802,26 +656,13 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) } } - // Get petition signatures from db - uint8 signatures; - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_PETITION_SIGNATURE); - stmt->setUInt32(0, petitionGuid.GetCounter()); - result = CharacterDatabase.Query(stmt); - - if (result) - signatures = uint8(result->GetRowCount()); - else - signatures = 0; - - uint32 requiredSignatures; + SignaturesVector const signatures = petition->signatures; // we need a copy, it will be removed on guild/arena remove + uint32 requiredSignatures = static_cast(type) - 1; if (type == GUILD_CHARTER_TYPE) requiredSignatures = sWorld->getIntConfig(CONFIG_MIN_PETITION_SIGNS); - else - requiredSignatures = type-1; // Notify player if signatures are missing - if (signatures < requiredSignatures) + if (signatures.size() < requiredSignatures) { data.Initialize(SMSG_TURN_IN_PETITION_RESULTS, 4); data << (uint32)PETITION_TURN_NEED_MORE_SIGNATURES; @@ -854,12 +695,8 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); // Add members from signatures - for (uint8 i = 0; i < signatures; ++i) - { - Field* fields = result->Fetch(); - guild->AddMember(trans, ObjectGuid(HighGuid::Player, fields[0].GetUInt32())); - result->NextRow(); - } + for (Signature const& signature : signatures) + guild->AddMember(trans, signature.second); CharacterDatabase.CommitTransaction(trans); } @@ -884,27 +721,14 @@ void WorldSession::HandleTurnInPetitionOpcode(WorldPacket& recvData) TC_LOG_DEBUG("network", "PetitonsHandler: Arena team (guid: %u) added to ObjectMgr", arenaTeam->GetId()); // Add members - for (uint8 i = 0; i < signatures; ++i) + for (Signature const& signature : signatures) { - Field* fields = result->Fetch(); - ObjectGuid memberGUID(HighGuid::Player, fields[0].GetUInt32()); - TC_LOG_DEBUG("network", "PetitionsHandler: Adding arena team (guid: %u) member %s", arenaTeam->GetId(), memberGUID.ToString().c_str()); - arenaTeam->AddMember(memberGUID); - result->NextRow(); + TC_LOG_DEBUG("network", "PetitionsHandler: Adding arena team (guid: %u) member %s", arenaTeam->GetId(), signature.second.ToString().c_str()); + arenaTeam->AddMember(signature.second); } } - CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_BY_GUID); - stmt->setUInt32(0, petitionGuid.GetCounter()); - trans->Append(stmt); - - stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE_BY_GUID); - stmt->setUInt32(0, petitionGuid.GetCounter()); - trans->Append(stmt); - - CharacterDatabase.CommitTransaction(trans); + sPetitionMgr->RemovePetition(petitionGuid); // created TC_LOG_DEBUG("network", "Player %s (%s) turning in petition %s", _player->GetName().c_str(), _player->GetGUID().ToString().c_str(), petitionGuid.ToString().c_str()); diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 20c394faf4..63e3b06458 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -4294,6 +4294,17 @@ enum WeaponAttackType : uint8 MAX_ATTACK }; +enum CharterTypes +{ + CHARTER_TYPE_NONE = 0, + CHARTER_TYPE_ANY = 10, + + GUILD_CHARTER_TYPE = 9, + ARENA_TEAM_CHARTER_2v2_TYPE = 2, + ARENA_TEAM_CHARTER_3v3_TYPE = 3, + ARENA_TEAM_CHARTER_5v5_TYPE = 5 +}; + enum LineOfSightChecks { LINEOFSIGHT_CHECK_VMAP = 0x1, // check static floor layout data diff --git a/src/server/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp new file mode 100644 index 0000000000..8e7656a847 --- /dev/null +++ b/src/server/game/Petitions/PetitionMgr.cpp @@ -0,0 +1,265 @@ +/* +* Copyright (C) 2008-2017 TrinityCore +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see . +*/ + +#include "PetitionMgr.h" +#include "DatabaseEnv.h" +#include "Log.h" +#include "ObjectAccessor.h" +#include "ObjectMgr.h" +#include "Player.h" +#include "Timer.h" +#include "WorldSession.h" + +#include + +namespace +{ + std::unordered_map _petitionStore; +} + +PetitionMgr* PetitionMgr::instance() +{ + static PetitionMgr instance; + return &instance; +} + +void PetitionMgr::LoadPetitions() +{ + uint32 oldMSTime = getMSTime(); + _petitionStore.clear(); + + QueryResult result = CharacterDatabase.Query("SELECT petitionguid, ownerguid, name, type FROM petition"); + if (!result) + { + TC_LOG_INFO("server.loading", ">> Loaded 0 petitions."); + return; + } + + uint32 count = 0; + do + { + Field* fields = result->Fetch(); + AddPetition(ObjectGuid::Create(fields[0].GetUInt32()), ObjectGuid::Create(fields[1].GetUInt32()), fields[2].GetString(), static_cast(fields[3].GetUInt8()), true); + ++count; + } while (result->NextRow()); + + TC_LOG_INFO("server.loading", ">> Loaded %u petitions in: %u ms.", count, GetMSTimeDiffToNow(oldMSTime)); +} + +void PetitionMgr::LoadSignatures() +{ + uint32 oldMSTime = getMSTime(); + + QueryResult result = CharacterDatabase.Query("SELECT petitionguid, player_account, playerguid FROM petition_sign"); + if (!result) + { + TC_LOG_INFO("server.loading", ">> Loaded 0 Petition signs!"); + return; + } + + uint32 count = 0; + do + { + Field* fields = result->Fetch(); + + Petition* petition = GetPetition(ObjectGuid::Create(fields[0].GetUInt32())); + if (!petition) + continue; + + petition->AddSignature(petition->petitionGuid, fields[1].GetUInt32(), ObjectGuid::Create(fields[2].GetUInt32()), true); + ++count; + } while (result->NextRow()); + + TC_LOG_INFO("server.loading", ">> Loaded %u Petition signs in %u ms.", count, GetMSTimeDiffToNow(oldMSTime)); +} + +void PetitionMgr::AddPetition(ObjectGuid petitionGuid, ObjectGuid ownerGuid, std::string const& name, CharterTypes type, bool isLoading) +{ + Petition& p = _petitionStore[petitionGuid]; + p.petitionGuid = petitionGuid; + p.ownerGuid = ownerGuid; + p.petitionName = name; + p.petitionType = type; + p.signatures.clear(); + + if (isLoading) + return; + + CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PETITION); + stmt->setUInt32(0, ownerGuid.GetCounter()); + stmt->setUInt32(1, petitionGuid.GetCounter()); + stmt->setString(2, name); + stmt->setUInt8(3, uint8(type)); + CharacterDatabase.Execute(stmt); +} + +void PetitionMgr::RemovePetition(ObjectGuid petitionGuid) +{ + _petitionStore.erase(petitionGuid); + + // Delete From DB + CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); + + CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_BY_GUID); + stmt->setUInt32(0, petitionGuid.GetCounter()); + trans->Append(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE_BY_GUID); + stmt->setUInt32(0, petitionGuid.GetCounter()); + trans->Append(stmt); + + CharacterDatabase.CommitTransaction(trans); +} + +Petition* PetitionMgr::GetPetition(ObjectGuid petitionGuid) +{ + auto itr = _petitionStore.find(petitionGuid); + if (itr != _petitionStore.end()) + return &itr->second; + + return nullptr; +} + +Petition* PetitionMgr::GetPetitionByOwnerWithType(ObjectGuid ownerGuid, CharterTypes type) +{ + for (auto& petitionPair : _petitionStore) + if (petitionPair.second.ownerGuid == ownerGuid && petitionPair.second.petitionType == type) + return &petitionPair.second; + + return nullptr; +} + +void PetitionMgr::RemovePetitionsByOwnerAndType(ObjectGuid ownerGuid, CharterTypes type) +{ + for (auto itr = _petitionStore.begin(); itr != _petitionStore.end();) + { + if (itr->second.ownerGuid == ownerGuid) + { + if (type == CHARTER_TYPE_ANY) + itr = _petitionStore.erase(itr); + else if (type == itr->second.petitionType) + { + itr = _petitionStore.erase(itr); + break; + } + } + else + ++itr; + } + + CharacterDatabasePreparedStatement* stmt; + CharacterDatabaseTransaction trans = CharacterDatabase.BeginTransaction(); + if (type == CHARTER_TYPE_ANY) + { + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_BY_OWNER); + stmt->setUInt32(0, ownerGuid.GetCounter()); + trans->Append(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE_BY_OWNER); + stmt->setUInt32(0, ownerGuid.GetCounter()); + trans->Append(stmt); + } + else + { + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_BY_OWNER_AND_TYPE); + stmt->setUInt32(0, ownerGuid.GetCounter()); + stmt->setUInt8(1, uint8(type)); + trans->Append(stmt); + + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE_BY_OWNER_AND_TYPE); + stmt->setUInt32(0, ownerGuid.GetCounter()); + stmt->setUInt8(1, uint8(type)); + trans->Append(stmt); + } + CharacterDatabase.CommitTransaction(trans); +} + +void PetitionMgr::RemoveSignaturesBySignerAndType(ObjectGuid signerGuid, CharterTypes type) +{ + for (auto& petitionPair : _petitionStore) + { + if (petitionPair.second.petitionType == CHARTER_TYPE_ANY || petitionPair.second.petitionType == type) + petitionPair.second.RemoveSignatureBySigner(signerGuid); + } + + CharacterDatabasePreparedStatement* stmt; + if (type == CHARTER_TYPE_ANY) + { + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_ALL_PETITION_SIGNATURES); + stmt->setUInt32(0, signerGuid.GetCounter()); + } + else + { + stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_PETITION_SIGNATURE); + stmt->setUInt32(0, signerGuid.GetCounter()); + stmt->setUInt8(1, uint8(type)); + } + CharacterDatabase.Execute(stmt); +} + +bool Petition::IsPetitionSignedByAccount(uint32 accountId) const +{ + for (Signature const& signature : signatures) + if (signature.first == accountId) + return true; + + return false; +} + +void Petition::AddSignature(ObjectGuid petitionGuid, uint32 accountId, ObjectGuid playerGuid, bool isLoading) +{ + signatures.emplace_back(accountId, playerGuid); + + if (isLoading) + return; + + CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PETITION_SIGNATURE); + + stmt->setUInt32(0, ownerGuid.GetCounter()); + stmt->setUInt32(1, petitionGuid.GetCounter()); + stmt->setUInt32(2, playerGuid); + stmt->setUInt32(3, accountId); + + CharacterDatabase.Execute(stmt); +} + +void Petition::UpdateName(std::string const& newName) +{ + petitionName = newName; + + CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_PETITION_NAME); + stmt->setString(0, newName); + stmt->setUInt32(1, petitionGuid.GetCounter()); + CharacterDatabase.Execute(stmt); +} + +void Petition::RemoveSignatureBySigner(ObjectGuid playerGuid) +{ + for (auto itr = signatures.begin(); itr != signatures.end(); ++itr) + { + if (itr->second == playerGuid) + { + signatures.erase(itr); + + // notify owner + if (Player* owner = ObjectAccessor::FindConnectedPlayer(ownerGuid)) + owner->GetSession()->SendPetitionQueryOpcode(petitionGuid); + + break; + } + } +} diff --git a/src/server/game/Petitions/PetitionMgr.h b/src/server/game/Petitions/PetitionMgr.h new file mode 100644 index 0000000000..902b23c8e6 --- /dev/null +++ b/src/server/game/Petitions/PetitionMgr.h @@ -0,0 +1,89 @@ +/* +* Copyright (C) 2008-2017 TrinityCore +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +* more details. +* +* You should have received a copy of the GNU General Public License along +* with this program. If not, see . +*/ + +#ifndef _PETITIONMGR_H +#define _PETITIONMGR_H + +#include "Define.h" +#include "ObjectGuid.h" +#include "SharedDefines.h" +#include +#include +#include + +enum PetitionTurns +{ + PETITION_TURN_OK = 0, + PETITION_TURN_ALREADY_IN_GUILD = 2, + PETITION_TURN_NEED_MORE_SIGNATURES = 4, + PETITION_TURN_GUILD_PERMISSIONS = 11, + PETITION_TURN_GUILD_NAME_INVALID = 12 +}; + +enum PetitionSigns +{ + PETITION_SIGN_OK = 0, + PETITION_SIGN_ALREADY_SIGNED = 1, + PETITION_SIGN_ALREADY_IN_GUILD = 2, + PETITION_SIGN_CANT_SIGN_OWN = 3, + PETITION_SIGN_NOT_SERVER = 4, + PETITION_SIGN_FULL = 5, + PETITION_SIGN_ALREADY_SIGNED_OTHER = 6, + PETITION_SIGN_RESTRICTED_ACCOUNT = 7 +}; + +typedef std::pair Signature; +typedef std::vector SignaturesVector; + +struct Petition +{ + ObjectGuid petitionGuid; + ObjectGuid ownerGuid; + CharterTypes petitionType; + std::string petitionName; + SignaturesVector signatures; + + bool IsPetitionSignedByAccount(uint32 accountId) const; + void AddSignature(ObjectGuid petitionGuid, uint32 accountId, ObjectGuid playerGuid, bool isLoading); + void UpdateName(std::string const& newName); + void RemoveSignatureBySigner(ObjectGuid playerGuid); +}; + +class TC_GAME_API PetitionMgr +{ + public: + PetitionMgr() { } + ~PetitionMgr() { } + + static PetitionMgr* instance(); + + // Load from DB + void LoadPetitions(); + void LoadSignatures(); + + // Petitions + void AddPetition(ObjectGuid petitionGuid, ObjectGuid ownerGuid, std::string const& name, CharterTypes type, bool isLoading); + void RemovePetition(ObjectGuid petitionGuid); + Petition* GetPetition(ObjectGuid petitionGuid); + Petition* GetPetitionByOwnerWithType(ObjectGuid ownerGuid, CharterTypes type); + void RemovePetitionsByOwnerAndType(ObjectGuid ownerGuid, CharterTypes type); + void RemoveSignaturesBySignerAndType(ObjectGuid signerGuid, CharterTypes type); +}; + +#define sPetitionMgr PetitionMgr::instance() + +#endif diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 0fc52940ff..0341363057 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -55,6 +55,7 @@ struct AuctionEntry; struct DeclinedName; struct ItemTemplate; struct MovementInfo; +struct Petition; namespace lfg { @@ -312,14 +313,6 @@ enum ChatRestrictionType ERR_YELL_RESTRICTED = 3 }; -enum CharterTypes -{ - GUILD_CHARTER_TYPE = 4, - ARENA_TEAM_CHARTER_2v2_TYPE = 2, - ARENA_TEAM_CHARTER_3v3_TYPE = 3, - ARENA_TEAM_CHARTER_5v5_TYPE = 5, -}; - #define DB2_REPLY_SPARSE 2442913102 #define DB2_REPLY_ITEM 1344507586 @@ -814,6 +807,7 @@ class TC_GAME_API WorldSession void HandlePetitionBuyOpcode(WorldPacket& recvData); void HandlePetitionShowSignOpcode(WorldPacket& recvData); + void SendPetitionSigns(Petition const* petition, Player* sendTo); void HandlePetitionQueryOpcode(WorldPacket& recvData); void HandlePetitionRenameOpcode(WorldPacket& recvData); void HandlePetitionSignOpcode(WorldPacket& recvData); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 5203d77e3f..293ae2e1f2 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -65,6 +65,7 @@ #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "OutdoorPvPMgr.h" +#include "PetitionMgr.h" #include "Player.h" #include "PlayerDump.h" #include "PoolMgr.h" @@ -2195,6 +2196,12 @@ void World::SetInitialWorldSettings() TC_LOG_INFO("server.loading", "Loading Calendar data..."); sCalendarMgr->LoadFromDB(); + TC_LOG_INFO("server.loading", "Loading Petitions..."); + sPetitionMgr->LoadPetitions(); + + TC_LOG_INFO("server.loading", "Loading Signatures..."); + sPetitionMgr->LoadSignatures(); + TC_LOG_INFO("server.loading", "Loading Summon Properties parameter data..."); sObjectMgr->LoadSummonPropertiesParameters();