Core/Entities: don't allow client control if player is still affected by any lose of control state

(cherry picked from commit e315e41d36061fc88dfa09bfa0da1fbc0c00826f)

1 files changed, 18 insertions, 18 deletions

diff --git a/src/server/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp
index 87199224c4f..162407e5f09 100644
--- a/src/server/game/Petitions/PetitionMgr.cpp
+++ b/src/server/game/Petitions/PetitionMgr.cpp
@@ -79,7 +79,7 @@ void PetitionMgr::LoadSignatures()
         if (!petition)
             continue;
 
-        petition->AddSignature(petition->petitionGuid, fields[1].GetUInt32(), ObjectGuid::Create<HighGuid::Player>(fields[2].GetUInt64()), true);
+        petition->AddSignature(fields[1].GetUInt32(), ObjectGuid::Create<HighGuid::Player>(fields[2].GetUInt64()), true);
         ++count;
     } while (result->NextRow());
 
@@ -89,10 +89,10 @@ void PetitionMgr::LoadSignatures()
 void PetitionMgr::AddPetition(ObjectGuid petitionGuid, ObjectGuid ownerGuid, std::string const& name, bool isLoading)
 {
     Petition& p = _petitionStore[petitionGuid];
-    p.petitionGuid = petitionGuid;
-    p.ownerGuid = ownerGuid;
-    p.petitionName = name;
-    p.signatures.clear();
+    p.PetitionGuid = petitionGuid;
+    p.OwnerGuid = ownerGuid;
+    p.PetitionName = name;
+    p.Signatures.clear();
 
     if (isLoading)
         return;
@@ -134,7 +134,7 @@ Petition* PetitionMgr::GetPetition(ObjectGuid petitionGuid)
 Petition* PetitionMgr::GetPetitionByOwner(ObjectGuid ownerGuid)
 {
     for (auto& petitionPair : _petitionStore)
-        if (petitionPair.second.ownerGuid == ownerGuid)
+        if (petitionPair.second.OwnerGuid == ownerGuid)
             return &petitionPair.second;
 
     return nullptr;
@@ -144,7 +144,7 @@ void PetitionMgr::RemovePetitionsByOwner(ObjectGuid ownerGuid)
 {
     for (auto itr = _petitionStore.begin(); itr != _petitionStore.end();)
     {
-        if (itr->second.ownerGuid == ownerGuid)
+        if (itr->second.OwnerGuid == ownerGuid)
         {
             _petitionStore.erase(itr);
             break;
@@ -177,24 +177,24 @@ void PetitionMgr::RemoveSignaturesBySigner(ObjectGuid signerGuid)
 
 bool Petition::IsPetitionSignedByAccount(uint32 accountId) const
 {
-    for (Signature const& signature : signatures)
+    for (Signature const& signature : Signatures)
         if (signature.first == accountId)
             return true;
 
     return false;
 }
 
-void Petition::AddSignature(ObjectGuid petitionGuid, uint32 accountId, ObjectGuid playerGuid, bool isLoading)
+void Petition::AddSignature(uint32 accountId, ObjectGuid playerGuid, bool isLoading)
 {
-    signatures.emplace_back(accountId, playerGuid);
+    Signatures.emplace_back(accountId, playerGuid);
 
     if (isLoading)
         return;
 
     CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_PETITION_SIGNATURE);
 
-    stmt->setUInt64(0, ownerGuid.GetCounter());
-    stmt->setUInt64(1, petitionGuid.GetCounter());
+    stmt->setUInt64(0, OwnerGuid.GetCounter());
+    stmt->setUInt64(1, PetitionGuid.GetCounter());
     stmt->setUInt64(2, playerGuid.GetCounter());
     stmt->setUInt32(3, accountId);
 
@@ -203,25 +203,25 @@ void Petition::AddSignature(ObjectGuid petitionGuid, uint32 accountId, ObjectGui
 
 void Petition::UpdateName(std::string const& newName)
 {
-    petitionName = newName;
+    PetitionName = newName;
 
     CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_PETITION_NAME);
     stmt->setString(0, newName);
-    stmt->setUInt64(1, petitionGuid.GetCounter());
+    stmt->setUInt64(1, PetitionGuid.GetCounter());
     CharacterDatabase.Execute(stmt);
 }
 
 void Petition::RemoveSignatureBySigner(ObjectGuid playerGuid)
 {
-    for (auto itr = signatures.begin(); itr != signatures.end(); ++itr)
+    for (auto itr = Signatures.begin(); itr != Signatures.end(); ++itr)
     {
         if (itr->second == playerGuid)
         {
-            signatures.erase(itr);
+            Signatures.erase(itr);
 
             // notify owner
-            if (Player* owner = ObjectAccessor::FindConnectedPlayer(ownerGuid))
-                owner->GetSession()->SendPetitionQueryOpcode(petitionGuid);
+            if (Player* owner = ObjectAccessor::FindConnectedPlayer(OwnerGuid))
+                owner->GetSession()->SendPetitionQueryOpcode(PetitionGuid);
 
             break;
         }