mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Merge error pt2. damn git

Browse source
This commit is contained in:
Antz 2020-04-28 03:10:09 +01:00
parent 989953a56d
commit 04adbc93d0
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/game/WorldHandlers/PetitionsHandler.cpp
View file

@ -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;