From 04adbc93d0e5a068ec504495d96e74f4a23aa6bd Mon Sep 17 00:00:00 2001 From: Antz Date: Tue, 28 Apr 2020 03:10:09 +0100 Subject: [PATCH] Fix Merge error pt2. damn git --- src/game/WorldHandlers/PetitionsHandler.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/game/WorldHandlers/PetitionsHandler.cpp b/src/game/WorldHandlers/PetitionsHandler.cpp index 30726e530..ce46b225c 100644 --- a/src/game/WorldHandlers/PetitionsHandler.cpp +++ b/src/game/WorldHandlers/PetitionsHandler.cpp @@ -312,15 +312,8 @@ void WorldSession::HandlePetitionRenameOpcode(WorldPacket& recv_data) return; } - QueryResult* result = CharacterDatabase.PQuery("SELECT `type` FROM `petition` WHERE `petitionguid` = '%u'", petitionGuid.GetCounter()); - - if (result) - { - Field* fields = result->Fetch(); - type = fields[0].GetUInt32(); - delete result; - } - else + QueryResult* result = CharacterDatabase.PQuery("SELECT 1 FROM `petition` WHERE `petitionguid` = '%u'", petitionGuid.GetCounter()); + if (!result) { DEBUG_LOG("CMSG_PETITION_QUERY failed for petition: %s", petitionGuid.GetString().c_str()); return; @@ -508,7 +501,7 @@ void WorldSession::HandleOfferPetitionOpcode(WorldPacket& recv_data) } /// Get petition type and check - QueryResult* result = CharacterDatabase.PQuery("SELECT `type` FROM `petition` WHERE `petitionguid` = '%u'", petitionGuid.GetCounter()); + QueryResult* result = CharacterDatabase.PQuery("SELECT 1 FROM `petition` WHERE `petitionguid` = '%u'", petitionGuid.GetCounter()); if (!result) { return;