diff options
44 files changed, 182 insertions, 137 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 6243399d4aa..bcdfbbc3384 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -702,7 +702,7 @@ void AchievementMgr::SendAchievementEarned(AchievementEntry const* achievement) // broadcast realm first reached WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, GetPlayer()->GetName().size() + 1 + 8 + 4 + 4); data << GetPlayer()->GetName(); - data << uint64(GetPlayer()->GetGUID()); + data << GetPlayer()->GetGUID(); data << uint32(achievement->ID); std::size_t linkTypePos = data.wpos(); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index dabe24fc729..b6965d4c1f9 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -574,7 +574,7 @@ void BattlegroundAV::EventPlayerDestroyedPoint(BG_AV_Nodes node) { uint8 tmp = node-BG_AV_NODES_DUNBALDAR_SOUTH; //despawn marshal - if (BgCreatures[AV_CPLACE_A_MARSHAL_SOUTH + tmp]) + if (!BgCreatures[AV_CPLACE_A_MARSHAL_SOUTH + tmp].IsEmpty()) DelCreature(AV_CPLACE_A_MARSHAL_SOUTH + tmp); else TC_LOG_ERROR("bg.battleground", "BG_AV: playerdestroyedpoint: marshal {} doesn't exist", AV_CPLACE_A_MARSHAL_SOUTH + tmp); @@ -632,10 +632,10 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) TC_LOG_DEBUG("bg.battleground", "bg_av depopulating mine {} (0=north, 1=south)", mine); if (mine == AV_SOUTH_MINE) for (uint16 i=AV_CPLACE_MINE_S_S_MIN; i <= AV_CPLACE_MINE_S_S_MAX; i++) - if (BgCreatures[i]) + if (!BgCreatures[i].IsEmpty()) DelCreature(i); /// @todo just set the respawntime to 999999 for (uint16 i=((mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_1_MIN:AV_CPLACE_MINE_S_1_MIN); i <= ((mine == AV_NORTH_MINE)?AV_CPLACE_MINE_N_3:AV_CPLACE_MINE_S_3); i++) - if (BgCreatures[i]) + if (!BgCreatures[i].IsEmpty()) DelCreature(i); /// @todo here also } SendMineWorldStates(mine); @@ -732,7 +732,7 @@ void BattlegroundAV::PopulateNode(BG_AV_Nodes node) else creatureid = (owner == ALLIANCE)? AV_NPC_A_GRAVEDEFENSE3 : AV_NPC_H_GRAVEDEFENSE3; //spiritguide - if (BgCreatures[node]) + if (!BgCreatures[node].IsEmpty()) DelCreature(node); if (!AddSpiritGuide(node, BG_AV_CreaturePos[node], GetTeamIndexByTeamId(owner))) TC_LOG_ERROR("bg.battleground", "AV: couldn't spawn spiritguide at node {}", node); @@ -765,9 +765,9 @@ void BattlegroundAV::PopulateNode(BG_AV_Nodes node) void BattlegroundAV::DePopulateNode(BG_AV_Nodes node) { uint32 c_place = AV_CPLACE_DEFENSE_STORM_AID + (4 * node); - for (uint8 i=0; i<4; i++) - if (BgCreatures[c_place+i]) - DelCreature(c_place+i); + for (uint8 i = 0; i < 4; i++) + if (!BgCreatures[c_place + i].IsEmpty()) + DelCreature(c_place + i); //spiritguide if (!IsTower(node) && !BgCreatures[node].IsEmpty()) DelCreature(node); @@ -1496,7 +1496,7 @@ void BattlegroundAV::ResetBGSubclass() m_Mine_Timer = AV_MINE_TICK_TIMER; for (uint16 i = 0; i < AV_CPLACE_MAX + AsUnderlyingType(AV_STATICCPLACE_MAX); i++) - if (BgCreatures[i]) + if (!BgCreatures[i].IsEmpty()) DelCreature(i); } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp index a9e55f5cc33..a8637e23d2a 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -755,7 +755,7 @@ void BattlegroundEY::EventTeamCapturedPoint(Player* player, uint32 Point) else SendBroadcastText(m_CapturingPointTypes[Point].MessageIdHorde, CHAT_MSG_BG_SYSTEM_HORDE, player); - if (BgCreatures[Point]) + if (!BgCreatures[Point].IsEmpty()) DelCreature(Point); WorldSafeLocsEntry const* sg = sWorldSafeLocsStore.LookupEntry(m_CapturingPointTypes[Point].GraveyardId); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index fe9bae19bba..1496dec0261 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -982,7 +982,7 @@ void BattlegroundSA::UpdateDemolisherSpawns() { for (uint8 i = BG_SA_DEMOLISHER_1; i <= BG_SA_DEMOLISHER_8; i++) { - if (BgCreatures[i]) + if (!BgCreatures[i].IsEmpty()) { if (Creature* Demolisher = GetBGCreature(i)) { @@ -1013,10 +1013,10 @@ void BattlegroundSA::SendTransportInit(Player* player) if (!BgObjects[BG_SA_BOAT_ONE].IsEmpty() || !BgObjects[BG_SA_BOAT_TWO].IsEmpty()) { UpdateData transData; - if (BgObjects[BG_SA_BOAT_ONE]) + if (!BgObjects[BG_SA_BOAT_ONE].IsEmpty()) GetBGObject(BG_SA_BOAT_ONE)->BuildCreateUpdateBlockForPlayer(&transData, player); - if (BgObjects[BG_SA_BOAT_TWO]) + if (!BgObjects[BG_SA_BOAT_TWO].IsEmpty()) GetBGObject(BG_SA_BOAT_TWO)->BuildCreateUpdateBlockForPlayer(&transData, player); WorldPacket packet; @@ -1027,12 +1027,12 @@ void BattlegroundSA::SendTransportInit(Player* player) void BattlegroundSA::SendTransportsRemove(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]) + if (!BgObjects[BG_SA_BOAT_ONE].IsEmpty()) GetBGObject(BG_SA_BOAT_ONE)->BuildOutOfRangeUpdateBlock(&transData); - if (BgObjects[BG_SA_BOAT_TWO]) + if (!BgObjects[BG_SA_BOAT_TWO].IsEmpty()) GetBGObject(BG_SA_BOAT_TWO)->BuildOutOfRangeUpdateBlock(&transData); WorldPacket packet; transData.BuildPacket(&packet); diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp index 740f9d56a2c..0669b966826 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -776,7 +776,7 @@ void Channel::Invite(Player const* player, std::string const& newname) void Channel::SetOwner(ObjectGuid guid, bool exclaim) { - if (_ownerGuid) + if (!_ownerGuid.IsEmpty()) { auto itr = _playersStore.find(_ownerGuid); if (itr != _playersStore.end()) @@ -784,7 +784,7 @@ void Channel::SetOwner(ObjectGuid guid, bool exclaim) } _ownerGuid = guid; - if (_ownerGuid) + if (!_ownerGuid.IsEmpty()) { uint8 oldFlag = GetPlayerFlags(_ownerGuid); auto itr = _playersStore.find(_ownerGuid); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 42c74538b32..2208f696fd3 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -55,7 +55,7 @@ bool ChatHandler::HasLowerSecurity(Player* target, ObjectGuid guid, bool strong) if (target) target_session = target->GetSession(); - else if (guid) + else if (!guid.IsEmpty()) target_account = sCharacterCache->GetCharacterAccountIdByGuid(guid); if (!target_session && !target_account) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 85ffdabda5b..072f9c06ae0 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -365,7 +365,8 @@ void LFGMgr::Update(uint32 diff) { guid = itPlayers->first; SetState(guid, LFG_STATE_PROPOSAL); - if (ObjectGuid gguid = GetGroup(guid)) + ObjectGuid gguid = GetGroup(guid); + if (!gguid.IsEmpty()) { SetState(gguid, LFG_STATE_PROPOSAL); SendLfgUpdateParty(guid, LfgUpdateData(LFG_UPDATETYPE_PROPOSAL_BEGIN, GetSelectedDungeons(guid), GetComment(guid))); @@ -632,7 +633,7 @@ void LFGMgr::LeaveLfg(ObjectGuid guid, bool disconnected) switch (state) { case LFG_STATE_QUEUED: - if (gguid) + if (!gguid.IsEmpty()) { LfgState newState = LFG_STATE_NONE; LfgState oldState = GetOldState(gguid); @@ -662,7 +663,7 @@ void LFGMgr::LeaveLfg(ObjectGuid guid, bool disconnected) } break; case LFG_STATE_ROLECHECK: - if (gguid) + if (!gguid.IsEmpty()) UpdateRoleCheck(gguid); // No player to update role = LFG_ROLECHECK_ABORTED break; case LFG_STATE_PROPOSAL: @@ -1087,7 +1088,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, ObjectGuid guid, bool accept) if (sendUpdate) SendLfgUpdateProposal(pguid, proposal); - if (gguid) + if (!gguid.IsEmpty()) { waitTime = int32((joinTime - queue.GetJoinTime(gguid)) / IN_MILLISECONDS); SendLfgUpdateParty(pguid, updateData); @@ -1375,7 +1376,7 @@ void LFGMgr::TeleportPlayer(Player* player, bool out, bool fromOpcode /*= false* error = LFG_TELEPORTERROR_FATIGUE; else if (player->GetVehicle()) error = LFG_TELEPORTERROR_IN_VEHICLE; - else if (player->GetCharmedGUID()) + else if (!player->GetCharmedGUID().IsEmpty()) error = LFG_TELEPORTERROR_CHARMING; else if (player->HasAura(9454)) // check Freeze debuff error = LFG_TELEPORTERROR_INVALID_LOCATION; diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index c01dbc967c3..ba9bbca063e 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -241,7 +241,7 @@ void LFGGroupScript::OnInviteMember(Group* group, ObjectGuid guid) // No gguid == new group being formed // No leader == after group creation first invite is new leader // leader and no gguid == first invite after leader is added to new group (this is the real invite) - if (leader && !gguid) + if (!leader.IsEmpty() && gguid.IsEmpty()) sLFGMgr->LeaveLfg(leader); } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index f7e1f2caf53..3038e931aad 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -942,7 +942,7 @@ void Creature::RegenerateHealth() uint32 addvalue = 0; // Not only pet, but any controlled creature (and not polymorphed) - if (GetCharmerOrOwnerGUID() && !IsPolymorphed()) + if (!GetCharmerOrOwnerGUID().IsEmpty() && !IsPolymorphed()) { float HealthIncreaseRate = sWorld->getRate(RATE_HEALTH); float Spirit = GetStat(STAT_SPIRIT); @@ -2383,7 +2383,7 @@ bool Creature::CanAssistTo(Unit const* u, Unit const* enemy, bool checkfaction / return false; // only free creature - if (GetCharmerOrOwnerGUID()) + if (!GetCharmerOrOwnerGUID().IsEmpty()) return false; // only from same creature faction diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1dad8aaa240..6b85c8bdb88 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1713,7 +1713,7 @@ void GameObject::Use(Unit* user) float x_i = GetPositionX() + relativeDistance * std::cos(orthogonalOrientation); float y_i = GetPositionY() + relativeDistance * std::sin(orthogonalOrientation); - if (itr->second) + if (!itr->second.IsEmpty()) { if (Player* ChairUser = ObjectAccessor::GetPlayer(*this, itr->second)) { @@ -1937,7 +1937,7 @@ void GameObject::Use(Unit* user) GameObjectTemplate const* info = GetGOInfo(); Player* m_ritualOwner = nullptr; - if (m_ritualOwnerGUID) + if (!m_ritualOwnerGUID.IsEmpty()) m_ritualOwner = ObjectAccessor::FindPlayer(m_ritualOwnerGUID); // ritual owner is set for GO's without owner (not summoned) diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 49363f6b1d0..af8b65e7787 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -429,7 +429,7 @@ bool Item::LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fi } // set owner (not if item is only loaded for gbank/auction/mail - if (owner_guid) + if (!owner_guid.IsEmpty()) SetOwnerGUID(owner_guid); bool need_save = false; // need explicit save data at load fixes diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5548587a0c5..fa7d04c7638 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2173,7 +2173,7 @@ Creature* Player::GetNPCIfCanInteractWith(ObjectGuid const& guid, NPCFlags npcFl return nullptr; // not allow interaction under control, but allow with own pets - if (creature->GetCharmerGUID()) + if (!creature->GetCharmerGUID().IsEmpty()) return nullptr; // not unfriendly/hostile @@ -8220,8 +8220,9 @@ void Player::SendLootRelease(ObjectGuid guid) const void Player::SendLoot(ObjectGuid guid, LootType loot_type) { - if (ObjectGuid lguid = GetLootGUID()) - m_session->DoLootRelease(lguid); + ObjectGuid currentLootGuid = GetLootGUID(); + if (!currentLootGuid.IsEmpty()) + m_session->DoLootRelease(currentLootGuid); Loot* loot; PermissionTypes permission = ALL_PERMISSION; @@ -13064,7 +13065,7 @@ void Player::SwapItem(uint16 src, uint16 dst) // if player is moving bags and is looting an item inside this bag // release the loot - if (GetLootGUID()) + if (!GetLootGUID().IsEmpty()) { bool released = false; if (IsBagPos(src)) @@ -16271,7 +16272,7 @@ void Player::KilledMonsterCredit(uint32 entry, ObjectGuid guid /*= ObjectGuid::E uint16 addkillcount = 1; uint32 real_entry = entry; Creature* killed = nullptr; - if (guid) + if (!guid.IsEmpty()) { killed = GetMap()->GetCreature(guid); if (killed && killed->GetEntry()) @@ -20440,7 +20441,8 @@ void Player::UpdateDuelFlag(time_t currTime) Pet* Player::GetPet() const { - if (ObjectGuid pet_guid = GetPetGUID()) + ObjectGuid pet_guid = GetPetGUID(); + if (!pet_guid.IsEmpty()) { if (!pet_guid.IsPet()) return nullptr; @@ -20597,10 +20599,10 @@ void Player::StopCastingCharm() } } } - if (GetCharmedGUID()) + if (!GetCharmedGUID().IsEmpty()) charm->RemoveCharmAuras(); - if (GetCharmedGUID()) + if (!GetCharmedGUID().IsEmpty()) { TC_LOG_FATAL("entities.player", "Player::StopCastingCharm: Player '{}' ({}) is not able to uncharm unit ({})", GetName(), GetGUID().ToString(), GetCharmedGUID().ToString()); if (!charm->GetCharmerGUID().IsEmpty()) @@ -22241,7 +22243,8 @@ bool Player::CanAlwaysSee(WorldObject const* obj) const if (GetCharmedOrSelf() == obj) return true; - if (ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT)) + ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT); + if (!guid.IsEmpty()) if (obj->GetGUID() == guid) return true; @@ -22529,14 +22532,16 @@ bool Player::IsQuestRewarded(uint32 quest_id) const Unit* Player::GetSelectedUnit() const { - if (ObjectGuid selectionGUID = GetTarget()) + ObjectGuid selectionGUID = GetTarget(); + if (!selectionGUID.IsEmpty()) return ObjectAccessor::GetUnit(*this, selectionGUID); return nullptr; } Player* Player::GetSelectedPlayer() const { - if (ObjectGuid selectionGUID = GetTarget()) + ObjectGuid selectionGUID = GetTarget(); + if (!selectionGUID.IsEmpty()) return ObjectAccessor::FindConnectedPlayer(selectionGUID); return nullptr; } @@ -24345,7 +24350,8 @@ void Player::SetViewpoint(WorldObject* target, bool apply) WorldObject* Player::GetViewpoint() const { - if (ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT)) + ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT); + if (!guid.IsEmpty()) return static_cast<WorldObject*>(ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER)); return nullptr; } @@ -25384,7 +25390,7 @@ void Player::ResummonPetTemporaryUnSummonedIfAny() if (IsPetNeedBeTemporaryUnsummoned()) return; - if (GetPetGUID()) + if (!GetPetGUID().IsEmpty()) return; Pet* NewPet = new Pet(this); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 062a4b6f358..0b93a7e3c2a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -5719,7 +5719,7 @@ bool Unit::isAttackingPlayer() const return true; for (uint8 i = 0; i < MAX_SUMMON_SLOT; ++i) - if (m_SummonSlot[i]) + if (!m_SummonSlot[i].IsEmpty()) if (Creature* summon = GetMap()->GetCreature(m_SummonSlot[i])) if (summon->isAttackingPlayer()) return true; @@ -5858,7 +5858,8 @@ void Unit::SetOwnerGUID(ObjectGuid owner) Player* Unit::GetControllingPlayer() const { - if (ObjectGuid guid = GetCharmerOrOwnerGUID()) + ObjectGuid guid = GetCharmerOrOwnerGUID(); + if (!guid.IsEmpty()) { if (Unit* master = ObjectAccessor::GetUnit(*this, guid)) return master->GetControllingPlayer(); @@ -5870,7 +5871,8 @@ Player* Unit::GetControllingPlayer() const Minion* Unit::GetFirstMinion() const { - if (ObjectGuid pet_guid = GetMinionGUID()) + ObjectGuid pet_guid = GetMinionGUID(); + if (!pet_guid.IsEmpty()) { if (Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, pet_guid)) if (pet->HasUnitTypeMask(UNIT_MASK_MINION)) @@ -5885,7 +5887,8 @@ Minion* Unit::GetFirstMinion() const Guardian* Unit::GetGuardianPet() const { - if (ObjectGuid pet_guid = GetPetGUID()) + ObjectGuid pet_guid = GetPetGUID(); + if (!pet_guid.IsEmpty()) { if (Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*this, pet_guid)) if (pet->HasUnitTypeMask(UNIT_MASK_GUARDIAN)) @@ -5904,7 +5907,7 @@ void Unit::SetMinion(Minion *minion, bool apply) if (apply) { - if (minion->GetOwnerGUID()) + if (!minion->GetOwnerGUID().IsEmpty()) { TC_LOG_FATAL("entities.unit", "SetMinion: Minion {} is not the minion of owner {}", minion->GetEntry(), GetEntry()); return; @@ -6238,8 +6241,11 @@ Unit* Unit::GetFirstControlled() const // Sequence: charmed, pet, other guardians Unit* unit = GetCharmed(); if (!unit) - if (ObjectGuid guid = GetMinionGUID()) + { + ObjectGuid guid = GetMinionGUID(); + if (!guid.IsEmpty()) unit = ObjectAccessor::GetUnit(*this, guid); + } return unit; } @@ -6261,11 +6267,11 @@ void Unit::RemoveAllControlled() else TC_LOG_ERROR("entities.unit", "Unit {} is trying to release unit {} which is neither charmed nor owned by it", GetEntry(), target->GetEntry()); } - if (GetPetGUID()) + if (!GetPetGUID().IsEmpty()) TC_LOG_FATAL("entities.unit", "Unit {} is not able to release its pet {}", GetEntry(), GetPetGUID().ToString()); - if (GetMinionGUID()) + if (!GetMinionGUID().IsEmpty()) TC_LOG_FATAL("entities.unit", "Unit {} is not able to release its minion {}", GetEntry(), GetMinionGUID().ToString()); - if (GetCharmedGUID()) + if (!GetCharmedGUID().IsEmpty()) TC_LOG_FATAL("entities.unit", "Unit {} is not able to release its charm {}", GetEntry(), GetCharmedGUID().ToString()); if (!IsPet()) // pets don't use the flag for this RemoveUnitFlag(UNIT_FLAG_PET_IN_COMBAT); // m_controlled is now empty, so we know none of our minions are in combat @@ -8474,7 +8480,8 @@ bool Unit::IsAlwaysVisibleFor(WorldObject const* seer) const return true; // Always seen by owner - if (ObjectGuid guid = GetCharmerOrOwnerGUID()) + ObjectGuid guid = GetCharmerOrOwnerGUID(); + if (!guid.IsEmpty()) if (seer->GetGUID() == guid) return true; @@ -10994,7 +11001,7 @@ bool Unit::InitTamedPet(Pet* pet, uint8 level, uint32 spell_id) if (creature) { group->UpdateLooterGuid(creature, true); - if (group->GetLooterGuid()) + if (!group->GetLooterGuid().IsEmpty()) { looter = ObjectAccessor::FindPlayer(group->GetLooterGuid()); if (looter) @@ -11507,7 +11514,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au } // Already charmed - if (GetCharmerGUID()) + if (!GetCharmerGUID().IsEmpty()) { TC_LOG_FATAL("entities.unit", "Unit::SetCharmedBy: {} has already been charmed but {} is trying to charm it!", GetGUID().ToString(), charmer->GetGUID().ToString()); return false; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 1e3c0c0e967..2c6867bc9fa 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1664,8 +1664,8 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid) return; // clean other icons - if (targetGuid) - for (int i=0; i<TARGET_ICONS_COUNT; ++i) + if (!targetGuid.IsEmpty()) + for (int i = 0; i < TARGET_ICONS_COUNT; ++i) if (m_targetIcons[i] == targetGuid) SetTargetIcon(i, ObjectGuid::Empty, ObjectGuid::Empty); diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index 81f3591dc98..4067b3acc29 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -252,11 +252,13 @@ void WorldSession::HandleBattlegroundPlayerPositionsOpcode(WorldPackets::Battleg return; WorldPackets::Battleground::BattlegroundPlayerPositions playerPositions; - if (ObjectGuid guid = bg->GetFlagPickerGUID(TEAM_ALLIANCE)) + ObjectGuid guid = bg->GetFlagPickerGUID(TEAM_ALLIANCE); + if (!guid.IsEmpty()) if (Player* allianceFlagCarrier = ObjectAccessor::GetPlayer(*_player, guid)) playerPositions.FlagCarriers.emplace_back(guid, allianceFlagCarrier->GetPosition()); - if (ObjectGuid guid = bg->GetFlagPickerGUID(TEAM_HORDE)) + guid = bg->GetFlagPickerGUID(TEAM_HORDE); + if (!guid.IsEmpty()) if (Player* hordeFlagCarrier = ObjectAccessor::GetPlayer(*_player, guid)) playerPositions.FlagCarriers.emplace_back(guid, hordeFlagCarrier->GetPosition()); diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index d8a012ecdde..0dc557b8844 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1438,7 +1438,8 @@ void WorldSession::HandleCharCustomizeCallback(std::shared_ptr<CharacterCustomiz } // character with this name already exist - if (ObjectGuid newGuid = sCharacterCache->GetCharacterGuidByName(customizeInfo->Name)) + ObjectGuid newGuid = sCharacterCache->GetCharacterGuidByName(customizeInfo->Name); + if (!newGuid.IsEmpty()) { if (newGuid != customizeInfo->Guid) { diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index e9d64c786e9..0ab9dd34b3a 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -351,13 +351,14 @@ void WorldSession::HandleGroupUninviteOpcode(WorldPacket& recvData) if (!grp) return; - if (ObjectGuid guid = grp->GetMemberGUID(membername)) + ObjectGuid guid = grp->GetMemberGUID(membername); + if (!guid.IsEmpty()) { Player::RemoveFromGroup(grp, guid, GROUP_REMOVEMETHOD_KICK, GetPlayer()->GetGUID()); return; } - if (Player* player = grp->GetInvited(membername)) + if (Player* player = grp->GetInvited(guid)) { player->UninviteFromGroup(); return; diff --git a/src/server/game/Handlers/LootHandler.cpp b/src/server/game/Handlers/LootHandler.cpp index d41d1b2aaa3..c3f12dce104 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -245,7 +245,8 @@ void WorldSession::HandleLootReleaseOpcode(WorldPacket& recvData) ObjectGuid guid; recvData >> guid; - if (ObjectGuid lguid = GetPlayer()->GetLootGUID()) + ObjectGuid lguid = GetPlayer()->GetLootGUID(); + if (!lguid.IsEmpty()) if (lguid == guid) DoLootRelease(lguid); } diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 8618cf21683..50ffc294309 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -350,7 +350,8 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData) void WorldSession::HandleLogoutRequestOpcode(WorldPackets::Character::LogoutRequest& /*logoutRequest*/) { - if (ObjectGuid lguid = GetPlayer()->GetLootGUID()) + ObjectGuid lguid = GetPlayer()->GetLootGUID(); + if (!lguid.IsEmpty()) DoLootRelease(lguid); bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 38d5dedcad4..510c849caa6 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -729,7 +729,7 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket& recvData) // reputation discount float discountMod = _player->GetReputationPriceDiscount(unit); - if (itemGUID) + if (!itemGUID.IsEmpty()) { TC_LOG_DEBUG("network", "ITEM: Repair {}, at {}", itemGUID.ToString(), npcGUID.ToString()); diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 7c3fa78fd71..7fcdac4baa1 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -271,7 +271,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe { Unit* unit_target = nullptr; - if (guid2) + if (!guid2.IsEmpty()) unit_target = ObjectAccessor::GetUnit(*_player, guid2); // do not cast unknown spells diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index 9972c3f4a29..d8bb33c74bf 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -322,7 +322,7 @@ void Map::ScriptsProcess() ScriptAction const& step = iter->second; Object* source = nullptr; - if (step.sourceGUID) + if (!step.sourceGUID.IsEmpty()) { switch (step.sourceGUID.GetHigh()) { @@ -358,7 +358,7 @@ void Map::ScriptsProcess() } WorldObject* target = nullptr; - if (step.targetGUID) + if (!step.targetGUID.IsEmpty()) { switch (step.targetGUID.GetHigh()) { diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 182921c1cc8..ff65e7f8c2b 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -495,7 +495,8 @@ void WorldSession::LogoutPlayer(bool save) if (_player) { - if (ObjectGuid lguid = _player->GetLootGUID()) + ObjectGuid lguid = _player->GetLootGUID(); + if (!lguid.IsEmpty()) DoLootRelease(lguid); ///- If the player just died before logging out, make him appear as a ghost diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 8ad99d8d0b5..4a066ff0685 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -427,7 +427,8 @@ int32 AuraEffect::CalculateAmount(Unit* caster) // check item enchant aura cast if (!amount && caster) { - if (ObjectGuid itemGUID = GetBase()->GetCastItemGUID()) + ObjectGuid itemGUID = GetBase()->GetCastItemGUID(); + if (!itemGUID.IsEmpty()) { if (Player* playerCaster = caster->ToPlayer()) { diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a76bc21d886..7d2ec0adfab 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -98,7 +98,7 @@ SpellDestination::SpellDestination(WorldObject const& wObj) void SpellDestination::Relocate(Position const& pos) { - if (_transportGUID) + if (!_transportGUID.IsEmpty()) { Position offset; _position.GetPositionOffsetTo(pos, offset); @@ -109,7 +109,7 @@ void SpellDestination::Relocate(Position const& pos) void SpellDestination::RelocateOffset(Position const& offset) { - if (_transportGUID) + if (!_transportGUID.IsEmpty()) _transportOffset.RelocateOffset(offset); _position.RelocateOffset(offset); @@ -143,7 +143,7 @@ void SpellCastTargets::Read(ByteBuffer& data, Unit* caster) if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION) { data >> m_src._transportGUID.ReadAsPacked(); - if (m_src._transportGUID) + if (!m_src._transportGUID.IsEmpty()) data >> m_src._transportOffset.PositionXYZStream(); else data >> m_src._position.PositionXYZStream(); @@ -151,7 +151,7 @@ void SpellCastTargets::Read(ByteBuffer& data, Unit* caster) else { m_src._transportGUID = caster->GetTransGUID(); - if (m_src._transportGUID) + if (!m_src._transportGUID.IsEmpty()) m_src._transportOffset.Relocate(caster->GetTransOffsetX(), caster->GetTransOffsetY(), caster->GetTransOffsetZ(), caster->GetTransOffsetO()); else m_src._position.Relocate(caster); @@ -160,7 +160,7 @@ void SpellCastTargets::Read(ByteBuffer& data, Unit* caster) if (m_targetMask & TARGET_FLAG_DEST_LOCATION) { data >> m_dst._transportGUID.ReadAsPacked(); - if (m_dst._transportGUID) + if (!m_dst._transportGUID.IsEmpty()) data >> m_dst._transportOffset.PositionXYZStream(); else data >> m_dst._position.PositionXYZStream(); @@ -168,7 +168,7 @@ void SpellCastTargets::Read(ByteBuffer& data, Unit* caster) else { m_dst._transportGUID = caster->GetTransGUID(); - if (m_dst._transportGUID) + if (!m_dst._transportGUID.IsEmpty()) m_dst._transportOffset.Relocate(caster->GetTransOffsetX(), caster->GetTransOffsetY(), caster->GetTransOffsetZ(), caster->GetTransOffsetO()); else m_dst._position.Relocate(caster); @@ -208,7 +208,7 @@ void SpellCastTargets::Write(WorldPackets::Spells::SpellTargetData& data) { data.DstLocation.emplace(); data.DstLocation->Transport = m_dst._transportGUID; - if (m_dst._transportGUID) + if (!m_dst._transportGUID.IsEmpty()) data.DstLocation->Location = m_dst._transportOffset; else data.DstLocation->Location = m_dst._position; @@ -539,7 +539,7 @@ m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerO m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetTemplate()->Damage[0].DamageType); } - if (originalCasterGUID) + if (!originalCasterGUID.IsEmpty()) m_originalCasterGUID = originalCasterGUID; else m_originalCasterGUID = m_caster->GetGUID(); @@ -4690,7 +4690,7 @@ void Spell::SendChannelStart(uint32 duration) unitCaster->SendMessageToSet(&data, true); m_timer = duration; - if (channelTarget) + if (!channelTarget.IsEmpty()) { unitCaster->SetChannelObjectGuid(channelTarget); @@ -4811,7 +4811,8 @@ void Spell::TakePower() { if (powerType == POWER_RAGE || powerType == POWER_ENERGY || powerType == POWER_RUNE) { - if (ObjectGuid targetGUID = m_targets.GetUnitTargetGUID()) + ObjectGuid targetGUID = m_targets.GetUnitTargetGUID(); + if (!targetGUID.IsEmpty()) { auto ihit = std::find_if(std::begin(m_UniqueTargetInfo), std::end(m_UniqueTargetInfo), [&](TargetInfo const& targetInfo) { return targetInfo.TargetGUID == targetGUID && targetInfo.MissCondition != SPELL_MISS_NONE; }); if (ihit != std::end(m_UniqueTargetInfo)) @@ -5780,11 +5781,11 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint switch (SummonProperties->Control) { case SUMMON_CATEGORY_PET: - if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET) && unitCaster->GetPetGUID()) + if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET) && !unitCaster->GetPetGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; [[fallthrough]]; // check both GetPetGUID() and GetCharmGUID for SUMMON_CATEGORY_PET case SUMMON_CATEGORY_PUPPET: - if (unitCaster->GetCharmedGUID()) + if (!unitCaster->GetCharmedGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; break; } @@ -5796,7 +5797,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint { if (m_targets.GetUnitTarget()->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_BAD_TARGETS; - if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET) && m_targets.GetUnitTarget()->GetPetGUID()) + if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET) && !m_targets.GetUnitTarget()->GetPetGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; } break; @@ -5807,7 +5808,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!unitCaster) return SPELL_FAILED_BAD_TARGETS; - if (unitCaster->GetPetGUID()) //let warlock do a replacement summon + if (!unitCaster->GetPetGUID().IsEmpty()) //let warlock do a replacement summon { if (unitCaster->GetTypeId() == TYPEID_PLAYER) { @@ -5819,7 +5820,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_ALREADY_HAVE_SUMMON; } - if (unitCaster->GetCharmedGUID()) + if (!unitCaster->GetCharmedGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; Player* playerCaster = unitCaster->ToPlayer(); @@ -6002,7 +6003,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!pet) return SPELL_FAILED_NO_PET; - if (pet->GetCharmerGUID()) + if (!pet->GetCharmerGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; break; } @@ -6014,16 +6015,16 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (!unitCaster) return SPELL_FAILED_BAD_TARGETS; - if (unitCaster->GetCharmerGUID()) + if (!unitCaster->GetCharmerGUID().IsEmpty()) return SPELL_FAILED_CHARMED; if (spellEffectInfo.ApplyAuraName == SPELL_AURA_MOD_CHARM || spellEffectInfo.ApplyAuraName == SPELL_AURA_MOD_POSSESS) { - if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET) && unitCaster->GetPetGUID()) + if (!m_spellInfo->HasAttribute(SPELL_ATTR1_DISMISS_PET) && !unitCaster->GetPetGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; - if (unitCaster->GetCharmedGUID()) + if (!unitCaster->GetCharmedGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; } @@ -6035,7 +6036,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (target->IsMounted()) return SPELL_FAILED_CANT_BE_CHARMED; - if (target->GetCharmerGUID()) + if (!target->GetCharmerGUID().IsEmpty()) return SPELL_FAILED_CANT_BE_CHARMED; if (target->GetOwner() && target->GetOwner()->GetTypeId() == TYPEID_PLAYER) @@ -6664,7 +6665,7 @@ SpellCastResult Spell::CheckItems(uint32* param1 /*= nullptr*/, uint32* param2 / if (!m_CastItem) { - if (m_castItemGUID) + if (!m_castItemGUID.IsEmpty()) return SPELL_FAILED_ITEM_NOT_READY; } else @@ -6735,7 +6736,7 @@ SpellCastResult Spell::CheckItems(uint32* param1 /*= nullptr*/, uint32* param2 / } // check target item - if (m_targets.GetItemTargetGUID()) + if (!m_targets.GetItemTargetGUID().IsEmpty()) { Item* item = m_targets.GetItemTarget(); if (!item) @@ -7400,7 +7401,7 @@ bool Spell::CheckEffectTarget(Unit const* target, SpellEffectInfo const& spellEf return false; if (target->IsMounted()) return false; - if (target->GetCharmerGUID()) + if (!target->GetCharmerGUID().IsEmpty()) return false; if (int32 value = CalculateDamage(spellEffectInfo)) if ((int32)target->GetLevel() > value) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 96495d906b7..182bb113b15 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2449,8 +2449,7 @@ void Spell::EffectUntrainTalents() if (!unitTarget || m_caster->GetTypeId() == TYPEID_PLAYER) return; - if (ObjectGuid guid = m_caster->GetGUID()) // the trainer is the caster - unitTarget->ToPlayer()->SendTalentWipeConfirm(guid); + unitTarget->ToPlayer()->SendTalentWipeConfirm(m_caster->GetGUID()); } void Spell::EffectTeleUnitsFaceCaster() @@ -3988,7 +3987,8 @@ void Spell::EffectSummonObject() uint32 go_id = effectInfo->MiscValue; uint8 slot = effectInfo->Effect - SPELL_EFFECT_SUMMON_OBJECT_SLOT1; - if (ObjectGuid guid = unitCaster->m_ObjectSlot[slot]) + ObjectGuid guid = unitCaster->m_ObjectSlot[slot]; + if (!guid.IsEmpty()) { if (GameObject* obj = unitCaster->GetMap()->GetGameObject(guid)) { diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 5fba3d77ea4..12534c1547e 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -384,7 +384,7 @@ void TicketMgr::CloseTicket(uint32 ticketId, ObjectGuid source) { CharacterDatabaseTransaction trans = CharacterDatabaseTransaction(nullptr); ticket->SetClosedBy(source); - if (source) + if (!source.IsEmpty()) --_openTicketCount; ticket->SaveToDB(trans); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 2e6314c1748..96c6a4e4ee6 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -270,7 +270,7 @@ public: void JustDied(Unit* /*killer*/) override { - if (DorotheeGUID) + if (!DorotheeGUID.IsEmpty()) { Creature* Dorothee = (ObjectAccessor::GetCreature((*me), DorotheeGUID)); if (Dorothee && Dorothee->IsAlive()) @@ -1278,7 +1278,7 @@ public: void JustEngagedWith(Unit* /*who*/) override { Talk(SAY_ROMULO_AGGRO); - if (JulianneGUID) + if (!JulianneGUID.IsEmpty()) { Creature* Julianne = (ObjectAccessor::GetCreature((*me), JulianneGUID)); if (Julianne && Julianne->GetVictim()) diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index c283c3bd40e..8ad3f2e85ee 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -179,7 +179,7 @@ class npc_winterfin_playmate : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -286,7 +286,7 @@ class npc_snowfall_glade_playmate : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -392,7 +392,7 @@ class npc_the_biggest_tree : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -487,7 +487,7 @@ class npc_high_oracle_soo_roo : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -583,7 +583,7 @@ class npc_elder_kekek : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -697,7 +697,7 @@ class npc_the_etymidian : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -819,14 +819,14 @@ class npc_alexstraza_the_lifebinder : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } else if (player->GetQuestStatus(QUEST_THE_DRAGON_QUEEN_WOLVAR) == QUEST_STATUS_INCOMPLETE) { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 7; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index ca034462c35..bd7ef61a80a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -240,7 +240,7 @@ public: { if (CheckTimer <= diff) { - if (AzgalorGUID) + if (!AzgalorGUID.IsEmpty()) { Creature* boss = ObjectAccessor::GetCreature(*me, AzgalorGUID); if (!boss || boss->isDead()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index ebb2495d95b..5f374086601 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -824,7 +824,7 @@ void hyjalAI::UpdateAI(uint32 diff) { for (uint8 i = 0; i < 2; ++i) { - if (BossGUID[i]) + if (!BossGUID[i].IsEmpty()) { Unit* unit = ObjectAccessor::GetUnit(*me, BossGUID[i]); if (unit && (!unit->IsAlive())) diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 3019c728530..171ce1fe342 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -336,7 +336,7 @@ public: { Player* warrior = nullptr; - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) warrior = ObjectAccessor::GetPlayer(*me, PlayerGUID); if (!warrior) @@ -349,7 +349,7 @@ public: for (uint8 i = 0; i < 6; ++i) // unsummon challengers { - if (AffrayChallenger[i]) + if (!AffrayChallenger[i].IsEmpty()) { Creature* creature = ObjectAccessor::GetCreature((*me), AffrayChallenger[i]); if (creature && creature->IsAlive()) @@ -357,7 +357,7 @@ public: } } - if (BigWill) // unsummon bigWill + if (!BigWill.IsEmpty()) // unsummon bigWill { Creature* creature = ObjectAccessor::GetCreature((*me), BigWill); if (creature && creature->IsAlive()) @@ -398,7 +398,7 @@ public: { for (uint8 i = 0; i < 6; ++i) { - if (AffrayChallenger[i]) + if (!AffrayChallenger[i].IsEmpty()) { Creature* creature = ObjectAccessor::GetCreature((*me), AffrayChallenger[i]); if ((!creature || (!creature->IsAlive())) && !ChallengerDown[i]) diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index af90f1defc3..046d315a50f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -265,7 +265,7 @@ struct boss_prince_taldaram : public BossAI Unit* GetEmbraceTarget() { - if (_embraceTargetGUID) + if (!_embraceTargetGUID.IsEmpty()) return ObjectAccessor::GetUnit(*me, _embraceTargetGUID); return nullptr; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index acdb2578d26..88234f4a7fe 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -215,7 +215,10 @@ private: void SetSummonerStatus(bool active) { for (uint8 i = 0; i < 4; i++) - if (ObjectGuid guid = instance->GetGuidData(summoners[i].data)) + { + ObjectGuid guid = instance->GetGuidData(summoners[i].data); + if (!guid.IsEmpty()) + { if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid)) { if (active) @@ -223,14 +226,19 @@ private: else crystalChannelTarget->AI()->Reset(); } + } + } } void SetCrystalsStatus(bool active) { for (uint8 i = 0; i < 4; i++) - if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i)) + { + ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i); + if (!guid.IsEmpty()) if (GameObject* crystal = ObjectAccessor::GetGameObject(*me, guid)) SetCrystalStatus(crystal, active); + } } void SetCrystalStatus(GameObject* crystal, bool active) @@ -248,13 +256,20 @@ private: void CrystalHandlerDied() { for (uint8 i = 0; i < 4; i++) - if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i)) + { + ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_CRYSTAL_1 + i); + if (!guid.IsEmpty()) + { if (GameObject* crystal = ObjectAccessor::GetGameObject(*me, guid)) + { if (crystal->GetGoState() == GO_STATE_ACTIVE) { SetCrystalStatus(crystal, false); break; } + } + } + } if (++_crystalHandlerCount >= 4) { @@ -265,9 +280,13 @@ private: if (IsHeroic()) events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15s); } - else if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4)) - if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid)) - crystalChannelTarget->AI()->SetData(SPELL_SUMMON_CRYSTAL_HANDLER, 15000); + else + { + ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4); + if (!guid.IsEmpty()) + if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid)) + crystalChannelTarget->AI()->SetData(SPELL_SUMMON_CRYSTAL_HANDLER, 15000); + } } uint8 _crystalHandlerCount; @@ -319,9 +338,12 @@ struct npc_crystal_channel_target : public ScriptedAI void JustSummoned(Creature* summon) override { if (InstanceScript* instance = me->GetInstanceScript()) - if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS)) + { + ObjectGuid guid = instance->GetGuidData(DATA_NOVOS); + if (!guid.IsEmpty()) if (Creature* novos = ObjectAccessor::GetCreature(*me, guid)) novos->AI()->JustSummoned(summon); + } if (summon) summon->GetMotionMaster()->MovePath(summon->GetEntry() * 100, false); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 6d2b7a36979..465ea267821 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -379,7 +379,7 @@ class instance_halls_of_reflection : public InstanceMapScript void SpawnGunship() { // don't spawn gunship twice - if (GunshipGUID) + if (!GunshipGUID.IsEmpty()) return; if (!_teamInInstance) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 8baa374226e..27db7256eb9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -411,7 +411,7 @@ public: if (_respawnCooldowns[i] > now) continue; - if (_controlledSlots[i]) + if (!_controlledSlots[i].IsEmpty()) { Creature* current = ObjectAccessor::GetCreature(*_transport, _controlledSlots[i]); if (current && current->IsAlive()) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index 411319c7452..73f1d16db99 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -142,7 +142,7 @@ struct boss_anomalus : public ScriptedAI if (me->HasAura(SPELL_RIFT_SHIELD)) { - if (uiChaoticRiftGUID) + if (!uiChaoticRiftGUID.IsEmpty()) { Creature* Rift = ObjectAccessor::GetCreature(*me, uiChaoticRiftGUID); if (Rift && Rift->isDead()) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index b9ead2ee63e..59fce6827e3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -231,7 +231,7 @@ class boss_kologarn : public CreatureScript summon->SetReactState(REACT_PASSIVE); // Victim gets 67351 - if (eyebeamTarget) + if (!eyebeamTarget.IsEmpty()) { if (Unit* target = ObjectAccessor::GetUnit(*summon, eyebeamTarget)) { diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index a09ff4c3684..6e076395241 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -284,7 +284,7 @@ struct boss_ymiron : public BossAI void DespawnBoatGhosts(ObjectGuid& CreatureGUID) { // @todo: fire visual after ancestor despawns. - if (CreatureGUID) + if (!CreatureGUID.IsEmpty()) if (Creature* temp = ObjectAccessor::GetCreature(*me, CreatureGUID)) temp->DisappearAndDie(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index eb980429789..1b75a8717da 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -204,7 +204,7 @@ struct boss_lady_vashj : public BossAI for (uint8 i = 0; i < 4; ++i) { - if (ShieldGeneratorChannel[i]) + if (!ShieldGeneratorChannel[i].IsEmpty()) { if (Unit* remo = ObjectAccessor::GetUnit(*me, ShieldGeneratorChannel[i])) { 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 fe9bd6da08f..82a2d2616f2 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 @@ -332,9 +332,9 @@ struct boss_leotheras_the_blind : public BossAI //Despawn all Inner Demon summoned void DespawnDemon() { - for (uint8 i=0; i<5; ++i) + for (uint8 i = 0; i < 5; ++i) { - if (InnderDemon[i]) + if (!InnderDemon[i].IsEmpty()) { //delete creature Creature* creature = ObjectAccessor::GetCreature((*me), InnderDemon[i]); @@ -352,7 +352,7 @@ struct boss_leotheras_the_blind : public BossAI { for (uint8 i = 0; i < 5; ++i) { - if (InnderDemon[i]) + if (!InnderDemon[i].IsEmpty()) { Creature* unit = ObjectAccessor::GetCreature((*me), InnderDemon[i]); if (unit && unit->IsAlive()) @@ -381,7 +381,7 @@ struct boss_leotheras_the_blind : public BossAI Talk(SAY_DEATH); //despawn copy - if (Demon) + if (!Demon.IsEmpty()) { if (Creature* pDemon = ObjectAccessor::GetCreature(*me, Demon)) pDemon->DespawnOrUnsummon(); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index f66208e6fb7..9f9af0bba2c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -162,7 +162,7 @@ struct boss_omor_the_unscarred : public BossAI OrbitalStrike_Timer = 14000 + rand32() % 2000; PlayerGUID = temp->GetGUID(); - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) CanPullBack = true; } } diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 0267fa947bf..e6d9b36662a 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -414,7 +414,7 @@ public: if (id == 1) { - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) PlayerGUID.Clear(); me->DespawnOrUnsummon(1ms); @@ -430,7 +430,7 @@ public: if (FlyTimer <= diff) { Tapped = false; - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) { Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID); if (player && player->GetQuestStatus(QUEST_THE_FORCE_OF_NELTHARAKU) == QUEST_STATUS_INCOMPLETE) @@ -1220,7 +1220,7 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave() if (WaveCount < 3)//1-3 Wave { - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) { if (Player* target = ObjectAccessor::GetPlayer(*me, PlayerGUID)) { @@ -1235,7 +1235,7 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave() if (WavesInfo[WaveCount].CreatureId == 22076) // Torloth { ENSURE_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->LordIllidanGUID = me->GetGUID(); - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) ENSURE_AI(npc_torloth_the_magnificent::npc_torloth_the_magnificentAI, Spawn->AI())->AggroTargetGUID = PlayerGUID; } } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 22028fa1d39..006ccf2fb4c 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3428,7 +3428,7 @@ class spell_gen_spirit_healer_res : public SpellScript if (Unit* target = GetHitUnit()) { WorldPacket data(SMSG_SPIRIT_HEALER_CONFIRM, 8); - data << uint64(target->GetGUID()); + data << target->GetGUID(); originalCaster->SendDirectMessage(&data); } } |