diff options
Diffstat (limited to 'src')
60 files changed, 158 insertions, 152 deletions
diff --git a/src/server/game/AI/CoreAI/TotemAI.cpp b/src/server/game/AI/CoreAI/TotemAI.cpp index 881d49b6609..ab63034b29d 100644 --- a/src/server/game/AI/CoreAI/TotemAI.cpp +++ b/src/server/game/AI/CoreAI/TotemAI.cpp @@ -57,7 +57,7 @@ void TotemAI::UpdateAI(uint32 /*diff*/) // SPELLMOD_RANGE not applied in this place just because not existence range mods for attacking totems // pointer to appropriate target if found any - Unit* victim = _victimGUID ? ObjectAccessor::GetUnit(*me, _victimGUID) : nullptr; + Unit* victim = !_victimGUID.IsEmpty() ? ObjectAccessor::GetUnit(*me, _victimGUID) : nullptr; // Search victim if no, not attackable, or out of range, or friendly (possible in case duel end) if (!victim || !victim->isTargetableForAttack() || !me->IsWithinDistInMap(victim, max_range) || me->IsFriendlyTo(victim) || !me->CanSeeOrDetect(victim)) diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index c355b07ed24..907152b03cb 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -53,7 +53,7 @@ void CreatureAI::Talk(uint8 id, WorldObject const* whisperTarget /*= nullptr*/) // Disable CreatureAI when charmed void CreatureAI::OnCharmed(bool isNew) { - if (isNew && !me->IsCharmed() && me->LastCharmerGUID) + if (isNew && !me->IsCharmed() && !me->LastCharmerGUID.IsEmpty()) { if (!me->HasReactState(REACT_PASSIVE)) { diff --git a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp index bbe402ac25b..ee87343aedf 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp @@ -212,7 +212,7 @@ void EscortAI::UpdateAI(uint32 diff) } // Check if player or any member of his group is within range - if (_despawnAtFar && HasEscortState(STATE_ESCORT_ESCORTING) && _playerGUID && !me->IsEngaged() && !HasEscortState(STATE_ESCORT_RETURNING)) + if (_despawnAtFar && HasEscortState(STATE_ESCORT_ESCORTING) && !_playerGUID.IsEmpty() && !me->IsEngaged() && !HasEscortState(STATE_ESCORT_RETURNING)) { if (_playerCheckTimer <= diff) { diff --git a/src/server/game/AI/SmartScripts/SmartAI.cpp b/src/server/game/AI/SmartScripts/SmartAI.cpp index 3fd35ac39d1..6d6acd08817 100644 --- a/src/server/game/AI/SmartScripts/SmartAI.cpp +++ b/src/server/game/AI/SmartScripts/SmartAI.cpp @@ -437,7 +437,7 @@ void SmartAI::EnterEvadeMode(EvadeReason /*why*/) AddEscortState(SMART_ESCORT_RETURNING); ReturnToLastOOCPos(); } - else if (Unit* target = _followGUID ? ObjectAccessor::GetUnit(*me, _followGUID) : nullptr) + else if (Unit* target = !_followGUID.IsEmpty() ? ObjectAccessor::GetUnit(*me, _followGUID) : nullptr) { me->GetMotionMaster()->MoveFollow(target, _followDistance, _followAngle); // evade is not cleared in MoveFollow, so we can't keep it @@ -988,7 +988,7 @@ void SmartAI::UpdatePath(uint32 diff) void SmartAI::UpdateFollow(uint32 diff) { - if (_followGUID) + if (!_followGUID.IsEmpty()) { if (_followArrivedTimer < diff) { diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index 3f668392fcf..f79a309c35b 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -863,7 +863,7 @@ BfCapturePoint::~BfCapturePoint() = default; bool BfCapturePoint::HandlePlayerEnter(Player* player) { - if (m_capturePointGUID) + if (!m_capturePointGUID.IsEmpty()) { if (GameObject* capturePoint = m_Bf->GetGameObject(m_capturePointGUID)) { @@ -878,7 +878,7 @@ bool BfCapturePoint::HandlePlayerEnter(Player* player) GuidSet::iterator BfCapturePoint::HandlePlayerLeave(Player* player) { - if (m_capturePointGUID) + if (!m_capturePointGUID.IsEmpty()) if (GameObject* capturePoint = m_Bf->GetGameObject(m_capturePointGUID)) player->SendUpdateWorldState(capturePoint->GetGOInfo()->capturePoint.worldState1, 0); @@ -950,7 +950,7 @@ GameObject* BfCapturePoint::GetCapturePointGo() bool BfCapturePoint::DelCapturePoint() { - if (m_capturePointGUID) + if (!m_capturePointGUID.IsEmpty()) { if (GameObject* capturePoint = m_Bf->GetGameObject(m_capturePointGUID)) { diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index 7bb47cc75e2..82cf70a1ff6 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -447,7 +447,7 @@ void ArenaTeam::Roster(WorldSession* session) { player = ObjectAccessor::FindConnectedPlayer(itr->Guid); - data << uint64(itr->Guid); // guid + data << itr->Guid; // guid data << uint8((player ? 1 : 0)); // online flag data << itr->Name; // member name data << uint32((itr->Guid == GetCaptain() ? 0 : 1)); // captain flag 0 captain 1 member @@ -513,7 +513,7 @@ void ArenaTeam::Inspect(WorldSession* session, ObjectGuid guid) return; WorldPacket data(MSG_INSPECT_ARENA_TEAMS, 8+1+4*6); - data << uint64(guid); // player guid + data << guid; // player guid data << uint8(GetSlot()); // slot (0...2) data << uint32(GetId()); // arena team id data << uint32(Stats.Rating); // rating @@ -576,8 +576,8 @@ void ArenaTeam::BroadcastEvent(ArenaTeamEvents event, ObjectGuid guid, uint8 str return; } - if (guid) - data << uint64(guid); + if (!guid.IsEmpty()) + data << guid; BroadcastPacket(&data); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index c9353d29e3c..800d434c9f0 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -622,7 +622,7 @@ void BattlegroundAB::Reset() } for (uint8 i = 0; i < BG_AB_ALL_NODES_COUNT + 5; ++i)//+5 for aura triggers - if (BgCreatures[i]) + if (!BgCreatures[i].IsEmpty()) DelCreature(i); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index 6f272a874d4..dabe24fc729 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -769,7 +769,7 @@ void BattlegroundAV::DePopulateNode(BG_AV_Nodes node) if (BgCreatures[c_place+i]) DelCreature(c_place+i); //spiritguide - if (!IsTower(node) && BgCreatures[node]) + if (!IsTower(node) && !BgCreatures[node].IsEmpty()) DelCreature(node); //remove bonus honor aura trigger creature when node is lost diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 3de916ca0e2..fe9bae19bba 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -1010,13 +1010,15 @@ void BattlegroundSA::UpdateDemolisherSpawns() void BattlegroundSA::SendTransportInit(Player* player) { - if (BgObjects[BG_SA_BOAT_ONE] || BgObjects[BG_SA_BOAT_TWO]) + if (!BgObjects[BG_SA_BOAT_ONE].IsEmpty() || !BgObjects[BG_SA_BOAT_TWO].IsEmpty()) { UpdateData transData; if (BgObjects[BG_SA_BOAT_ONE]) GetBGObject(BG_SA_BOAT_ONE)->BuildCreateUpdateBlockForPlayer(&transData, player); + if (BgObjects[BG_SA_BOAT_TWO]) GetBGObject(BG_SA_BOAT_TWO)->BuildCreateUpdateBlockForPlayer(&transData, player); + WorldPacket packet; transData.BuildPacket(&packet); player->SendDirectMessage(&packet); diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 54a9c806fa7..740f9d56a2c 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -627,7 +627,7 @@ void Channel::List(Player const* player) const member->GetSession()->GetSecurity() <= AccountTypes(gmLevelInWhoList)) && member->IsVisibleGloballyFor(player)) { - data << uint64(i->first); + data << i->first; data << uint8(i->second.flags); // flags seems to be changed... ++count; } @@ -826,7 +826,7 @@ void Channel::JoinNotify(ObjectGuid guid) const LocaleConstant localeIdx = sWorld->GetAvailableDbcLocale(locale); data.Initialize(IsConstant() ? SMSG_USERLIST_ADD : SMSG_USERLIST_UPDATE, 8 + 1 + 1 + 4 + 30 /*channelName buffer*/); - data << uint64(guid); + data << guid; data << uint8(GetPlayerFlags(guid)); data << uint8(GetFlags()); data << uint32(GetNumPlayers()); @@ -846,7 +846,7 @@ void Channel::LeaveNotify(ObjectGuid guid) const LocaleConstant localeIdx = sWorld->GetAvailableDbcLocale(locale); data.Initialize(SMSG_USERLIST_REMOVE, 8 + 1 + 4 + 30 /*channelName buffer*/); - data << uint64(guid); + data << guid; data << uint8(GetFlags()); data << uint32(GetNumPlayers()); data << GetName(localeIdx); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 8059ebc55a2..42c74538b32 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -193,7 +193,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data.Initialize(!gmMessage ? SMSG_MESSAGECHAT : SMSG_GM_MESSAGECHAT); data << uint8(chatType); data << int32(language); - data << uint64(senderGUID); + data << senderGUID; data << uint32(0); // some flags switch (chatType) { @@ -208,8 +208,8 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data << uint32(senderName.length() + 1); data << senderName; receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); - if (receiverGUID && !receiverGUID.IsPlayer() && !receiverGUID.IsPet()) + data << receiverGUID; + if (!receiverGUID.IsEmpty() && !receiverGUID.IsPlayer() && !receiverGUID.IsPet()) { data << uint32(receiverName.length() + 1); data << receiverName; @@ -219,14 +219,14 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag data << uint32(senderName.length() + 1); data << senderName; receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; break; case CHAT_MSG_BG_SYSTEM_NEUTRAL: case CHAT_MSG_BG_SYSTEM_ALLIANCE: case CHAT_MSG_BG_SYSTEM_HORDE: receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); - if (receiverGUID && !receiverGUID.IsPlayer()) + data << receiverGUID; + if (!receiverGUID.IsEmpty() && !receiverGUID.IsPlayer()) { data << uint32(receiverName.length() + 1); data << receiverName; @@ -235,7 +235,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag case CHAT_MSG_ACHIEVEMENT: case CHAT_MSG_GUILD_ACHIEVEMENT: receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; break; default: if (gmMessage) @@ -251,7 +251,7 @@ size_t ChatHandler::BuildChatPacket(WorldPacket& data, ChatMsg chatType, Languag } receiverGUIDPos = data.wpos(); - data << uint64(receiverGUID); + data << receiverGUID; break; } @@ -607,7 +607,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p *player_guid = pl ? pl->GetGUID() : guid; if (player_name) - *player_name = pl || guid ? name : ""; + *player_name = pl || !guid.IsEmpty() ? name : ""; } else { diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 1974f01e1fd..85ffdabda5b 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -727,7 +727,7 @@ void LFGMgr::UpdateRoleCheck(ObjectGuid gguid, ObjectGuid guid /* = ObjectGuid:: } LfgRoleCheck& roleCheck = itRoleCheck->second; - bool sendRoleChosen = roleCheck.state != LFG_ROLECHECK_DEFAULT && guid; + bool sendRoleChosen = roleCheck.state != LFG_ROLECHECK_DEFAULT && !guid.IsEmpty(); if (!guid) roleCheck.state = LFG_ROLECHECK_ABORTED; @@ -966,7 +966,7 @@ void LFGMgr::MakeNewGroup(LfgProposal const& proposal) LFGDungeonData const* dungeon = GetLFGDungeon(proposal.dungeonId); ASSERT(dungeon); - Group* grp = proposal.group ? sGroupMgr->GetGroupByGUID(proposal.group.GetCounter()) : nullptr; + Group* grp = !proposal.group.IsEmpty() ? sGroupMgr->GetGroupByGUID(proposal.group.GetCounter()) : nullptr; for (GuidList::const_iterator it = players.begin(); it != players.end(); ++it) { ObjectGuid pguid = (*it); @@ -1161,7 +1161,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate if (it->second.accept == LFG_ANSWER_AGREE) continue; - ObjectGuid guid = it->second.group ? it->second.group : it->first; + ObjectGuid guid = !it->second.group.IsEmpty() ? it->second.group : it->first; // Player didn't accept or still pending when no secs left if (it->second.accept == LFG_ANSWER_DENY || type == LFG_UPDATETYPE_PROPOSAL_FAILED) { @@ -1174,7 +1174,7 @@ void LFGMgr::RemoveProposal(LfgProposalContainer::iterator itProposal, LfgUpdate for (LfgProposalPlayerContainer::const_iterator it = proposal.players.begin(); it != proposal.players.end(); ++it) { ObjectGuid guid = it->first; - ObjectGuid gguid = it->second.group ? it->second.group : guid; + ObjectGuid gguid = !it->second.group.IsEmpty() ? it->second.group : guid; SendLfgUpdateProposal(guid, proposal); @@ -1990,7 +1990,7 @@ void LFGMgr::SendLfgQueueStatus(ObjectGuid guid, LfgQueueStatusData const& data) bool LFGMgr::IsLfgGroup(ObjectGuid guid) { - return guid && guid.IsGroup() && GroupsStore[guid].IsLfgGroup(); + return !guid.IsEmpty() && guid.IsGroup() && GroupsStore[guid].IsLfgGroup(); } uint8 LFGMgr::GetQueueId(ObjectGuid guid) diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index f9a3c8c9ccc..08202472447 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -567,7 +567,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(GuidList check) LfgProposalPlayer &data = proposal.players[itRoles->first]; data.role = itRoles->second; data.group = proposalGroups.find(itRoles->first)->second; - if (!proposal.isNew && data.group && data.group == proposal.group) // Player from existing group, autoaccept + if (!proposal.isNew && !data.group.IsEmpty() && data.group == proposal.group) // Player from existing group, autoaccept data.accept = LFG_ANSWER_AGREE; } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index b358aca1514..f7e1f2caf53 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -901,7 +901,7 @@ void Creature::Regenerate(Powers power) case POWER_MANA: { // Combat and any controlled creature - if (IsInCombat() || GetCharmerOrOwnerGUID()) + if (IsInCombat() || !GetCharmerOrOwnerGUID().IsEmpty()) { if (!IsUnderLastManaUseEffect()) { @@ -2293,7 +2293,7 @@ void Creature::SendAIReaction(AiReaction reactionType) { WorldPacket data(SMSG_AI_REACTION, 12); - data << uint64(GetGUID()); + data << GetGUID(); data << uint32(reactionType); ((WorldObject*)this)->SendMessageToSet(&data, true); diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp index 785b8dbe1d9..281bcc6208f 100644 --- a/src/server/game/Entities/Creature/GossipDef.cpp +++ b/src/server/game/Entities/Creature/GossipDef.cpp @@ -204,7 +204,7 @@ void PlayerMenu::SendGossipMenu(uint32 titleTextId, ObjectGuid objectGUID) _gossipMenu.SetSenderGUID(objectGUID); WorldPacket data(SMSG_GOSSIP_MESSAGE, 100); // guess size - data << uint64(objectGUID); + data << objectGUID; data << uint32(_gossipMenu.GetMenuId()); // new 2.4.0 data << uint32(titleTextId); data << uint32(_gossipMenu.GetMenuItemCount()); // max count 0x10 @@ -329,7 +329,7 @@ void QuestMenu::ClearMenu() void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, const std::string& Title, ObjectGuid guid) { WorldPacket data(SMSG_QUESTGIVER_QUEST_LIST, 100); // guess size - data << uint64(guid); + data << guid; if (QuestGreeting const* questGreeting = sObjectMgr->GetQuestGreeting(guid)) { @@ -388,7 +388,7 @@ void PlayerMenu::SendQuestGiverQuestList(QEmote const& eEmote, const std::string void PlayerMenu::SendQuestGiverStatus(uint8 questStatus, ObjectGuid npcGUID) const { WorldPacket data(SMSG_QUESTGIVER_STATUS, 9); - data << uint64(npcGUID); + data << npcGUID; data << uint8(questStatus); _session->SendPacket(&data); @@ -503,7 +503,7 @@ void PlayerMenu::SendQuestGiverRequestItems(Quest const* quest, ObjectGuid npcGU } WorldPacket data(SMSG_QUESTGIVER_REQUEST_ITEMS, 50); // guess size - data << uint64(npcGUID); + data << npcGUID; data << uint32(quest->GetQuestId()); data << questTitle; data << requestItemsText; diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index b93e7f604d5..bbc942d942a 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -38,7 +38,7 @@ m_timer(0), m_lifetime(0), m_canFollowOwner(true) WorldObject* TempSummon::GetSummoner() const { - return m_summonerGUID ? ObjectAccessor::GetWorldObject(*this, m_summonerGUID) : nullptr; + return !m_summonerGUID.IsEmpty() ? ObjectAccessor::GetUnit(*this, m_summonerGUID) : nullptr; } Unit* TempSummon::GetSummonerUnit() const @@ -50,7 +50,7 @@ Unit* TempSummon::GetSummonerUnit() const Creature* TempSummon::GetSummonerCreatureBase() const { - return m_summonerGUID ? ObjectAccessor::GetCreature(*this, m_summonerGUID) : nullptr; + return !m_summonerGUID.IsEmpty() ? ObjectAccessor::GetCreature(*this, m_summonerGUID) : nullptr; } GameObject* TempSummon::GetSummonerGameObject() const @@ -201,7 +201,7 @@ void TempSummon::InitStats(uint32 duration) std::ptrdiff_t slot = m_Properties->Slot; if (slot != 0) { - if (owner->m_SummonSlot[slot] && owner->m_SummonSlot[slot] != GetGUID()) + if (!owner->m_SummonSlot[slot].IsEmpty() && owner->m_SummonSlot[slot] != GetGUID()) { Creature* oldSummon = GetMap()->GetCreature(owner->m_SummonSlot[slot]); if (oldSummon && oldSummon->IsSummon()) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 86fb4986242..1dad8aaa240 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -852,7 +852,7 @@ void GameObject::Update(uint32 diff) UpdateObjectVisibility(); return; } - else if (GetOwnerGUID() || GetSpellId()) + else if (!GetOwnerGUID().IsEmpty() || GetSpellId()) { SetRespawnTime(0); Delete(); @@ -1309,9 +1309,9 @@ bool GameObject::IsAlwaysVisibleFor(WorldObject const* seer) const return false; // Always seen by owner and friendly units - if (ObjectGuid guid = GetOwnerGUID()) + if (!GetOwnerGUID().IsEmpty()) { - if (seer->GetGUID() == guid) + if (seer->GetGUID() == GetOwnerGUID()) return true; Unit* owner = GetOwner(); diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index e3272423b27..2e62b1caa66 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -621,7 +621,7 @@ void Object::SetUInt64Value(uint16 index, uint64 value) bool Object::AddGuidValue(uint16 index, ObjectGuid value) { ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); - if (value && !*((ObjectGuid*)&(m_uint32Values[index]))) + if (!value.IsEmpty() && ((ObjectGuid*)&(m_uint32Values[index]))->IsEmpty()) { *((ObjectGuid*)&(m_uint32Values[index])) = value; _changesMask.SetBit(index); @@ -638,7 +638,7 @@ bool Object::AddGuidValue(uint16 index, ObjectGuid value) bool Object::RemoveGuidValue(uint16 index, ObjectGuid value) { ASSERT(index + 1 < m_valuesCount || PrintIndexError(index, true)); - if (value && *((ObjectGuid*)&(m_uint32Values[index])) == value) + if (!value.IsEmpty() && *((ObjectGuid*)&(m_uint32Values[index])) == value) { m_uint32Values[index] = 0; m_uint32Values[index + 1] = 0; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 840d6a2bbdf..5548587a0c5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2386,7 +2386,7 @@ void Player::RemoveFromGroup(Group* group, ObjectGuid guid, RemoveMethod method void Player::SendLogXPGain(uint32 GivenXP, Unit* victim, uint32 BonusXP, bool recruitAFriend, float /*group_rate*/) const { WorldPacket data(SMSG_LOG_XPGAIN, 21); // guess size? - data << uint64(victim ? victim->GetGUID() : ObjectGuid::Empty); + data << (victim ? victim->GetGUID() : ObjectGuid::Empty); data << uint32(GivenXP + BonusXP); // given experience data << uint8(victim ? 0 : 1); // 00-kill_xp type, 01-non_kill_xp type @@ -13209,8 +13209,8 @@ void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint if (msg != EQUIP_ERR_OK) { - data << uint64(pItem ? pItem->GetGUID() : ObjectGuid::Empty); - data << uint64(pItem2 ? pItem2->GetGUID() : ObjectGuid::Empty); + data << (pItem ? pItem->GetGUID() : ObjectGuid::Empty); + data << (pItem2 ? pItem2->GetGUID() : ObjectGuid::Empty); data << uint8(0); // bag type subclass, used with EQUIP_ERR_EVENT_AUTOEQUIP_BIND_CONFIRM and EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG2 switch (msg) @@ -13247,7 +13247,7 @@ void Player::SendEquipError(InventoryResult msg, Item* pItem, Item* pItem2, uint void Player::SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 param) const { WorldPacket data(SMSG_BUY_FAILED, (8+4+4+1)); - data << uint64(creature ? creature->GetGUID() : ObjectGuid::Empty); + data << (creature ? creature->GetGUID() : ObjectGuid::Empty); data << uint32(item); if (param > 0) data << uint32(param); @@ -13258,7 +13258,7 @@ void Player::SendBuyError(BuyResult msg, Creature* creature, uint32 item, uint32 void Player::SendSellError(SellResult msg, Creature* creature, ObjectGuid guid, uint32 param) const { WorldPacket data(SMSG_SELL_ITEM, (8+8+(4)+1)); // last check 2.0.10 - data << uint64(creature ? creature->GetGUID() : ObjectGuid::Empty); + data << (creature ? creature->GetGUID() : ObjectGuid::Empty); data << uint64(guid); if (param > 0) data << uint32(param); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5719e422edb..062a4b6f358 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3210,7 +3210,7 @@ void Unit::DeMorph() Aura* Unit::_TryStackingOrRefreshingExistingAura(AuraCreateInfo& createInfo) { - ASSERT(createInfo.CasterGUID || createInfo.Caster); + ASSERT(!createInfo.CasterGUID.IsEmpty() || createInfo.Caster); // Check if these can stack anyway if (!createInfo.CasterGUID && !createInfo.GetSpellInfo()->IsStackableOnOneSlotWithDifferentCasters()) @@ -4398,7 +4398,7 @@ AuraEffect* Unit::GetAuraEffect(AuraType type, SpellFamilyNames family, uint32 f SpellInfo const* spell = (*i)->GetSpellInfo(); if (spell->SpellFamilyName == uint32(family) && spell->SpellFamilyFlags.HasFlag(familyFlag1, familyFlag2, familyFlag3)) { - if (casterGUID && (*i)->GetCasterGUID() != casterGUID) + if (!casterGUID.IsEmpty() && (*i)->GetCasterGUID() != casterGUID) continue; return (*i); } @@ -5086,7 +5086,7 @@ std::vector<GameObject*> Unit::GetGameObjects(uint32 spellId) const void Unit::AddGameObject(GameObject* gameObj) { - if (!gameObj || gameObj->GetOwnerGUID()) + if (!gameObj || !gameObj->GetOwnerGUID().IsEmpty()) return; m_gameObj.push_back(gameObj); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 325e8c17e1a..1e3c0c0e967 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -602,7 +602,7 @@ bool Group::RemoveMember(ObjectGuid guid, RemoveMethod const& method /*= GROUP_R { data.Initialize(SMSG_GROUP_LIST, 1 + 1 + 1 + 1 + 8 + 4 + 4 + 8); data << uint8(0x10) << uint8(0) << uint8(0) << uint8(0); - data << uint64(m_guid) << uint32(m_counter) << uint32(0) << uint64(0); + data << m_guid << uint32(m_counter) << uint32(0) << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -612,7 +612,7 @@ bool Group::RemoveMember(ObjectGuid guid, RemoveMethod const& method /*= GROUP_R data.Initialize(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(0x10); data << uint32(0); - data << uint64(0); + data << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -859,7 +859,7 @@ void Group::Disband(bool hideDestroy /* = false */) { data.Initialize(SMSG_GROUP_LIST, 1+1+1+1+8+4+4+8); data << uint8(0x10) << uint8(0) << uint8(0) << uint8(0); - data << uint64(m_guid) << uint32(m_counter) << uint32(0) << uint64(0); + data << m_guid << uint32(m_counter) << uint32(0) << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -869,7 +869,7 @@ void Group::Disband(bool hideDestroy /* = false */) data.Initialize(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(0x10); data << uint32(0); - data << uint64(0); + data << ObjectGuid::Empty; player->SendDirectMessage(&data); } @@ -915,7 +915,7 @@ void Group::Disband(bool hideDestroy /* = false */) void Group::SendLootStartRoll(uint32 countDown, uint32 mapid, Roll const& r) { WorldPacket data(SMSG_LOOT_START_ROLL, (8+4+4+4+4+4+4+1)); - data << uint64(r.itemGUID); // guid of rolled item + data << r.itemGUID; // guid of rolled item data << uint32(mapid); // 3.3.3 mapid data << uint32(r.itemSlot); // itemslot data << uint32(r.itemid); // the itemEntryId for the item that shall be rolled for @@ -942,7 +942,7 @@ void Group::SendLootStartRollToPlayer(uint32 countDown, uint32 mapId, Player* p, return; WorldPacket data(SMSG_LOOT_START_ROLL, (8 + 4 + 4 + 4 + 4 + 4 + 4 + 1)); - data << uint64(r.itemGUID); // guid of rolled item + data << r.itemGUID; // guid of rolled item data << uint32(mapId); // 3.3.3 mapid data << uint32(r.itemSlot); // itemslot data << uint32(r.itemid); // the itemEntryId for the item that shall be rolled for @@ -961,9 +961,9 @@ void Group::SendLootStartRollToPlayer(uint32 countDown, uint32 mapId, Player* p, void Group::SendLootRoll(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 rollNumber, uint8 rollType, Roll const& roll, bool autoPass) { WorldPacket data(SMSG_LOOT_ROLL, (8+4+8+4+4+4+1+1+1)); - data << uint64(sourceGuid); // guid of the item rolled + data << sourceGuid; // guid of the item rolled data << uint32(roll.itemSlot); // slot - data << uint64(targetGuid); + data << targetGuid; data << uint32(roll.itemid); // the itemEntryId for the item that shall be rolled for data << uint32(roll.itemRandomSuffix); // randomSuffix data << uint32(roll.itemRandomPropId); // Item random property ID @@ -985,12 +985,12 @@ void Group::SendLootRoll(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 rol void Group::SendLootRollWon(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 rollNumber, uint8 rollType, Roll const& roll) { WorldPacket data(SMSG_LOOT_ROLL_WON, (8+4+4+4+4+8+1+1)); - data << uint64(sourceGuid); // guid of the item rolled + data << sourceGuid; // guid of the item rolled data << uint32(roll.itemSlot); // slot data << uint32(roll.itemid); // the itemEntryId for the item that shall be rolled for data << uint32(roll.itemRandomSuffix); // randomSuffix data << uint32(roll.itemRandomPropId); // Item random property - data << uint64(targetGuid); // guid of the player who won. + data << targetGuid; // guid of the player who won. data << uint8(rollNumber); // rollnumber realted to SMSG_LOOT_ROLL data << uint8(rollType); // rollType related to SMSG_LOOT_ROLL @@ -1008,7 +1008,7 @@ void Group::SendLootRollWon(ObjectGuid sourceGuid, ObjectGuid targetGuid, uint8 void Group::SendLootAllPassed(Roll const& roll) { WorldPacket data(SMSG_LOOT_ALL_PASSED, (8+4+4+4+4)); - data << uint64(roll.itemGUID); // Guid of the item rolled + data << roll.itemGUID; // Guid of the item rolled data << uint32(roll.itemSlot); // Item loot slot data << uint32(roll.itemid); // The itemEntryId for the item that shall be rolled for data << uint32(roll.itemRandomPropId); // Item random property ID @@ -1031,7 +1031,7 @@ void Group::SendLooter(Creature* creature, Player* groupLooter) ASSERT(creature); WorldPacket data(SMSG_LOOT_LIST, (8+8)); - data << uint64(creature->GetGUID()); + data << creature->GetGUID(); if (GetLootMethod() == MASTER_LOOT && creature->loot.hasOverThresholdItem()) data << GetMasterLooterGuid().WriteAsPacked(); @@ -1403,7 +1403,7 @@ void Group::MasterLoot(Loot* loot, WorldObject* pLootedObject) if (looter->IsAtGroupRewardDistance(pLootedObject)) { - data << uint64(looter->GetGUID()); + data << looter->GetGUID(); ++real_count; } } @@ -1673,9 +1673,9 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid) WorldPacket data(MSG_RAID_TARGET_UPDATE, (1+8+1+8)); data << uint8(0); // set targets - data << uint64(whoGuid); + data << whoGuid; data << uint8(id); - data << uint64(targetGuid); + data << targetGuid; BroadcastPacket(&data, true); } @@ -1693,7 +1693,7 @@ void Group::SendTargetIconList(WorldSession* session) continue; data << uint8(i); - data << uint64(m_targetIcons[i]); + data << m_targetIcons[i]; } session->SendPacket(&data); @@ -1743,7 +1743,7 @@ void Group::SendUpdateToPlayer(Player const* player, MemberSlot const* slot /*= data << uint32(sLFGMgr->GetDungeon(m_guid)); } - data << uint64(m_guid); + data << m_guid; data << uint32(m_counter++); // 3.3, value increases every time this packet gets sent data << uint32(GetMembersCount()-1); for (member_citerator citr = m_memberSlots.begin(); citr != m_memberSlots.end(); ++citr) @@ -1757,23 +1757,23 @@ void Group::SendUpdateToPlayer(Player const* player, MemberSlot const* slot /*= onlineState = onlineState | ((isBGGroup() || isBFGroup()) ? MEMBER_STATUS_PVP : 0); data << citr->name; - data << uint64(citr->guid); // guid + data << citr->guid; // guid data << uint8(onlineState); // online-state data << uint8(citr->group); // groupid data << uint8(citr->flags); // See enum GroupMemberFlags data << uint8(citr->roles); // Lfg Roles } - data << uint64(m_leaderGuid); // leader guid + data << m_leaderGuid; // leader guid if (GetMembersCount() - 1) { data << uint8(m_lootMethod); // loot method if (m_lootMethod == MASTER_LOOT) - data << uint64(m_masterLooterGuid); // master looter guid + data << m_masterLooterGuid; // master looter guid else - data << uint64(0); + data << ObjectGuid::Empty; data << uint8(m_lootThreshold); // loot threshold data << uint8(m_dungeonDifficulty); // Dungeon Difficulty @@ -1789,7 +1789,7 @@ void Group::SendOriginalGroupUpdateToPlayer(Player const* player) const WorldPacket data(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); data << uint8(m_groupType); data << uint32(GetMembersCount() - 1); - data << uint64(m_leaderGuid); + data << m_leaderGuid; player->SendDirectMessage(&data); } @@ -1842,7 +1842,7 @@ void Group::OfflineReadyCheck() if (!player || !player->GetSession()) { WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9); - data << uint64(citr->guid); + data << citr->guid; data << uint8(0); BroadcastReadyCheck(&data); } diff --git a/src/server/game/Handlers/AuctionHouseHandler.cpp b/src/server/game/Handlers/AuctionHouseHandler.cpp index b50b071b943..399e94e0ed8 100644 --- a/src/server/game/Handlers/AuctionHouseHandler.cpp +++ b/src/server/game/Handlers/AuctionHouseHandler.cpp @@ -69,7 +69,7 @@ void WorldSession::SendAuctionHello(ObjectGuid guid, Unit const* unit) return; WorldPacket data(MSG_AUCTION_HELLO, 12); - data << uint64(guid); + data << guid; data << uint32(ahEntry->ID); data << uint8(1); // 3.3.3: 1 - AH enabled, 0 - AH disabled SendPacket(&data); @@ -110,7 +110,7 @@ void WorldSession::SendAuctionBidderNotification(uint32 location, uint32 auction WorldPacket data(SMSG_AUCTION_BIDDER_NOTIFICATION, (8*4)); data << uint32(location); data << uint32(auctionId); - data << uint64(bidder); + data << bidder; data << uint32(bidSum); data << uint32(diff); data << uint32(itemEntry); diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index b22de311602..17b02bb938a 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -942,8 +942,8 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recvData) recvData >> gem_guids[i]; //cheat -> tried to socket same gem multiple times - if ((gem_guids[0] && (gem_guids[0] == gem_guids[1] || gem_guids[0] == gem_guids[2])) || - (gem_guids[1] && (gem_guids[1] == gem_guids[2]))) + if ((!gem_guids[0].IsEmpty() && (gem_guids[0] == gem_guids[1] || gem_guids[0] == gem_guids[2])) || + (!gem_guids[1].IsEmpty() && (gem_guids[1] == gem_guids[2]))) return; Item* itemTarget = _player->GetItemByGuid(item_guid); @@ -959,7 +959,7 @@ void WorldSession::HandleSocketOpcode(WorldPacket& recvData) Item* Gems[MAX_GEM_SOCKETS]; for (int i = 0; i < MAX_GEM_SOCKETS; ++i) - Gems[i] = gem_guids[i] ? _player->GetItemByGuid(gem_guids[i]) : nullptr; + Gems[i] = !gem_guids[i].IsEmpty() ? _player->GetItemByGuid(gem_guids[i]) : nullptr; GemPropertiesEntry const* GemProps[MAX_GEM_SOCKETS]; for (int i = 0; i < MAX_GEM_SOCKETS; ++i) //get geminfo from dbc storage diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 33952a1dfda..f734a56b624 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -43,7 +43,7 @@ void BuildPartyLockDungeonBlock(WorldPacket& data, lfg::LfgLockPartyMap const& l data << uint8(lockMap.size()); for (lfg::LfgLockPartyMap::const_iterator it = lockMap.begin(); it != lockMap.end(); ++it) { - data << uint64(it->first); // Player guid + data << it->first; // Player guid BuildPlayerLockDungeonBlock(data, it->second); } } @@ -394,7 +394,7 @@ void WorldSession::SendLfgRoleChosen(ObjectGuid guid, uint8 roles) GetPlayerInfo(), guid.ToString(), roles); WorldPacket data(SMSG_LFG_ROLE_CHOSEN, 8 + 1 + 4); - data << uint64(guid); // Guid + data << guid; // Guid data << uint8(roles > 0); // Ready data << uint32(roles); // Roles SendPacket(&data); @@ -424,7 +424,7 @@ void WorldSession::SendLfgRoleCheckUpdate(lfg::LfgRoleCheck const& roleCheck) // Leader info MUST be sent 1st :S ObjectGuid guid = roleCheck.leader; uint8 roles = roleCheck.roles.find(guid)->second; - data << uint64(guid); // Guid + data << guid; // Guid data << uint8(roles > 0); // Ready data << uint32(roles); // Roles Player* player = ObjectAccessor::FindConnectedPlayer(guid); @@ -437,7 +437,7 @@ void WorldSession::SendLfgRoleCheckUpdate(lfg::LfgRoleCheck const& roleCheck) guid = it->first; roles = it->second; - data << uint64(guid); // Guid + data << guid; // Guid data << uint8(roles > 0); // Ready data << uint32(roles); // Roles player = ObjectAccessor::FindConnectedPlayer(guid); @@ -547,7 +547,7 @@ void WorldSession::SendLfgBootProposalUpdate(lfg::LfgPlayerBoot const& boot) data << uint8(boot.inProgress); // Vote in progress data << uint8(playerVote != lfg::LFG_ANSWER_PENDING); // Did Vote data << uint8(playerVote == lfg::LFG_ANSWER_AGREE); // Agree - data << uint64(boot.victim); // Victim GUID + data << boot.victim; // Victim GUID data << uint32(votesNum); // Total Votes data << uint32(agreeNum); // Agree Count data << uint32(secsleft); // Time Left diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 1515c079311..8618cf21683 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -845,7 +845,7 @@ void WorldSession::HandleRequestAccountData(WorldPacket& recvData) dest.resize(destSize); WorldPacket data(SMSG_UPDATE_ACCOUNT_DATA, 8+4+4+4+destSize); - data << uint64(_player ? _player->GetGUID() : ObjectGuid::Empty); + data << (_player ? _player->GetGUID() : ObjectGuid::Empty); data << uint32(type); // type (0-7) data << uint32(adata->Time); // unix time data << uint32(size); // decompressed length diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 113ae6501e4..69b7d5e11a2 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -134,7 +134,7 @@ void WorldSession::HandleQuestgiverAcceptQuestOpcode(WorldPacket& recvData) if (Player* playerQuestObject = object->ToPlayer()) { - if ((_player->GetPlayerSharingQuest() && _player->GetPlayerSharingQuest() != guid) || !playerQuestObject->CanShareQuest(questId)) + if ((!_player->GetPlayerSharingQuest().IsEmpty() && _player->GetPlayerSharingQuest() != guid) || !playerQuestObject->CanShareQuest(questId)) { CLOSE_GOSSIP_CLEAR_SHARING_INFO(); return; diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index 0b9c767123b..f61d7391bbb 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -151,7 +151,7 @@ namespace Movement if (move_spline.Finalized()) return; - bool transport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID(); + bool transport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && !unit->GetTransGUID().IsEmpty(); Location loc; if (move_spline.onTransport == transport) loc = move_spline.ComputePosition(); @@ -191,7 +191,7 @@ namespace Movement { args.splineId = splineIdGen.NewId(); // Elevators also use MOVEMENTFLAG_ONTRANSPORT but we do not keep track of their position changes - args.TransformForTransport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID(); + args.TransformForTransport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && !unit->GetTransGUID().IsEmpty(); // mix existing state into new args.flags.canswim = unit->CanSwim(); args.walk = unit->HasUnitMovementFlag(MOVEMENTFLAG_WALKING); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 52282250c81..711bbbf2744 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -299,7 +299,7 @@ uint8 Aura::BuildEffectMaskForOwner(SpellInfo const* spellProto, uint8 available Aura* Aura::TryRefreshStackOrCreate(AuraCreateInfo& createInfo, bool updateEffectMask) { - ASSERT_NODEBUGINFO(createInfo.Caster || createInfo.CasterGUID); + ASSERT_NODEBUGINFO(createInfo.Caster || !createInfo.CasterGUID.IsEmpty()); if (createInfo.IsRefresh) *createInfo.IsRefresh = false; @@ -353,7 +353,7 @@ Aura* Aura::TryCreate(AuraCreateInfo& createInfo) Aura* Aura::Create(AuraCreateInfo& createInfo) { // try to get caster of aura - if (createInfo.CasterGUID) + if (!createInfo.CasterGUID.IsEmpty()) { // world gameobjects can't own auras and they send empty casterguid // checked on sniffs with spell 22247 @@ -564,7 +564,7 @@ void Aura::_ApplyForTarget(Unit* target, Unit* caster, AuraApplication* auraApp) { if (m_spellInfo->IsCooldownStartedOnEvent()) { - Item* castItem = m_castItemGuid ? caster->ToPlayer()->GetItemByGuid(m_castItemGuid) : nullptr; + Item* castItem = !m_castItemGuid.IsEmpty() ? caster->ToPlayer()->GetItemByGuid(m_castItemGuid) : nullptr; caster->GetSpellHistory()->StartCooldown(m_spellInfo, castItem ? castItem->GetEntry() : 0, nullptr, true); } } @@ -1127,7 +1127,7 @@ bool Aura::CanBeSaved() const return false; // don't save permanent auras triggered by items, they'll be recasted on login if necessary - if (GetCastItemGUID() && IsPermanent()) + if (!GetCastItemGUID().IsEmpty() && IsPermanent()) return false; return true; @@ -1957,7 +1957,7 @@ bool Aura::CanStackWith(Aura const* existingAura) const // don't allow passive area auras to stack if (m_spellInfo->IsMultiSlotAura() && !IsArea()) return true; - if (GetCastItemGUID() && existingAura->GetCastItemGUID()) + if (!GetCastItemGUID().IsEmpty() && !existingAura->GetCastItemGUID().IsEmpty()) if (GetCastItemGUID() != existingAura->GetCastItemGUID() && m_spellInfo->HasAttribute(SPELL_ATTR0_CU_ENCHANT_PROC)) return true; // same spell with same caster should not stack diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index b2660e1449d..a76bc21d886 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -458,7 +458,7 @@ void SpellCastTargets::Update(WorldObject* caster) } // update positions by transport move - if (HasSrc() && m_src._transportGUID) + if (HasSrc() && !m_src._transportGUID.IsEmpty()) { if (WorldObject* transport = ObjectAccessor::GetWorldObject(*caster, m_src._transportGUID)) { @@ -467,7 +467,7 @@ void SpellCastTargets::Update(WorldObject* caster) } } - if (HasDst() && m_dst._transportGUID) + if (HasDst() && !m_dst._transportGUID.IsEmpty()) { if (WorldObject* transport = ObjectAccessor::GetWorldObject(*caster, m_dst._transportGUID)) { @@ -1732,7 +1732,7 @@ void Spell::SelectEffectTypeImplicitTargets(SpellEffectInfo const& spellEffectIn { case SPELL_EFFECT_SUMMON_RAF_FRIEND: case SPELL_EFFECT_SUMMON_PLAYER: - if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->GetTarget()) + if (m_caster->GetTypeId() == TYPEID_PLAYER && !m_caster->ToPlayer()->GetTarget().IsEmpty()) { WorldObject* target = ObjectAccessor::FindPlayer(m_caster->ToPlayer()->GetTarget()); CallScriptObjectTargetSelectHandlers(target, spellEffectInfo.EffectIndex, SpellImplicitTargetInfo()); @@ -3325,7 +3325,7 @@ void Spell::_cast(bool skipCheck) } // cancel at lost explicit target during cast - if (m_targets.GetObjectTargetGUID() && !m_targets.GetObjectTarget()) + if (!m_targets.GetObjectTargetGUID().IsEmpty() && !m_targets.GetObjectTarget()) { cancel(); return; @@ -3816,7 +3816,7 @@ void Spell::update(uint32 difftime) return; } - if (m_targets.GetUnitTargetGUID() && !m_targets.GetUnitTarget()) + if (!m_targets.GetUnitTargetGUID().IsEmpty() && !m_targets.GetUnitTarget()) { TC_LOG_DEBUG("spells", "Spell {} is cancelled due to removal of target.", m_spellInfo->Id); cancel(); @@ -7332,10 +7332,10 @@ bool Spell::UpdatePointers() m_originalCaster = nullptr; } - if (m_focusObjectGUID) + if (!m_focusObjectGUID.IsEmpty()) focusObject = ObjectAccessor::GetGameObject(*m_caster, m_focusObjectGUID); - if (m_castItemGUID && m_caster->GetTypeId() == TYPEID_PLAYER) + if (!m_castItemGUID.IsEmpty() && m_caster->GetTypeId() == TYPEID_PLAYER) { m_CastItem = m_caster->ToPlayer()->GetItemByGuid(m_castItemGUID); // cast item not found, somehow the item is no longer where we expected diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 9fc4471259d..96495d906b7 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2797,7 +2797,7 @@ void Spell::EffectTameCreature() return; Unit* unitCaster = GetUnitCasterForEffectHandlers(); - if (!unitCaster || unitCaster->GetPetGUID()) + if (!unitCaster || !unitCaster->GetPetGUID().IsEmpty()) return; if (!unitTarget) @@ -5121,7 +5121,7 @@ void Spell::EffectCreateTamedPet() if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || unitTarget->GetPetGUID() || unitTarget->GetClass() != CLASS_HUNTER) + if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || !unitTarget->GetPetGUID().IsEmpty() || unitTarget->GetClass() != CLASS_HUNTER) return; uint32 creatureEntry = effectInfo->MiscValue; diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 59f89c24b7a..5fba3d77ea4 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -459,7 +459,7 @@ std::string GmTicket::GetAssignedToName() const { std::string name; // save queries if ticket is not assigned - if (_assignedTo) + if (!_assignedTo.IsEmpty()) sCharacterCache->GetCharacterNameByGuid(_assignedTo, name); return name; diff --git a/src/server/scripts/Battlefield/BattlefieldWG.cpp b/src/server/scripts/Battlefield/BattlefieldWG.cpp index 9aa93d76ca1..559aa8c7d46 100644 --- a/src/server/scripts/Battlefield/BattlefieldWG.cpp +++ b/src/server/scripts/Battlefield/BattlefieldWG.cpp @@ -650,7 +650,7 @@ void BattlefieldWG::UpdateCounterVehicle(bool init) void BattlefieldWG::OnBattleEnd(bool endByTimer) { // Remove relic - if (m_titansRelicGUID) + if (!m_titansRelicGUID.IsEmpty()) if (GameObject* relic = GetGameObject(m_titansRelicGUID)) relic->RemoveFromWorld(); m_titansRelicGUID.Clear(); diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 6b8fa1b2093..5d33e5d6e98 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -218,7 +218,7 @@ public: return; } - if (sCharacterCache->GetCharacterGuidByName(delInfo.name)) + if (!sCharacterCache->GetCharacterGuidByName(delInfo.name).IsEmpty()) { handler->PSendSysMessage(LANG_CHARACTER_DELETED_SKIP_NAME, delInfo.name.c_str(), delInfo.guid.GetCounter(), delInfo.accountId); return; diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index cdd03bea274..b4331ce67bd 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -192,7 +192,7 @@ public: return false; } - if (player->GetTarget()) + if (!player->GetTarget().IsEmpty()) unit->PlayDistanceSound(soundId, player); else unit->PlayDirectSound(soundId, player); @@ -421,15 +421,15 @@ public: handler->SetSentErrorMessage(true); return false; } - data << uint64(obj->GetGUID()); + data << obj->GetGUID(); } else if (type == "myguid") { - data << uint64(player->GetGUID()); + data << player->GetGUID(); } else if (type == "itsguid") { - data << uint64(unit->GetGUID()); + data << unit->GetGUID(); } else if (type == "itspos") { diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index 38861797e85..0012bec5156 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -302,7 +302,8 @@ public: if (GameObject* object = handler->GetObjectFromPlayerMapByDbGuid(spawnId)) { Player const* const player = handler->GetSession()->GetPlayer(); - if (ObjectGuid ownerGuid = object->GetOwnerGUID()) + ObjectGuid ownerGuid = object->GetOwnerGUID(); + if (!ownerGuid.IsEmpty()) { Unit* owner = ObjectAccessor::GetUnit(*player, ownerGuid); if (!owner || !ownerGuid.IsPlayer()) diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 2f64f2b8f9d..f6df2fdec40 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1954,7 +1954,7 @@ public: Player* player = handler->GetSession()->GetPlayer(); // accept only explicitly selected target (not implicitly self targeting case) - Creature* target = player->GetTarget() ? handler->getSelectedCreature() : nullptr; + Creature* target = !player->GetTarget().IsEmpty() ? handler->getSelectedCreature() : nullptr; if (target) { if (target->IsPet()) diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 15150eea1c5..99a5a524a2c 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1024,7 +1024,7 @@ public: Player* player = handler->GetSession()->GetPlayer(); - if (player->GetPetGUID()) + if (!player->GetPetGUID().IsEmpty()) { handler->SendSysMessage (LANG_YOU_ALREADY_HAVE_PET); handler->SetSentErrorMessage (true); diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp index 072cc68db78..f7d29622604 100644 --- a/src/server/scripts/Commands/cs_pet.cpp +++ b/src/server/scripts/Commands/cs_pet.cpp @@ -86,7 +86,7 @@ public: return false; } - if (player->GetPetGUID()) + if (!player->GetPetGUID().IsEmpty()) { handler->PSendSysMessage("You already have a pet"); handler->SetSentErrorMessage(true); diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index 3b357fcde23..a6ef3c57b15 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -250,7 +250,7 @@ public: target->SendTalentsInfoData(true); return true; } - else if (targetGuid) + else if (!targetGuid.IsEmpty()) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_ADD_AT_LOGIN_FLAG); stmt->setUInt16(0, uint16(AT_LOGIN_NONE | AT_LOGIN_RESET_PET_TALENTS)); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp index 38a066f751c..23d89a2ec1e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp @@ -247,7 +247,7 @@ public: { MobDeath_Timer = 2500; - if (RingBossGUID) + if (!RingBossGUID.IsEmpty()) { Creature* boss = ObjectAccessor::GetCreature(*me, RingBossGUID); if (boss && !boss->IsAlive() && boss->isDead()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index a7c359818e1..9b49430b5c4 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -374,7 +374,7 @@ public: void TombOfSevenEvent() { - if (GhostKillCount < TOMB_OF_SEVEN_BOSS_NUM && TombBossGUIDs[TombEventCounter]) + if (GhostKillCount < TOMB_OF_SEVEN_BOSS_NUM && !TombBossGUIDs[TombEventCounter].IsEmpty()) { if (Creature* boss = instance->GetCreature(TombBossGUIDs[TombEventCounter])) { @@ -425,7 +425,7 @@ public: void Update(uint32 diff) override { - if (TombEventStarterGUID && GhostKillCount < TOMB_OF_SEVEN_BOSS_NUM) + if (!TombEventStarterGUID.IsEmpty() && GhostKillCount < TOMB_OF_SEVEN_BOSS_NUM) { if (TombTimer <= diff) { @@ -449,7 +449,7 @@ public: } } else TombTimer -= diff; } - if (GhostKillCount >= TOMB_OF_SEVEN_BOSS_NUM && TombEventStarterGUID) + if (GhostKillCount >= TOMB_OF_SEVEN_BOSS_NUM && !TombEventStarterGUID.IsEmpty()) TombOfSevenEnd(); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp index 970b55aafe9..c5492c7ef91 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp @@ -141,7 +141,7 @@ class instance_molten_core : public InstanceMapScript void SummonMajordomoExecutus() { _executusSchedule = false; - if (_majordomoExecutusGUID) + if (!_majordomoExecutusGUID.IsEmpty()) return; if (GetBossState(BOSS_MAJORDOMO_EXECUTUS) != DONE) diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 03b3373179e..d7d44e016bc 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -260,7 +260,7 @@ class instance_deadmines : public InstanceMapScript switch (type) { case EVENT_STATE: - if (DefiasCannonGUID && IronCladDoorGUID) + if (!DefiasCannonGUID.IsEmpty() && !IronCladDoorGUID.IsEmpty()) State = data; break; } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index a67d266d288..de53991fef5 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -336,9 +336,12 @@ class go_acherus_soul_prison : public GameObjectScript bool OnGossipHello(Player* player) override { if (Creature* anchor = me->FindNearestCreature(29521, 15)) - if (ObjectGuid prisonerGUID = anchor->AI()->GetGUID()) + { + ObjectGuid prisonerGUID = anchor->AI()->GetGUID(); + if (!prisonerGUID.IsEmpty()) if (Creature* prisoner = ObjectAccessor::GetCreature(*player, prisonerGUID)) ENSURE_AI(npc_unworthy_initiate::npc_unworthy_initiateAI, prisoner->AI())->EventStart(anchor, player); + } return false; } diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index f50d6c03f3a..cba23ee98e0 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -531,7 +531,7 @@ public: void MoveInLineOfSight(Unit* who) override { - if (PlayerGUID || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE)) + if (!PlayerGUID.IsEmpty() || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE)) return; if (MeetQuestCondition(who->ToPlayer())) @@ -540,7 +540,7 @@ public: void UpdateAI(uint32 diff) override { - if (PlayerGUID && !me->GetVictim() && me->IsAlive()) + if (!PlayerGUID.IsEmpty() && !me->GetVictim() && me->IsAlive()) { if (ExecuteSpeech_Timer <= diff) { diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 1f06eb6bb82..c283c3bd40e 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -982,7 +982,7 @@ class at_bring_your_orphan_to : public AreaTriggerScript break; } - if (questId && orphanId && getOrphanGUID(player, orphanId) && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) + if (questId && orphanId && !getOrphanGUID(player, orphanId).IsEmpty() && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(questId); return true; @@ -1043,7 +1043,7 @@ class npc_cw_area_trigger : public CreatureScript orphanId = ORPHAN_BLOOD_ELF; break; case NPC_SILVERMOON_01_CW_TRIGGER: - if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_INCOMPLETE && getOrphanGUID(player, ORPHAN_BLOOD_ELF)) + if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_INCOMPLETE && !getOrphanGUID(player, ORPHAN_BLOOD_ELF).IsEmpty()) { player->AreaExploredOrEventHappens(QUEST_NOW_WHEN_I_GROW_UP); if (player->GetQuestStatus(QUEST_NOW_WHEN_I_GROW_UP) == QUEST_STATUS_COMPLETE) @@ -1062,7 +1062,7 @@ class npc_cw_area_trigger : public CreatureScript } break; } - if (questId && orphanId && getOrphanGUID(player, orphanId) && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) + if (questId && orphanId && !getOrphanGUID(player, orphanId).IsEmpty() && player->GetQuestStatus(questId) == QUEST_STATUS_INCOMPLETE) player->AreaExploredOrEventHappens(questId); } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index b60826b64c1..ebb2495d95b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -939,7 +939,7 @@ void hyjalAI::WaypointReached(uint32 waypointId, uint32 /*pathId*/) TeleportTimer = 20000; if (me->GetEntry() == JAINA) DoCast(me, SPELL_MASS_TELEPORT, false); - if (me->GetEntry() == THRALL && DummyGuid) + if (me->GetEntry() == THRALL && !DummyGuid.IsEmpty()) { if (Creature* creature = ObjectAccessor::GetCreature(*me, DummyGuid)) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 5eda5bcbd93..7497a5b3318 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -757,7 +757,7 @@ public: StomachEnterTimer = 13800; } else StomachEnterTimer -= diff; - if (StomachEnterVisTimer && StomachEnterTarget) + if (StomachEnterVisTimer && !StomachEnterTarget.IsEmpty()) { if (StomachEnterVisTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index f6af15361ac..a7c085ee9ad 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -124,7 +124,7 @@ public: { aqsentinelAI* cai = ENSURE_AI(aqsentinelAI, (c)->AI()); for (int32 i = 0; i < 3; ++i) - if (NearbyGUID[i] && NearbyGUID[i] != c->GetGUID()) + if (!NearbyGUID[i].IsEmpty() && NearbyGUID[i] != c->GetGUID()) cai->AddBuddyToList(NearbyGUID[i]); cai->AddBuddyToList(me->GetGUID()); } diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 798ee849699..3019c728530 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -413,7 +413,7 @@ public: if (WaveTimer <= diff) { - if (Wave < 6 && AffrayChallenger[Wave] && !EventBigWill) + if (Wave < 6 && !AffrayChallenger[Wave].IsEmpty() && !EventBigWill) { Talk(SAY_TWIGGY_FLATHEAD_FRAY); Creature* creature = ObjectAccessor::GetCreature(*me, AffrayChallenger[Wave]); @@ -441,7 +441,7 @@ public: WaveTimer = 1000; } } - else if (Wave >= 6 && EventBigWill && BigWill) + else if (Wave >= 6 && EventBigWill && !BigWill.IsEmpty()) { Creature* creature = ObjectAccessor::GetCreature(*me, BigWill); if (!creature || !creature->IsAlive()) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 2a32a48fcfb..3a789907f56 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -395,7 +395,7 @@ public: } }else uiPhaseTimer -= uiDiff; - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + if (!UpdateVictim() || !me->m_movementInfo.transport.guid.IsEmpty()) return; if (uiInterceptTimer <= uiDiff) @@ -544,7 +544,7 @@ public: uiFireBallTimer = 5000; } else uiFireBallTimer -= uiDiff; - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + if (!UpdateVictim() || !me->m_movementInfo.transport.guid.IsEmpty()) return; if (uiFireBallTimer <= uiDiff) @@ -687,7 +687,7 @@ public: } }else uiPhaseTimer -= uiDiff; - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + if (!UpdateVictim() || !me->m_movementInfo.transport.guid.IsEmpty()) return; if (uiChainLightningTimer <= uiDiff) @@ -838,7 +838,7 @@ public: } }else uiPhaseTimer -= uiDiff; - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + if (!UpdateVictim() || !me->m_movementInfo.transport.guid.IsEmpty()) return; if (uiLightningArrowsTimer <= uiDiff) @@ -991,7 +991,7 @@ public: } } else uiPhaseTimer -= uiDiff; - if (!UpdateVictim() || me->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT)) + if (!UpdateVictim() || !me->m_movementInfo.transport.guid.IsEmpty()) return; if (uiEviscerateTimer <= uiDiff) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index c75a4f5ba0a..23db90dff61 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -932,7 +932,7 @@ struct npc_ball_of_flame : public ScriptedAI void MovementInform(uint32 type, uint32 id) override { - if (type == CHASE_MOTION_TYPE && id == _chaseGUID.GetCounter() && _chaseGUID) + if (type == CHASE_MOTION_TYPE && id == _chaseGUID.GetCounter() && !_chaseGUID.IsEmpty()) { me->RemoveAurasDueToSpell(SPELL_BALL_OF_FLAMES_PERIODIC); DoCastSelf(SPELL_FLAMES); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index b1cba9ac525..f8f58bc7172 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -401,7 +401,7 @@ struct boss_blood_queen_lana_thel : public BossAI break; } case EVENT_DELIRIOUS_SLASH: - if (_offtankGUID && me->GetAnimTier() != AnimTier::Fly) + if (!_offtankGUID.IsEmpty() && me->GetAnimTier() != AnimTier::Fly) if (Player* _offtank = ObjectAccessor::GetPlayer(*me, _offtankGUID)) DoCast(_offtank, SPELL_DELIRIOUS_SLASH); events.ScheduleEvent(EVENT_DELIRIOUS_SLASH, 20s, 24s, EVENT_GROUP_NORMAL); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index a0824886d4a..3ec7c8f8325 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -219,7 +219,7 @@ struct npc_webwrap : public NullCreatureAI void JustDied(Unit* /*killer*/) override { - if (victimGUID) + if (!victimGUID.IsEmpty()) if (Unit* victim = ObjectAccessor::GetUnit(*me, victimGUID)) victim->RemoveAurasDueToSpell(SPELL_WEB_WRAP, me->GetGUID()); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index d39fe832d1d..21e2f236b8e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1781,7 +1781,7 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScript // in longer terms this means if spell picks target X then 2nd cast of this spell will pick smth else // and if 3rd picks X again 4th will pick smth else (by not limiting the cast to certain caster). if (targets.size() > 1) - if (malygos && malygos->AI()->GetGUID(DATA_LAST_TARGET_BARRAGE_GUID)) + if (malygos && !malygos->AI()->GetGUID(DATA_LAST_TARGET_BARRAGE_GUID).IsEmpty()) targets.remove_if(Trinity::ObjectGUIDCheck(malygos->AI()->GetGUID(DATA_LAST_TARGET_BARRAGE_GUID))); // Remove players not on Hover Disk from second list diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 518ff37bfeb..a2bfddfa98e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -940,7 +940,7 @@ class instance_ulduar : public InstanceMapScript data << ColossusData << ' ' << _algalonTimer << ' ' << uint32(_algalonSummoned ? 1 : 0); for (uint8 i = 0; i < 4; ++i) - data << ' ' << uint32(KeeperGUIDs[i] ? 1 : 0); + data << ' ' << uint32(!KeeperGUIDs[i].IsEmpty() ? 1 : 0); data << ' ' << _CoUAchivePlayerDeathMask; } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 2fa84167245..f65c00fcbb1 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -335,7 +335,7 @@ void OPvPCapturePointZM_Graveyard::SetBeaconState(uint32 controlling_faction) if (m_GraveyardState & ZM_GRAVEYARD_N) { // gy was neutral, thus neutral banner was spawned, it is possible that someone was taking the flag to the gy - if (m_FlagCarrierGUID) + if (!m_FlagCarrierGUID.IsEmpty()) { // remove flag from carrier, reset flag carrier guid Player* p = ObjectAccessor::FindPlayer(m_FlagCarrierGUID); @@ -374,7 +374,7 @@ bool OPvPCapturePointZM_Graveyard::HandleGossipOption(Player* player, Creature* if (itr != m_CreatureTypes.end()) { // if the flag is already taken, then return - if (m_FlagCarrierGUID) + if (!m_FlagCarrierGUID.IsEmpty()) return true; if (itr->second == ZM_ALLIANCE_FIELD_SCOUT) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index 1b73683d0a5..fe9bd6da08f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -306,7 +306,7 @@ struct boss_leotheras_the_blind : public BossAI // and reseting equipment me->LoadEquipment(); - if (instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)) + if (!instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER).IsEmpty()) { if (Unit* victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER))) AddThreat(victim, 1); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 623822f112c..db48a98343e 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -1175,10 +1175,10 @@ class spell_hun_tame_beast : public SpellScript } } - if (caster->GetCharmedGUID()) + if (!caster->GetCharmedGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; - if (target->GetOwnerGUID()) + if (!target->GetOwnerGUID().IsEmpty()) { caster->SendTameFailure(PETTAME_CREATUREALREADYOWNED); return SPELL_FAILED_DONT_REPORT; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index df0e4b1e3e8..992162938c0 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -803,7 +803,7 @@ public: return; if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE) - if (DoctorGUID) + if (!DoctorGUID.IsEmpty()) if (Creature* doctor = ObjectAccessor::GetCreature(*me, DoctorGUID)) ENSURE_AI(npc_doctor::npc_doctorAI, doctor->AI())->PatientSaved(me, player, Coord); @@ -849,7 +849,7 @@ public: me->setDeathState(JUST_DIED); me->SetDynamicFlag(32); - if (DoctorGUID) + if (!DoctorGUID.IsEmpty()) if (Creature* doctor = ObjectAccessor::GetCreature((*me), DoctorGUID)) ENSURE_AI(npc_doctor::npc_doctorAI, doctor->AI())->PatientDied(Coord); } |