diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 20:27:00 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 20:27:00 +0200 |
| commit | 034561792ca9a07d719961ea842af2118428816f (patch) | |
| tree | a3e360f5fd1d439508dd29ee22a5983a828f8306 | |
| parent | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (diff) | |
Core/Entities: Second batch of removing implicit conversions of ObjectGuid to uint64
70 files changed, 287 insertions, 220 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 193ec5c5333..481e30ebe6c 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -868,7 +868,7 @@ void AchievementMgr<T>::SendAchievementEarned(AchievementEntry const* achievemen // broadcast realm first reached WorldPacket data(SMSG_SERVER_FIRST_ACHIEVEMENT, GetOwner()->GetName().size() + 1 + 8 + 4 + 4); data << GetOwner()->GetName(); - data << uint64(GetOwner()->GetGUID()); + data << GetOwner()->GetGUID(); data << uint32(achievement->ID); data << uint32(0); // 1=link supplied string as player name, 0=display plain string sWorld->SendGlobalMessage(&data); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp index f18f326bfb9..a43339fb8e5 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp @@ -567,7 +567,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 %i doesn't exist", AV_CPLACE_A_MARSHAL_SOUTH + tmp); @@ -625,10 +625,10 @@ void BattlegroundAV::ChangeMineOwner(uint8 mine, uint32 team, bool initial) TC_LOG_DEBUG("bg.battleground", "bg_av depopulating mine %i (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); @@ -725,7 +725,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 %i", node); @@ -761,9 +761,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); @@ -1490,7 +1490,7 @@ void BattlegroundAV::ResetBGSubclass() m_Mine_Timer=AV_MINE_TICK_TIMER; for (uint16 i = 0; i < AV_CPLACE_MAX+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 1c336e1a359..6da6f81e19b 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp @@ -759,7 +759,7 @@ void BattlegroundEY::EventTeamCapturedPoint(Player* player, uint32 Point) else SendMessageToAll(m_CapturingPointTypes[Point].MessageIdHorde, CHAT_MSG_BG_SYSTEM_HORDE, player); - if (BgCreatures[Point]) + if (!BgCreatures[Point].IsEmpty()) DelCreature(Point); WorldSafeLocsEntry const* sg = NULL; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp index bd3ef91daac..1a93048812f 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp @@ -454,8 +454,8 @@ void BattlegroundIC::EventPlayerClickedOnFlag(Player* player, GameObject* target // if we are here means that the point has been lost, or it is the first capture if (nodePoint[i].nodeType != NODE_TYPE_REFINERY && nodePoint[i].nodeType != NODE_TYPE_QUARRY) - if (BgCreatures[BG_IC_NPC_SPIRIT_GUIDE_1+(nodePoint[i].nodeType)-2]) - DelCreature(BG_IC_NPC_SPIRIT_GUIDE_1+(nodePoint[i].nodeType)-2); + if (!BgCreatures[BG_IC_NPC_SPIRIT_GUIDE_1 + (nodePoint[i].nodeType) - 2].IsEmpty()) + DelCreature(BG_IC_NPC_SPIRIT_GUIDE_1 + (nodePoint[i].nodeType) - 2); UpdatePlayerScore(player, SCORE_BASES_ASSAULTED, 1); diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index a5d48c8b038..666b7e41d23 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -947,7 +947,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)) { @@ -978,10 +978,10 @@ void BattlegroundSA::SendTransportInit(Player* player) if (!BgObjects[BG_SA_BOAT_ONE].IsEmpty() || !BgObjects[BG_SA_BOAT_TWO].IsEmpty()) { UpdateData transData(player->GetMapId()); - 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; @@ -992,12 +992,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(player->GetMapId()); - 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 54ee8b95dc6..a814168c789 100644 --- a/src/server/game/Chat/Channels/Channel.cpp +++ b/src/server/game/Chat/Channels/Channel.cpp @@ -81,7 +81,7 @@ Channel::Channel(std::string const& name, uint32 channelId, uint32 team): for (Tokenizer::const_iterator i = tokens.begin(); i != tokens.end(); ++i) { ObjectGuid banned_guid(uint64(strtoull(*i, NULL, 10))); - if (banned_guid) + if (!banned_guid.IsEmpty()) { TC_LOG_DEBUG("chat.system", "Channel(%s) loaded bannedStore %s", name.c_str(), banned_guid.ToString().c_str()); bannedStore.insert(banned_guid); @@ -691,7 +691,7 @@ void Channel::Invite(Player const* player, std::string const& newname) void Channel::SetOwner(ObjectGuid guid, bool exclaim) { - if (_ownerGUID) + if (!_ownerGUID.IsEmpty()) { // [] will re-add player after it possible removed PlayerContainer::iterator p_itr = playersStore.find(_ownerGUID); @@ -700,7 +700,7 @@ void Channel::SetOwner(ObjectGuid guid, bool exclaim) } _ownerGUID = guid; - if (_ownerGUID) + if (!_ownerGUID.IsEmpty()) { uint8 oldFlag = GetPlayerFlags(_ownerGUID); playersStore[_ownerGUID].SetModerator(true); diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index ac3f9350412..5d895d718ba 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -132,7 +132,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 = sObjectMgr->GetPlayerAccountIdByGUID(guid); if (!target_session && !target_account) @@ -1093,10 +1093,7 @@ ObjectGuid ChatHandler::extractGuidFromLink(char* text) if (Player* player = ObjectAccessor::FindPlayerByName(name)) return player->GetGUID(); - if (ObjectGuid guid = sObjectMgr->GetPlayerGUIDByName(name)) - return guid; - - return ObjectGuid::Empty; + return sObjectMgr->GetPlayerGUIDByName(name); } case SPELL_LINK_CREATURE: { diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index fa5bf55df38..9ce0d3093db 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -334,7 +334,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); SendLfgUpdateStatus(guid, LfgUpdateData(LFG_UPDATETYPE_PROPOSAL_BEGIN, GetSelectedDungeons(guid), GetComment(guid)), true); @@ -589,7 +590,7 @@ void LFGMgr::LeaveLfg(ObjectGuid guid) switch (state) { case LFG_STATE_QUEUED: - if (gguid) + if (!gguid.IsEmpty()) { LFGQueue& queue = GetQueue(gguid); queue.RemoveFromQueue(gguid); @@ -610,7 +611,7 @@ void LFGMgr::LeaveLfg(ObjectGuid guid) } 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: @@ -977,7 +978,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); SendLfgUpdateStatus(pguid, updateData, false); @@ -1259,7 +1260,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->GetCharmGUID()) + else if (!player->GetCharmGUID().IsEmpty()) error = LFG_TELEPORTERROR_CHARMING; else if (player->GetMapId() != uint32(dungeon->map)) // Do not teleport players in dungeon to the entrance { @@ -1831,7 +1832,7 @@ uint8 LFGMgr::GetQueueId(ObjectGuid guid) { GuidSet const& players = GetPlayers(guid); ObjectGuid pguid = players.empty() ? ObjectGuid::Empty : (*players.begin()); - if (pguid) + if (!pguid.IsEmpty()) return GetTeam(pguid); } diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index f9c059feea9..bc2086afabe 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -225,7 +225,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 0a072e26668..3a7de2caf6e 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -638,7 +638,7 @@ void Creature::RegenerateHealth() uint32 addvalue = 0; // Not only pet, but any controlled creature - if (GetCharmerOrOwnerGUID()) + if (!GetCharmerOrOwnerGUID().IsEmpty()) { float HealthIncreaseRate = sWorld->getRate(RATE_HEALTH); float Spirit = GetStat(STAT_SPIRIT); @@ -1910,7 +1910,7 @@ bool Creature::CanAssistTo(const Unit* u, const Unit* 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 851b2589f77..5d035286c25 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1011,9 +1011,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(); @@ -1298,7 +1298,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::FindPlayer(itr->second)) { @@ -1509,7 +1509,7 @@ void GameObject::Use(Unit* user) GameObjectTemplate const* info = GetGOInfo(); Player* m_ritualOwner = NULL; - 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 db257835f23..2596ee1b235 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -421,7 +421,7 @@ bool Item::LoadFromDB(uint32 guid, ObjectGuid owner_guid, Field* fields, uint32 return false; // 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/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 3e48b73cd60..4248924b40b 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -399,10 +399,10 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const data->WriteBit(hasFallData); // Has fall data data->WriteBit(!hasSplineElevation); // Has spline elevation data->WriteBit(guid[5]); - data->WriteBit(self->m_movementInfo.transport.guid); // Has transport data + data->WriteBit(!self->m_movementInfo.transport.guid.IsEmpty()); // Has transport data data->WriteBit(0); // Is missing time - if (self->m_movementInfo.transport.guid) + if (!self->m_movementInfo.transport.guid.IsEmpty()) { ObjectGuid transGuid = self->m_movementInfo.transport.guid; @@ -507,7 +507,7 @@ void Object::BuildMovementUpdate(ByteBuffer* data, uint16 flags) const *data << float(self->GetPositionZMinusOffset()); data->WriteByteSeq(guid[5]); - if (self->m_movementInfo.transport.guid) + if (!self->m_movementInfo.transport.guid.IsEmpty()) { ObjectGuid transGuid = self->m_movementInfo.transport.guid; @@ -1256,7 +1256,7 @@ void MovementInfo::OutDebug() TC_LOG_INFO("misc", "flags2 %s (%u)", Movement::MovementFlagsExtra_ToString(flags2).c_str(), flags2); TC_LOG_INFO("misc", "time %u current time %u", time, getMSTime()); TC_LOG_INFO("misc", "position: `%s`", pos.ToString().c_str()); - if (transport.guid) + if (!transport.guid.IsEmpty()) { TC_LOG_INFO("misc", "TRANSPORT:"); TC_LOG_INFO("misc", "%s", transport.guid.ToString().c_str()); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 26736db321d..736752ab4a8 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -2819,7 +2819,7 @@ Creature* Player::GetNPCIfCanInteractWith(ObjectGuid guid, uint32 npcflagmask) return NULL; // not allow interaction under control, but allow with own pets - if (creature->GetCharmerGUID()) + if (!creature->GetCharmerGUID().IsEmpty()) return NULL; // not enemy @@ -8919,8 +8919,9 @@ void Player::SendLootRelease(ObjectGuid guid) 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 = 0; PermissionTypes permission = ALL_PERMISSION; @@ -13206,7 +13207,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)) @@ -16506,7 +16507,7 @@ void Player::KilledMonsterCredit(uint32 entry, ObjectGuid guid /*= ObjectGuid::E uint16 addkillcount = 1; uint32 real_entry = entry; Creature* killed = NULL; - if (guid) + if (!guid.IsEmpty()) { killed = GetMap()->GetCreature(guid); if (killed && killed->GetEntry()) @@ -20690,7 +20691,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 NULL; @@ -20801,13 +20803,13 @@ void Player::StopCastingCharm() else if (charm->IsVehicle()) ExitVehicle(); } - if (GetCharmGUID()) + if (!GetCharmGUID().IsEmpty()) charm->RemoveCharmAuras(); - if (GetCharmGUID()) + if (!GetCharmGUID().IsEmpty()) { TC_LOG_FATAL("entities.player", "Player %s (%s) is not able to uncharm unit (%s)", GetName().c_str(), GetGUID().ToString().c_str(), GetCharmGUID().ToString().c_str()); - if (charm->GetCharmerGUID()) + if (!charm->GetCharmerGUID().IsEmpty()) { TC_LOG_FATAL("entities.player", "Charmed unit has charmer %s", charm->GetCharmerGUID().ToString().c_str()); ASSERT(false); @@ -22989,7 +22991,8 @@ bool Player::CanAlwaysSee(WorldObject const* obj) const if (m_mover == obj) return true; - if (ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT)) + ObjectGuid guid = GetGuidValue(PLAYER_FARSIGHT); + if (!guid.IsEmpty()) if (obj->GetGUID() == guid) return true; @@ -23266,14 +23269,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 NULL; } Player* Player::GetSelectedPlayer() const { - if (ObjectGuid selectionGUID = GetTarget()) + ObjectGuid selectionGUID = GetTarget(); + if (!selectionGUID.IsEmpty()) return ObjectAccessor::GetPlayer(*this, selectionGUID); return NULL; } @@ -23311,7 +23316,7 @@ void Player::AddComboPoints(Unit* target, int8 count, Spell* spell) *comboPoints += count; else { - if (m_comboTarget) + if (!m_comboTarget.IsEmpty()) if (Unit* target2 = ObjectAccessor::GetUnit(*this, m_comboTarget)) target2->RemoveComboPointHolder(GetGUID()); @@ -25064,7 +25069,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 (WorldObject*)ObjectAccessor::GetObjectByTypeMask(*this, guid, TYPEMASK_SEER); return NULL; } @@ -26175,7 +26181,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 f2aa8d07c84..73e9334ed60 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7628,7 +7628,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; @@ -7771,7 +7771,8 @@ void Unit::SetOwnerGUID(ObjectGuid owner) Unit* Unit::GetOwner() const { - if (ObjectGuid ownerGUID = GetOwnerGUID()) + ObjectGuid ownerGUID = GetOwnerGUID(); + if (!ownerGUID.IsEmpty()) return ObjectAccessor::GetUnit(*this, ownerGUID); return NULL; @@ -7779,7 +7780,8 @@ Unit* Unit::GetOwner() const Unit* Unit::GetCharmer() const { - if (ObjectGuid charmerGUID = GetCharmerGUID()) + ObjectGuid charmerGUID = GetCharmerGUID(); + if (!charmerGUID.IsEmpty()) return ObjectAccessor::GetUnit(*this, charmerGUID); return NULL; @@ -7807,7 +7809,8 @@ Player* Unit::GetAffectingPlayer() 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)) @@ -7822,7 +7825,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)) @@ -7837,7 +7841,8 @@ Guardian* Unit::GetGuardianPet() const Unit* Unit::GetCharm() const { - if (ObjectGuid charm_guid = GetCharmGUID()) + ObjectGuid charm_guid = GetCharmGUID(); + if (!charm_guid.IsEmpty()) { if (Unit* pet = ObjectAccessor::GetUnit(*this, charm_guid)) return pet; @@ -7868,7 +7873,7 @@ void Unit::SetMinion(Minion *minion, bool apply) if (apply) { - if (minion->GetOwnerGUID()) + if (!minion->GetOwnerGUID().IsEmpty()) { TC_LOG_FATAL("entities.unit", "SetMinion: Minion %u is not the minion of owner %u", minion->GetEntry(), GetEntry()); return; @@ -8220,8 +8225,11 @@ Unit* Unit::GetFirstControlled() const // Sequence: charmed, pet, other guardians Unit* unit = GetCharm(); if (!unit) - if (ObjectGuid guid = GetMinionGUID()) + { + ObjectGuid guid = GetMinionGUID(); + if (!guid.IsEmpty()) unit = ObjectAccessor::GetUnit(*this, guid); + } return unit; } @@ -8243,11 +8251,11 @@ void Unit::RemoveAllControlled() else TC_LOG_ERROR("entities.unit", "Unit %u is trying to release unit %u which is neither charmed nor owned by it", GetEntry(), target->GetEntry()); } - if (GetPetGUID()) + if (!GetPetGUID().IsEmpty()) TC_LOG_FATAL("entities.unit", "Unit %u is not able to release its pet %s", GetEntry(), GetPetGUID().ToString().c_str()); - if (GetMinionGUID()) + if (!GetMinionGUID().IsEmpty()) TC_LOG_FATAL("entities.unit", "Unit %u is not able to release its minion %s", GetEntry(), GetMinionGUID().ToString().c_str()); - if (GetCharmGUID()) + if (!GetCharmGUID().IsEmpty()) TC_LOG_FATAL("entities.unit", "Unit %u is not able to release its charm %s", GetEntry(), GetCharmGUID().ToString().c_str()); } @@ -10565,7 +10573,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; @@ -11916,7 +11925,7 @@ void Unit::RemoveFromWorld() RemoveAreaAurasDueToLeaveWorld(); - if (GetCharmerGUID()) + if (!GetCharmerGUID().IsEmpty()) { TC_LOG_FATAL("entities.unit", "Unit %u has charmer guid when removed from world", GetEntry()); ASSERT(false); @@ -12836,8 +12845,10 @@ ObjectGuid Unit::GetCharmerOrOwnerGUID() const ObjectGuid Unit::GetCharmerOrOwnerOrOwnGUID() const { - if (ObjectGuid guid = GetCharmerOrOwnerGUID()) + ObjectGuid guid = GetCharmerOrOwnerGUID(); + if (!guid.IsEmpty()) return guid; + return GetGUID(); } @@ -13704,7 +13715,7 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) if (creature) { group->UpdateLooterGuid(creature, true); - if (group->GetLooterGuid()) + if (!group->GetLooterGuid().IsEmpty()) { looter = ObjectAccessor::FindPlayer(group->GetLooterGuid()); if (looter) @@ -14200,7 +14211,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: %u (GUID %u) has already been charmed but %u (GUID %u) is trying to charm it!", GetEntry(), GetGUIDLow(), charmer->GetEntry(), charmer->GetGUIDLow()); return false; @@ -14775,7 +14786,7 @@ void Unit::SetInPhase(uint32 id, bool update, bool apply) (*itr)->SetInPhase(id, true, apply); 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])) summon->SetInPhase(id, true, apply); @@ -15831,7 +15842,7 @@ void Unit::SendTeleportPacket(Position& pos) data2.WriteBit(0); // unknown data2.WriteBit(uint64(transGuid)); data2.WriteBit(guid[1]); - if (transGuid) + if (!transGuid.IsEmpty()) { data2.WriteBit(transGuid[1]); data2.WriteBit(transGuid[3]); @@ -15847,7 +15858,7 @@ void Unit::SendTeleportPacket(Position& pos) data2.WriteBit(guid[5]); data2.FlushBits(); - if (transGuid) + if (!transGuid.IsEmpty()) { data2.WriteByteSeq(transGuid[6]); data2.WriteByteSeq(transGuid[5]); diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 126cd43b4db..e17e9b0b834 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1496,8 +1496,8 @@ void Group::SetTargetIcon(uint8 id, ObjectGuid whoGuid, ObjectGuid targetGuid) return; // clean other icons - if (targetGuid) - for (int i=0; i<TARGETICONCOUNT; ++i) + if (!targetGuid.IsEmpty()) + for (int i = 0; i < TARGETICONCOUNT; ++i) if (m_targetIcons[i] == targetGuid) SetTargetIcon(i, ObjectGuid::Empty, ObjectGuid::Empty); @@ -1624,12 +1624,12 @@ void Group::UpdatePlayerOutOfRange(Player* player) } } -void Group::BroadcastAddonMessagePacket(WorldPacket* packet, const std::string& prefix, bool ignorePlayersInBGRaid, int group, uint64 ignore) +void Group::BroadcastAddonMessagePacket(WorldPacket* packet, const std::string& prefix, bool ignorePlayersInBGRaid, int group /*= -1*/, ObjectGuid ignore /*= ObjectGuid::Empty*/) { for (GroupReference* itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player* player = itr->GetSource(); - if (!player || (ignore != 0 && player->GetGUID() == ignore) || (ignorePlayersInBGRaid && player->GetGroup() != this)) + if (!player || (!ignore.IsEmpty() && player->GetGUID() == ignore) || (ignorePlayersInBGRaid && player->GetGroup() != this)) continue; if (WorldSession* session = player->GetSession()) diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index a7807a6567c..6290547d465 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -290,7 +290,7 @@ class Group } void BroadcastPacket(WorldPacket* packet, bool ignorePlayersInBGRaid, int group = -1, ObjectGuid ignoredPlayer = ObjectGuid::Empty); - void BroadcastAddonMessagePacket(WorldPacket* packet, const std::string& prefix, bool ignorePlayersInBGRaid, int group = -1, uint64 ignore = 0); + void BroadcastAddonMessagePacket(WorldPacket* packet, const std::string& prefix, bool ignorePlayersInBGRaid, int group = -1, ObjectGuid ignore = ObjectGuid::Empty); void BroadcastReadyCheck(WorldPacket* packet); void OfflineReadyCheck(); diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 5cfc880dbd3..27c88fcb709 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -3402,8 +3402,8 @@ void Guild::_BroadcastEvent(GuildEvents guildEvent, ObjectGuid guid, const char* else if (param1) data << param1; - if (guid) - data << uint64(guid); + if (!guid.IsEmpty()) + data << guid; BroadcastPacket(&data); diff --git a/src/server/game/Handlers/BattleGroundHandler.cpp b/src/server/game/Handlers/BattleGroundHandler.cpp index bb67b220d7c..9dd154da5fa 100644 --- a/src/server/game/Handlers/BattleGroundHandler.cpp +++ b/src/server/game/Handlers/BattleGroundHandler.cpp @@ -278,15 +278,16 @@ void WorldSession::HandleBattlegroundPlayerPositionsOpcode(WorldPacket& /*recvDa uint32 hcount = 0; Player* aplr = NULL; Player* hplr = NULL; - - if (ObjectGuid guid = bg->GetFlagPickerGUID(TEAM_ALLIANCE)) + ObjectGuid guid = bg->GetFlagPickerGUID(TEAM_ALLIANCE); + if (!guid.IsEmpty()) { aplr = ObjectAccessor::FindPlayer(guid); if (aplr) ++acount; } - if (ObjectGuid guid = bg->GetFlagPickerGUID(TEAM_HORDE)) + guid = bg->GetFlagPickerGUID(TEAM_HORDE); + if (!guid.IsEmpty()) { hplr = ObjectAccessor::FindPlayer(guid); if (hplr) diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index cac17ef4005..f4fcb0d46fe 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1485,7 +1485,8 @@ void WorldSession::HandleCharCustomize(WorldPacket& recvData) } // character with this name already exist - if (ObjectGuid newGuid = sObjectMgr->GetPlayerGUIDByName(customizeInfo.Name)) + ObjectGuid newGuid = sObjectMgr->GetPlayerGUIDByName(customizeInfo.Name); + if (!newGuid.IsEmpty()) { if (newGuid != customizeInfo.Guid) { @@ -1743,7 +1744,8 @@ void WorldSession::HandleCharFactionOrRaceChange(WorldPacket& recvData) } // character with this name already exist - if (ObjectGuid newGuid = sObjectMgr->GetPlayerGUIDByName(factionChangeInfo.Name)) + ObjectGuid newGuid = sObjectMgr->GetPlayerGUIDByName(factionChangeInfo.Name); + if (!newGuid.IsEmpty()) { if (newGuid != factionChangeInfo.Guid) { diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index d1a9d72a132..de976e3d165 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -662,7 +662,7 @@ void WorldSession::HandleAddonMessagechatOpcode(WorldPacket& recvData) WorldPacket data; ChatHandler::BuildChatPacket(data, type, LANG_ADDON, sender, NULL, message, 0U, "", DEFAULT_LOCALE, prefix); - group->BroadcastAddonMessagePacket(&data, prefix, true, -1, group->GetMemberGroup(sender->GetGUID())); + group->BroadcastAddonMessagePacket(&data, prefix, true, -1, sender->GetGUID()); break; } default: diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 10a16dc6b48..5889339d6e9 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -478,13 +478,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 7adbdccd061..621704b1d0e 100644 --- a/src/server/game/Handlers/LootHandler.cpp +++ b/src/server/game/Handlers/LootHandler.cpp @@ -252,7 +252,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 5c515289163..4496ada7cf9 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -377,7 +377,8 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recvData*/) { TC_LOG_DEBUG("network", "WORLD: Recvd CMSG_LOGOUT_REQUEST Message, security - %u", GetSecurity()); - 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()) || @@ -611,7 +612,7 @@ void WorldSession::HandleAddFriendOpcodeCallBack(PreparedQueryResult result, std if (HasPermission(rbac::RBAC_PERM_ALLOW_GM_FRIEND) || AccountMgr::IsPlayerAccount(AccountMgr::GetSecurity(friendAccountId, realmHandle.Index))) { - if (friendGuid) + if (!friendGuid.IsEmpty()) { if (friendGuid == GetPlayer()->GetGUID()) friendResult = FRIEND_SELF; @@ -692,7 +693,7 @@ void WorldSession::HandleAddIgnoreOpcodeCallBack(PreparedQueryResult result) { IgnoreGuid = ObjectGuid(HIGHGUID_PLAYER, (*result)[0].GetUInt32()); - if (IgnoreGuid) + if (!IgnoreGuid.IsEmpty()) { if (IgnoreGuid == GetPlayer()->GetGUID()) //not add yourself ignoreResult = FRIEND_IGNORE_SELF; diff --git a/src/server/game/Handlers/MovementHandler.cpp b/src/server/game/Handlers/MovementHandler.cpp index afe70b7c2cd..44ed92e4c12 100644 --- a/src/server/game/Handlers/MovementHandler.cpp +++ b/src/server/game/Handlers/MovementHandler.cpp @@ -302,7 +302,7 @@ void WorldSession::HandleMovementOpcodes(WorldPacket& recvPacket) plrMover->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); /* handle special cases */ - if (movementInfo.transport.guid) + if (!movementInfo.transport.guid.IsEmpty()) { // transports size limited // (also received at zeppelin leave by some reason with t_* as absolute in continent coordinates, can be safely skipped) diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index f27005085d7..f233abb11c2 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -899,7 +899,7 @@ void WorldSession::HandleRepairItemOpcode(WorldPacket& recvData) // reputation discount float discountMod = _player->GetReputationPriceDiscount(unit); - if (itemGUID) + if (!itemGUID.IsEmpty()) { TC_LOG_DEBUG("network", "ITEM: Repair %s, at %s", itemGUID.ToString().c_str(), npcGUID.ToString().c_str()); diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index d03d57e49e0..4ad3d2fd3cc 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -301,7 +301,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe { Unit* unit_target = NULL; - if (guid2) + if (!guid2.IsEmpty()) unit_target = ObjectAccessor::GetUnit(*_player, guid2); // do not cast unknown spells diff --git a/src/server/game/Handlers/QuestHandler.cpp b/src/server/game/Handlers/QuestHandler.cpp index 796474606c5..59edeef295e 100644 --- a/src/server/game/Handlers/QuestHandler.cpp +++ b/src/server/game/Handlers/QuestHandler.cpp @@ -595,7 +595,7 @@ void WorldSession::HandlePushQuestToParty(WorldPacket& recvPacket) continue; } - if (receiver->GetDivider()) + if (!receiver->GetDivider().IsEmpty()) { sender->SendPushToPartyResponse(receiver, QUEST_PARTY_MSG_BUSY); continue; diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp index c715f609789..097f0299961 100644 --- a/src/server/game/Movement/Spline/MoveSplineInit.cpp +++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp @@ -117,7 +117,7 @@ namespace Movement WorldPacket data(SMSG_MONSTER_MOVE, 64); data << unit->GetPackGUID(); - if (unit->GetTransGUID()) + if (!unit->GetTransGUID().IsEmpty()) { data.SetOpcode(SMSG_MONSTER_MOVE_TRANSPORT); data << unit->GetTransGUID().WriteAsPacked(); diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index 8a49878aa50..6d40837294c 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -297,7 +297,7 @@ void Map::ScriptsProcess() ScriptAction const& step = iter->second; Object* source = NULL; - if (step.sourceGUID) + if (!step.sourceGUID.IsEmpty()) { switch (step.sourceGUID.GetHigh()) { @@ -336,7 +336,7 @@ void Map::ScriptsProcess() } WorldObject* target = NULL; - 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 0220e5d97e4..e598443998c 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -477,7 +477,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 ebc49b14ef8..ba48d62a58e 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -483,9 +483,14 @@ 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()) + { if (Item* castItem = playerCaster->GetItemByGuid(itemGUID)) + { if (castItem->GetItemSuffixFactor()) { ItemRandomSuffixEntry const* item_rand_suffix = sItemRandomSuffixStore.LookupEntry(abs(castItem->GetItemRandomPropertyId())); @@ -498,10 +503,10 @@ int32 AuraEffect::CalculateAmount(Unit* caster) { for (int t = 0; t < MAX_ITEM_ENCHANTMENT_EFFECTS; t++) if (pEnchant->spellid[t] == m_spellInfo->Id) - { - amount = uint32((item_rand_suffix->prefix[k]*castItem->GetItemSuffixFactor()) / 10000); + { + amount = uint32((item_rand_suffix->prefix[k] * castItem->GetItemSuffixFactor()) / 10000); break; - } + } } if (amount) @@ -509,6 +514,10 @@ int32 AuraEffect::CalculateAmount(Unit* caster) } } } + } + } + } + } // custom amount calculations go here switch (GetAuraType()) diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 8c62a6ad6e4..e840aba7aca 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -303,7 +303,7 @@ Aura* Aura::Create(SpellInfo const* spellproto, uint8 effMask, WorldObject* owne ASSERT(caster || !casterGUID.IsEmpty()); ASSERT(effMask <= MAX_EFFECT_MASK); // try to get caster of aura - if (casterGUID) + if (!casterGUID.IsEmpty()) { if (owner->GetGUID() == casterGUID) caster = owner->ToUnit(); @@ -1704,7 +1704,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().IsEmpty() && existingAura->GetCastItemGUID()) + if (!GetCastItemGUID().IsEmpty() && !existingAura->GetCastItemGUID().IsEmpty()) if (GetCastItemGUID() != existingAura->GetCastItemGUID() && (m_spellInfo->AttributesCu & 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 c31034fbcbb..b652f3a1f18 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -91,7 +91,7 @@ SpellDestination::SpellDestination(WorldObject const& wObj) void SpellDestination::Relocate(Position const& pos) { - if (_transportGUID) + if (!_transportGUID.IsEmpty()) { Position offset; _position.GetPositionOffsetTo(pos, offset); @@ -102,7 +102,7 @@ void SpellDestination::Relocate(Position const& pos) void SpellDestination::RelocateOffset(Position const& offset) { - if (_transportGUID) + if (!_transportGUID.IsEmpty()) _transportOffset.RelocateOffset(offset); _position.RelocateOffset(offset); @@ -136,7 +136,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(); @@ -144,7 +144,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); @@ -153,7 +153,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(); @@ -161,7 +161,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); @@ -191,7 +191,7 @@ void SpellCastTargets::Write(ByteBuffer& data) if (m_targetMask & TARGET_FLAG_SOURCE_LOCATION) { data << m_src._transportGUID.WriteAsPacked(); // relative position guid here - transport for example - if (m_src._transportGUID) + if (!m_src._transportGUID.IsEmpty()) data << m_src._transportOffset.PositionXYZStream(); else data << m_src._position.PositionXYZStream(); @@ -200,7 +200,7 @@ void SpellCastTargets::Write(ByteBuffer& data) if (m_targetMask & TARGET_FLAG_DEST_LOCATION) { data << m_dst._transportGUID.WriteAsPacked(); // relative position guid here - transport for example - if (m_dst._transportGUID) + if (!m_dst._transportGUID.IsEmpty()) data << m_dst._transportOffset.PositionXYZStream(); else data << m_dst._position.PositionXYZStream(); @@ -560,7 +560,7 @@ m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharme if (Item* pItem = m_caster->ToPlayer()->GetWeaponForAttack(RANGED_ATTACK)) m_spellSchoolMask = SpellSchoolMask(1 << pItem->GetTemplate()->DamageType); - if (originalCasterGUID) + if (!originalCasterGUID.IsEmpty()) m_originalCasterGUID = originalCasterGUID; else m_originalCasterGUID = m_caster->GetGUID(); @@ -4243,7 +4243,7 @@ void Spell::SendChannelStart(uint32 duration) m_caster->SendMessageToSet(&data, true); m_timer = duration; - if (channelTarget) + if (!channelTarget.IsEmpty()) m_caster->SetChannelObjectGuid(channelTarget); m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, m_spellInfo->Id); @@ -4356,8 +4356,12 @@ void Spell::TakePower() if (m_caster->GetTypeId() == TYPEID_PLAYER) { if (powerType == POWER_RAGE || powerType == POWER_ENERGY || powerType == POWER_RUNES) - if (ObjectGuid targetGUID = m_targets.GetUnitTargetGUID()) - for (std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + { + ObjectGuid targetGUID = m_targets.GetUnitTargetGUID(); + if (!targetGUID.IsEmpty()) + { + for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) + { if (ihit->targetGUID == targetGUID) { if (ihit->missCondition != SPELL_MISS_NONE) @@ -4369,6 +4373,9 @@ void Spell::TakePower() } break; } + } + } + } } if (powerType == POWER_RUNES) @@ -4654,7 +4661,8 @@ void Spell::HandleHolyPower(Player* caster) if (!m_powerCost || !modOwner) return; - if (ObjectGuid targetGUID = m_targets.GetUnitTargetGUID()) + ObjectGuid targetGUID = m_targets.GetUnitTargetGUID(); + if (!targetGUID.IsEmpty()) { for (std::list<TargetInfo>::iterator ihit = m_UniqueTargetInfo.begin(); ihit != m_UniqueTargetInfo.end(); ++ihit) { @@ -5271,11 +5279,11 @@ SpellCastResult Spell::CheckCast(bool strict) switch (SummonProperties->Category) { case SUMMON_CATEGORY_PET: - if (m_caster->GetPetGUID()) + if (!m_caster->GetPetGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; // intentional missing break, check both GetPetGUID() and GetCharmGUID for SUMMON_CATEGORY_PET case SUMMON_CATEGORY_PUPPET: - if (m_caster->GetCharmGUID()) + if (!m_caster->GetCharmGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; break; } @@ -5287,14 +5295,14 @@ SpellCastResult Spell::CheckCast(bool strict) { if (m_targets.GetUnitTarget()->GetTypeId() != TYPEID_PLAYER) return SPELL_FAILED_BAD_TARGETS; - if (m_targets.GetUnitTarget()->GetPetGUID()) + if (!m_targets.GetUnitTarget()->GetPetGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; } break; } case SPELL_EFFECT_SUMMON_PET: { - if (m_caster->GetPetGUID()) //let warlock do a replacement summon + if (!m_caster->GetPetGUID().IsEmpty()) //let warlock do a replacement summon { if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->getClass() == CLASS_WARLOCK) { @@ -5306,7 +5314,7 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_ALREADY_HAVE_SUMMON; } - if (m_caster->GetCharmGUID()) + if (!m_caster->GetCharmGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; break; } @@ -5412,7 +5420,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (!pet) return SPELL_FAILED_NO_PET; - if (pet->GetCharmerGUID()) + if (!pet->GetCharmerGUID().IsEmpty()) return SPELL_FAILED_CHARMED; break; } @@ -5420,16 +5428,16 @@ SpellCastResult Spell::CheckCast(bool strict) case SPELL_AURA_MOD_CHARM: case SPELL_AURA_AOE_CHARM: { - if (m_caster->GetCharmerGUID()) + if (!m_caster->GetCharmerGUID().IsEmpty()) return SPELL_FAILED_CHARMED; if (m_spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_MOD_CHARM || m_spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_MOD_POSSESS) { - if (m_caster->GetPetGUID()) + if (!m_caster->GetPetGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_SUMMON; - if (m_caster->GetCharmGUID()) + if (!m_caster->GetCharmGUID().IsEmpty()) return SPELL_FAILED_ALREADY_HAVE_CHARM; } @@ -5441,7 +5449,7 @@ SpellCastResult Spell::CheckCast(bool strict) if (target->IsMounted()) return SPELL_FAILED_CANT_BE_CHARMED; - if (target->GetCharmerGUID()) + if (!target->GetCharmerGUID().IsEmpty()) return SPELL_FAILED_CHARMED; if (target->GetOwner() && target->GetOwner()->GetTypeId() == TYPEID_PLAYER) @@ -5889,7 +5897,7 @@ SpellCastResult Spell::CheckItems() if (!m_CastItem) { - if (m_castItemGUID) + if (!m_castItemGUID.IsEmpty()) return SPELL_FAILED_ITEM_NOT_READY; } else @@ -5960,7 +5968,7 @@ SpellCastResult Spell::CheckItems() } // check target item - if (m_targets.GetItemTargetGUID()) + if (!m_targets.GetItemTargetGUID().IsEmpty()) { if (!m_targets.GetItemTarget()) return SPELL_FAILED_ITEM_GONE; @@ -6491,7 +6499,7 @@ bool Spell::CheckEffectTarget(Unit const* target, uint32 eff, Position const* lo return false; if (target->IsMounted()) return false; - if (target->GetCharmerGUID()) + if (!target->GetCharmerGUID().IsEmpty()) return false; if (int32 damage = CalculateDamage(eff, target)) if ((int32)target->getLevel() > damage) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index a39763e7b3b..1e5b0ee2193 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2409,8 +2409,7 @@ void Spell::EffectUntrainTalents(SpellEffIndex /*effIndex*/) 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(SpellEffIndex effIndex) @@ -2694,7 +2693,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT_TARGET) return; - if (m_caster->GetPetGUID()) + if (!m_caster->GetPetGUID().IsEmpty()) return; if (!unitTarget) @@ -4199,8 +4198,8 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex) uint32 go_id = m_spellInfo->Effects[effIndex].MiscValue; uint8 slot = m_spellInfo->Effects[effIndex].Effect - SPELL_EFFECT_SUMMON_OBJECT_SLOT1; - - if (ObjectGuid guid = m_caster->m_ObjectSlot[slot]) + ObjectGuid guid = m_caster->m_ObjectSlot[slot]; + if (!guid.IsEmpty()) { if (GameObject* obj = m_caster->GetMap()->GetGameObject(guid)) { diff --git a/src/server/game/Tickets/TicketMgr.cpp b/src/server/game/Tickets/TicketMgr.cpp index 0c5f3e608d9..46ed256d24e 100644 --- a/src/server/game/Tickets/TicketMgr.cpp +++ b/src/server/game/Tickets/TicketMgr.cpp @@ -360,7 +360,7 @@ void TicketMgr::CloseTicket(uint32 ticketId, ObjectGuid source) { SQLTransaction trans = SQLTransaction(NULL); ticket->SetClosedBy(source); - if (source) + if (!source.IsEmpty()) --_openTicketCount; ticket->SaveToDB(trans); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 0d9827d390c..8877289813b 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -227,7 +227,7 @@ public: { for (uint8 i = 0; i < 4; ++i) { - if (AddGUID[i]) + if (!AddGUID[i].IsEmpty()) { if (Creature* temp = ObjectAccessor::GetCreature(*me, AddGUID[i])) temp->DespawnOrUnsummon(); @@ -239,7 +239,7 @@ public: { for (uint8 i = 0; i < 4; ++i) { - if (AddGUID[i]) + if (!AddGUID[i].IsEmpty()) { Creature* temp = ObjectAccessor::GetCreature((*me), AddGUID[i]); if (temp && temp->IsAlive()) @@ -273,7 +273,7 @@ public: { for (uint8 i = 0; i < 4; ++i) { - if (AddGUID[i]) + if (!AddGUID[i].IsEmpty()) { Creature* temp = ObjectAccessor::GetCreature((*me), AddGUID[i]); if (temp && temp->IsAlive()) @@ -353,15 +353,20 @@ struct boss_moroes_guestAI : public ScriptedAI void AcquireGUID() { if (Creature* Moroes = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_MOROES))) + { for (uint8 i = 0; i < 4; ++i) - if (ObjectGuid GUID = ENSURE_AI(boss_moroes::boss_moroesAI, Moroes->AI())->AddGUID[i]) + { + ObjectGuid GUID = ENSURE_AI(boss_moroes::boss_moroesAI, Moroes->AI())->AddGUID[i]; + if (!GUID.IsEmpty()) GuestGUID[i] = GUID; + } + } } Unit* SelectGuestTarget() { ObjectGuid TempGUID = GuestGUID[rand32() % 4]; - if (TempGUID) + if (!TempGUID.IsEmpty()) { Unit* unit = ObjectAccessor::GetUnit(*me, TempGUID); if (unit && unit->IsAlive()) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index e18aa3cd91c..2b0fb61dba3 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -160,7 +160,7 @@ public: void JustDied(Unit* /*killer*/) override { - if (SacrificeGUID) + if (!SacrificeGUID.IsEmpty()) { Unit* Sacrifice = ObjectAccessor::GetUnit(*me, SacrificeGUID); if (Sacrifice) @@ -301,7 +301,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (PortalGUID[i]) + if (!PortalGUID[i].IsEmpty()) { if (Creature* pPortal = ObjectAccessor::GetCreature(*me, PortalGUID[i])) { @@ -359,7 +359,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (PortalGUID[i]) + if (!PortalGUID[i].IsEmpty()) { if (Creature* pPortal = ObjectAccessor::GetCreature((*me), PortalGUID[i])) pPortal->DespawnOrUnsummon(); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 63d543568fb..e32b32029d2 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -266,7 +266,7 @@ public: void JustDied(Unit* /*killer*/) override { - if (DorotheeGUID) + if (!DorotheeGUID.IsEmpty()) { Creature* Dorothee = (ObjectAccessor::GetCreature((*me), DorotheeGUID)); if (Dorothee && Dorothee->IsAlive()) @@ -1293,7 +1293,7 @@ public: void EnterCombat(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/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 15d33256fb6..0b1292e6aae 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -919,7 +919,7 @@ void npc_head::npc_headAI::Disappear() if (withbody) return; - if (bodyGUID) + if (!bodyGUID.IsEmpty()) { Creature* body = ObjectAccessor::GetCreature((*me), bodyGUID); if (body && body->IsAlive()) diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 37dd666cce0..44d503ac672 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -176,7 +176,7 @@ class npc_winterfin_playmate : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -283,7 +283,7 @@ class npc_snowfall_glade_playmate : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -389,7 +389,7 @@ class npc_the_biggest_tree : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -484,7 +484,7 @@ class npc_high_oracle_soo_roo : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -580,7 +580,7 @@ class npc_elder_kekek : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -676,7 +676,7 @@ class npc_the_etymidian : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -797,14 +797,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_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 131f875bc05..599e0eded39 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -232,7 +232,7 @@ public: { if (CheckTimer <= diff) { - if (AnetheronGUID) + if (!AnetheronGUID.IsEmpty()) { Creature* boss = ObjectAccessor::GetCreature(*me, AnetheronGUID); if (!boss || (boss && boss->isDead())) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index aa411707952..0bfb4cf181e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -245,7 +245,7 @@ public: { if (CheckTimer <= diff) { - if (AzgalorGUID) + if (!AzgalorGUID.IsEmpty()) { Creature* boss = ObjectAccessor::GetCreature(*me, AzgalorGUID); if (!boss || (boss && boss->isDead())) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 700f1b75acc..1211ad1c144 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -816,7 +816,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 d34867f32b8..c46de9d07f5 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -374,7 +374,7 @@ public: { Player* warrior = NULL; - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) warrior = ObjectAccessor::GetPlayer(*me, PlayerGUID); if (!warrior) @@ -387,7 +387,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()) @@ -395,7 +395,7 @@ public: } } - if (BigWill) // unsummon bigWill + if (!BigWill.IsEmpty()) // unsummon bigWill { Creature* creature = ObjectAccessor::GetCreature((*me), BigWill); if (creature && creature->IsAlive()) @@ -436,7 +436,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_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 4cb401a6e16..89f61373dee 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -250,7 +250,7 @@ public: { ObjectGuid opfer = instance->GetGuidData(DATA_ADD_JEDOGA_INITIAND); - if (opfer) + if (!opfer.IsEmpty()) { Talk(TEXT_SACRIFICE_1); instance->SetGuidData(DATA_ADD_JEDOGA_OPFER, opfer); 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 645588c0bc5..faf95ec59b3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -247,7 +247,7 @@ class boss_prince_taldaram : public CreatureScript Unit* GetEmbraceTarget() { - if (_embraceTargetGUID) + if (!_embraceTargetGUID.IsEmpty()) return ObjectAccessor::GetUnit(*me, _embraceTargetGUID); return NULL; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 6c3b4378bec..11ab22362fa 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -216,7 +216,10 @@ public: 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) @@ -224,14 +227,19 @@ public: 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) @@ -249,14 +257,22 @@ public: 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; } + } + } + } + ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4); if (++_crystalHandlerCount >= 4) { Talk(SAY_ARCANE_FIELD); @@ -266,7 +282,7 @@ public: if (IsHeroic()) events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15000); } - else if (ObjectGuid guid = instance->GetGuidData(DATA_NOVOS_SUMMONER_4)) + else if (!guid.IsEmpty()) if (Creature* crystalChannelTarget = ObjectAccessor::GetCreature(*me, guid)) crystalChannelTarget->AI()->SetData(SPELL_SUMMON_CRYSTAL_HANDLER, 15000); } @@ -330,9 +346,12 @@ public: 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 6a157be26ee..d7e4d8f76b2 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 @@ -370,7 +370,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 43490de493c..1c5ef133b89 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -403,7 +403,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/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 4151c4a85a7..b66bc07f2c8 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -221,7 +221,7 @@ class instance_naxxramas : public InstanceMapScript switch (go->GetEntry()) { case GO_BIRTH: - if (SapphironGUID) + if (!SapphironGUID.IsEmpty()) { if (Creature* sapphiron = instance->GetCreature(SapphironGUID)) sapphiron->AI()->DoAction(DATA_SAPPHIRON_BIRTH); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index ed08296acd8..e61cfdae328 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -145,7 +145,7 @@ class boss_anomalus : public CreatureScript 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 9486d95639f..4791b725635 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -232,7 +232,7 @@ class boss_kologarn : public CreatureScript summon->ClearUnitState(UNIT_STATE_CASTING); // 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 5b0e1f31bd7..9d2a61a16f4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -286,7 +286,7 @@ public: 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/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index bbb8c758bb1..53435cee61c 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -172,7 +172,8 @@ public: if (uiChainHealTimer <= diff) { - if (ObjectGuid TargetGUID = GetChainHealTargetGUID()) + ObjectGuid TargetGUID = GetChainHealTargetGUID(); + if (!TargetGUID.IsEmpty()) { if (Creature* target = ObjectAccessor::GetCreature(*me, TargetGUID)) DoCast(target, SPELL_CHAIN_HEAL); diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 0b219eeff56..b48efcecea1 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -261,7 +261,7 @@ public: } else // Encounter is a loop pretty much. Phase 1 -> Phase 2 -> Phase 1 -> Phase 2 till death or enrage { - if (TargetGUID) + if (!TargetGUID.IsEmpty()) RevertThreatOnTarget(TargetGUID); TargetGUID.Clear(); Phase1 = true; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index aec4e982a49..8e7df5f1c3f 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -711,7 +711,7 @@ public: default: break; } - if (MaievGUID) + if (!MaievGUID.IsEmpty()) { if (Creature* maiev = ObjectAccessor::GetCreature(*me, MaievGUID)) if (maiev->IsAlive()) @@ -853,7 +853,7 @@ public: case 8: // glaive return for (uint8 i = 0; i < 2; ++i) { - if (GlaiveGUID[i]) + if (!GlaiveGUID[i].IsEmpty()) { Unit* Glaive = ObjectAccessor::GetUnit(*me, GlaiveGUID[i]); if (Glaive) @@ -871,7 +871,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); for (uint8 i = 0; i < 2; ++i) { - if (GlaiveGUID[i]) + if (!GlaiveGUID[i].IsEmpty()) { if (Creature* glaive = ObjectAccessor::GetCreature(*me, GlaiveGUID[i])) glaive->DespawnOrUnsummon(); @@ -928,7 +928,7 @@ public: DoResetThreat(); break; case 9: - if (MaievGUID) + if (!MaievGUID.IsEmpty()) EnterPhase(PHASE_NORMAL_MAIEV); // Depending on whether we summoned Maiev, we switch to either phase 5 or 3 else EnterPhase(PHASE_NORMAL_2); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index 39aac706acc..ed145045131 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -232,7 +232,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (TargetGUID[i]) + if (!TargetGUID[i].IsEmpty()) { if (Unit* unit = ObjectAccessor::GetUnit(*me, TargetGUID[i])) unit->CastSpell(unit, SPELL_ATTRACTION, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index 23abf48233e..6c15784c35e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -172,7 +172,7 @@ public: { instance->SetBossState(DATA_RELIQUARY_OF_SOULS, NOT_STARTED); - if (EssenceGUID) + if (!EssenceGUID.IsEmpty()) { if (Creature* essence = ObjectAccessor::GetCreature(*me, EssenceGUID)) essence->DespawnOrUnsummon(); @@ -268,7 +268,7 @@ public: } Creature* Essence = NULL; - if (EssenceGUID) + if (!EssenceGUID.IsEmpty()) { Essence = ObjectAccessor::GetCreature(*me, EssenceGUID); if (!Essence) @@ -387,7 +387,7 @@ public: void npc_enslaved_soul::npc_enslaved_soulAI::JustDied(Unit* /*killer*/) { - if (ReliquaryGUID) + if (!ReliquaryGUID.IsEmpty()) if (Creature* Reliquary = (ObjectAccessor::GetCreature((*me), ReliquaryGUID))) ++(ENSURE_AI(boss_reliquary_of_souls::boss_reliquary_of_soulsAI, Reliquary->AI())->SoulDeathCount); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 9e9f3f60a59..6666fd58d32 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -99,7 +99,7 @@ public: { if (CheckTeronTimer <= diff) { - if (TeronGUID) + if (!TeronGUID.IsEmpty()) { DoZoneInCombat(); @@ -364,7 +364,7 @@ public: /************************************************************************/ Unit* ghost = NULL; - if (GhostGUID) + if (!GhostGUID.IsEmpty()) ghost = ObjectAccessor::GetUnit(*me, GhostGUID); if (ghost && ghost->IsAlive() && ghost->HasAura(SPELL_SHADOW_OF_DEATH)) { @@ -410,7 +410,7 @@ public: Talk(SAY_AGGRO); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_NONE); Done = true; - if (AggroTargetGUID) + if (!AggroTargetGUID.IsEmpty()) { Unit* unit = ObjectAccessor::GetUnit(*me, AggroTargetGUID); if (unit) diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 3c4b37165de..73dc3d1904f 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -304,7 +304,7 @@ public: for (uint8 i = 0; i < 4; ++i) { - if (Council[i]) + if (!Council[i].IsEmpty()) { if (Creature* member = ObjectAccessor::GetCreature(*me, Council[i])) if (member->IsAlive()) @@ -352,7 +352,7 @@ public: uint8 EvadeCheck = 0; for (uint8 i = 0; i < 4; ++i) { - if (Council[i]) + if (!Council[i].IsEmpty()) { if (Creature* Member = (ObjectAccessor::GetCreature((*me), Council[i]))) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index ca04d41e3c8..6fba2c3dd9d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -144,7 +144,8 @@ public: RAdvisors[2] = instance->GetGuidData(DATA_CARIBDIS); // Respawn of the 3 Advisors for (uint8 i = 0; i < MAX_ADVISORS; ++i) - if (RAdvisors[i]) + { + if (!RAdvisors[i].IsEmpty()) { Creature* advisor = ObjectAccessor::GetCreature(*me, RAdvisors[i]); if (advisor && !advisor->IsAlive()) @@ -154,6 +155,7 @@ public: advisor->GetMotionMaster()->MoveTargetedHome(); } } + } instance->SetData(DATA_KARATHRESSEVENT, NOT_STARTED); } @@ -272,7 +274,8 @@ public: BlessingOfTides = true; bool continueTriggering = false; for (uint8 i = 0; i < MAX_ADVISORS; ++i) - if (Advisors[i]) + { + if (!Advisors[i].IsEmpty()) { Creature* advisor = ObjectAccessor::GetCreature(*me, Advisors[i]); if (advisor && advisor->IsAlive()) @@ -281,6 +284,8 @@ public: break; } } + } + if (continueTriggering) { DoCast(me, SPELL_BLESSING_OF_THE_TIDES); 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 450ac350f0c..89b28b8dcd8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -211,7 +211,7 @@ public: 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 00d52727798..87451a1f69c 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 @@ -325,7 +325,7 @@ public: // and reseting equipment me->LoadEquipment(); - if (instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)) + if (!instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER).IsEmpty()) { Unit* victim = NULL; victim = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_LEOTHERAS_EVENT_STARTER)); @@ -353,9 +353,9 @@ public: //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]); @@ -373,7 +373,7 @@ public: { 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()) @@ -402,11 +402,10 @@ public: Talk(SAY_DEATH); //despawn copy - if (Demon) - { + if (!Demon.IsEmpty()) if (Creature* pDemon = ObjectAccessor::GetCreature(*me, Demon)) pDemon->DespawnOrUnsummon(); - } + instance->SetData(DATA_LEOTHERASTHEBLINDEVENT, DONE); } @@ -742,7 +741,7 @@ public: { if (!me->IsInCombat() && !me->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) { - if (leotherasGUID) + if (!leotherasGUID.IsEmpty()) { Creature* leotheras = ObjectAccessor::GetCreature(*me, leotherasGUID); if (leotheras && leotheras->IsAlive()) diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index e8ce29e9f1a..d730c26c4f4 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -133,7 +133,7 @@ public: } else SporeStriders_Timer -= diff; // Levitate - if (LevitatedTarget) + if (!LevitatedTarget.IsEmpty()) { if (LevitatedTarget_Timer <= diff) { 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 831818a4c9a..f53b4bea70c 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 @@ -168,7 +168,7 @@ class boss_omor_the_unscarred : public CreatureScript OrbitalStrike_Timer = 14000 + rand32() % 2000; PlayerGUID = temp->GetGUID(); - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) CanPullBack = true; } } diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index e7c1e60e432..7dbccf5908a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -268,8 +268,8 @@ class boss_magtheridon : public CreatureScript void SetClicker(ObjectGuid cubeGUID, ObjectGuid clickerGUID) { // to avoid multiclicks from 1 cube - if (ObjectGuid guid = Cube[cubeGUID]) - DebuffClicker(ObjectAccessor::GetUnit(*me, guid)); + if (!Cube[cubeGUID].IsEmpty()) + DebuffClicker(ObjectAccessor::GetUnit(*me, Cube[cubeGUID])); Cube[cubeGUID] = clickerGUID; NeedCheckCube = true; } diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 0952fc04512..b37adae3fe9 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -417,7 +417,7 @@ public: if (id == 1) { - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) { Unit* player = ObjectAccessor::GetUnit(*me, PlayerGUID); if (player) @@ -441,7 +441,7 @@ public: if (FlyTimer <= diff) { Tapped = false; - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) { Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID); if (player && player->GetQuestStatus(10854) == QUEST_STATUS_INCOMPLETE) @@ -551,7 +551,7 @@ public: { if (PoisonTimer <= diff) { - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) { Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID); if (player && player->GetQuestStatus(11020) == QUEST_STATUS_INCOMPLETE) @@ -776,7 +776,7 @@ public: IllidanGUID = Illidan->GetGUID(); Illidan->SetVisible(false); } - if (PlayerGUID) + if (!PlayerGUID.IsEmpty()) { Player* player = ObjectAccessor::GetPlayer(*me, PlayerGUID); if (player) @@ -1760,7 +1760,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)) { @@ -1775,7 +1775,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/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 538dca8e4b9..3772376e764 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -66,7 +66,7 @@ class npc_pet_gen_mojo : public CreatureScript Talk(SAY_MOJO, player); - if (_victimGUID) + if (!_victimGUID.IsEmpty()) if (Player* victim = ObjectAccessor::GetPlayer(*me, _victimGUID)) victim->RemoveAura(SPELL_FEELING_FROGGY); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index a774a8a7db7..153e4fa758c 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3048,7 +3048,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader if (Unit* target = GetHitUnit()) { WorldPacket data(SMSG_SPIRIT_HEALER_CONFIRM, 8); - data << uint64(target->GetGUID()); + data << target->GetGUID(); originalCaster->GetSession()->SendPacket(&data); } } |