From cda53c8e7f83b13a34fac82b5101f6e9a26d1106 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 8 Oct 2023 10:35:31 -0400 Subject: [PATCH] Some cleanups. (might break build for scripts as they are a WIP) --- Source/Game/AI/AISelector.cs | 2 +- Source/Game/AI/CoreAI/CombatAI.cs | 6 +- Source/Game/AI/CoreAI/CreatureAI.cs | 8 +- Source/Game/AI/CoreAI/PetAI.cs | 58 +++--- Source/Game/AI/PlayerAI/PlayerAI.cs | 34 ++-- Source/Game/AI/ScriptedAI/ScriptedAI.cs | 38 ++-- Source/Game/AI/ScriptedAI/ScriptedEscortAI.cs | 16 +- .../Game/AI/ScriptedAI/ScriptedFollowerAI.cs | 18 +- Source/Game/AI/SmartScripts/SmartAI.cs | 14 +- Source/Game/AI/SmartScripts/SmartScript.cs | 86 ++++---- Source/Game/Accounts/AccountManager.cs | 6 +- .../Game/Achievements/AchievementManager.cs | 12 +- Source/Game/Achievements/CriteriaHandler.cs | 64 +++--- Source/Game/Arenas/Arena.cs | 8 +- Source/Game/Arenas/ArenaTeam.cs | 30 +-- Source/Game/Arenas/Zones/DalaranSewers.cs | 14 +- Source/Game/Arenas/Zones/RingofValor.cs | 4 +- Source/Game/AuctionHouse/AuctionManager.cs | 30 +-- Source/Game/BattleFields/BattleField.cs | 70 +++---- Source/Game/BattleGrounds/BattleGround.cs | 99 +++++---- .../Game/BattleGrounds/BattleGroundManager.cs | 6 +- .../Game/BattleGrounds/BattleGroundQueue.cs | 22 +- .../Game/BattleGrounds/Zones/ArathiBasin.cs | 6 +- Source/Game/BattleGrounds/Zones/EyeofStorm.cs | 18 +- .../BattleGrounds/Zones/StrandofAncients.cs | 116 +++++------ .../Game/BattleGrounds/Zones/WarsongGluch.cs | 18 +- Source/Game/BattlePets/BattlePetManager.cs | 4 +- Source/Game/BlackMarket/BlackMarketManager.cs | 12 +- Source/Game/Calendar/CalendarManager.cs | 28 +-- Source/Game/Chat/Channels/Channel.cs | 54 ++--- Source/Game/Chat/Channels/ChannelAppenders.cs | 4 +- Source/Game/Chat/CommandHandler.cs | 12 +- Source/Game/Chat/CommandManager.cs | 4 +- Source/Game/Chat/Commands/AccountCommands.cs | 4 +- .../Game/Chat/Commands/AchievementCommands.cs | 2 +- Source/Game/Chat/Commands/BanCommands.cs | 10 +- Source/Game/Chat/Commands/CastCommands.cs | 12 +- .../Game/Chat/Commands/CharacterCommands.cs | 8 +- Source/Game/Chat/Commands/CheatCommands.cs | 4 +- Source/Game/Chat/Commands/DebugCommands.cs | 64 +++--- Source/Game/Chat/Commands/DeserterCommands.cs | 4 +- .../Game/Chat/Commands/GameObjectCommands.cs | 22 +- Source/Game/Chat/Commands/GroupCommands.cs | 30 +-- Source/Game/Chat/Commands/GuildCommands.cs | 10 +- Source/Game/Chat/Commands/HonorCommands.cs | 8 +- Source/Game/Chat/Commands/LFGCommands.cs | 10 +- Source/Game/Chat/Commands/LearnCommands.cs | 6 +- Source/Game/Chat/Commands/ListCommands.cs | 14 +- Source/Game/Chat/Commands/LookupCommands.cs | 38 ++-- Source/Game/Chat/Commands/MMapsCommands.cs | 2 +- Source/Game/Chat/Commands/MessageCommands.cs | 4 +- Source/Game/Chat/Commands/MiscCommands.cs | 110 +++++----- Source/Game/Chat/Commands/ModifyCommands.cs | 32 +-- Source/Game/Chat/Commands/NPCCommands.cs | 68 +++---- Source/Game/Chat/Commands/PetCommands.cs | 14 +- Source/Game/Chat/Commands/QuestCommands.cs | 10 +- Source/Game/Chat/Commands/ResetCommands.cs | 4 +- Source/Game/Chat/Commands/SceneCommands.cs | 8 +- Source/Game/Chat/Commands/SendCommands.cs | 10 +- Source/Game/Chat/Commands/ServerCommands.cs | 4 +- Source/Game/Chat/Commands/SpellCommands.cs | 10 +- Source/Game/Chat/Commands/TeleCommands.cs | 8 +- Source/Game/Chat/Commands/TicketCommands.cs | 14 +- Source/Game/Chat/Commands/TitleCommands.cs | 8 +- Source/Game/Chat/Commands/WPCommands.cs | 42 ++-- Source/Game/Combat/CombatManager.cs | 2 +- Source/Game/Combat/ThreatManager.cs | 6 +- Source/Game/Conditions/Condition.cs | 20 +- Source/Game/Conditions/ConditionManager.cs | 34 ++-- Source/Game/DataStorage/WhoListStorage.cs | 2 +- Source/Game/DungeonFinding/LFGManager.cs | 68 +++---- Source/Game/DungeonFinding/LFGScripts.cs | 12 +- .../Game/Entities/AreaTrigger/AreaTrigger.cs | 24 +-- Source/Game/Entities/Conversation.cs | 2 +- Source/Game/Entities/Creature/Creature.cs | 26 +-- Source/Game/Entities/Creature/Gossip.cs | 4 +- Source/Game/Entities/DynamicObject.cs | 2 +- Source/Game/Entities/GameObject/GameObject.cs | 66 +++--- Source/Game/Entities/Item/Bag.cs | 4 +- Source/Game/Entities/Item/Item.cs | 20 +- Source/Game/Entities/Item/ItemBonusManager.cs | 2 +- Source/Game/Entities/Object/WorldObject.cs | 91 ++++----- Source/Game/Entities/Pet.cs | 12 +- .../Game/Entities/Player/CinematicManager.cs | 8 +- .../Game/Entities/Player/CollectionManager.cs | 12 +- Source/Game/Entities/Player/KillRewarder.cs | 8 +- .../Entities/Player/Player.Achievement.cs | 2 +- Source/Game/Entities/Player/Player.Combat.cs | 18 +- Source/Game/Entities/Player/Player.DB.cs | 28 +-- Source/Game/Entities/Player/Player.Groups.cs | 30 +-- Source/Game/Entities/Player/Player.Items.cs | 132 ++++++------ Source/Game/Entities/Player/Player.Map.cs | 12 +- Source/Game/Entities/Player/Player.PvP.cs | 16 +- Source/Game/Entities/Player/Player.Quest.cs | 28 +-- Source/Game/Entities/Player/Player.Spells.cs | 32 +-- Source/Game/Entities/Player/Player.Talents.cs | 4 +- Source/Game/Entities/Player/Player.cs | 106 +++++----- Source/Game/Entities/Player/SocialMgr.cs | 10 +- Source/Game/Entities/Player/TradeData.cs | 4 +- Source/Game/Entities/StatSystem.cs | 36 ++-- Source/Game/Entities/TemporarySummon.cs | 8 +- Source/Game/Entities/Totem.cs | 6 +- Source/Game/Entities/Transport.cs | 10 +- Source/Game/Entities/Unit/CharmInfo.cs | 2 +- Source/Game/Entities/Unit/Unit.Combat.cs | 38 ++-- Source/Game/Entities/Unit/Unit.Movement.cs | 56 +++--- Source/Game/Entities/Unit/Unit.Pets.cs | 30 +-- Source/Game/Entities/Unit/Unit.Spells.cs | 58 +++--- Source/Game/Entities/Unit/Unit.cs | 56 +++--- Source/Game/Entities/Vehicle.cs | 9 +- Source/Game/Events/GameEventManager.cs | 2 +- Source/Game/Events/GameEventSender.cs | 2 +- Source/Game/Garrisons/GarrisonMap.cs | 6 +- Source/Game/Garrisons/Garrisons.cs | 28 +-- Source/Game/Globals/ObjectAccessor.cs | 6 +- Source/Game/Globals/ObjectManager.cs | 18 +- Source/Game/Groups/Group.cs | 71 +++---- Source/Game/Groups/GroupManager.cs | 2 +- Source/Game/Guilds/Guild.cs | 27 +-- Source/Game/Guilds/GuildManager.cs | 16 +- Source/Game/Handlers/ArtifactHandler.cs | 16 +- Source/Game/Handlers/AuctionHandler.cs | 34 ++-- Source/Game/Handlers/AzeriteHandler.cs | 6 +- Source/Game/Handlers/BankHandler.cs | 12 +- Source/Game/Handlers/BattleGroundHandler.cs | 18 +- Source/Game/Handlers/BattlePetHandler.cs | 2 +- Source/Game/Handlers/BlackMarketHandlers.cs | 6 +- Source/Game/Handlers/CalendarHandler.cs | 4 +- Source/Game/Handlers/CharacterHandler.cs | 28 +-- Source/Game/Handlers/ChatHandler.cs | 32 +-- Source/Game/Handlers/CombatHandler.cs | 4 +- Source/Game/Handlers/DuelHandler.cs | 2 +- Source/Game/Handlers/GarrisonHandler.cs | 4 +- Source/Game/Handlers/GroupHandler.cs | 38 ++-- Source/Game/Handlers/GuildHandler.cs | 112 +++++------ Source/Game/Handlers/InspectHandler.cs | 6 +- Source/Game/Handlers/ItemHandler.cs | 34 ++-- Source/Game/Handlers/LFGHandler.cs | 14 +- Source/Game/Handlers/LogoutHandler.cs | 2 +- Source/Game/Handlers/LootHandler.cs | 18 +- Source/Game/Handlers/MailHandler.cs | 12 +- Source/Game/Handlers/MiscHandler.cs | 22 +- Source/Game/Handlers/MovementHandler.cs | 26 +-- Source/Game/Handlers/NPCHandler.cs | 14 +- Source/Game/Handlers/PetHandler.cs | 48 ++--- Source/Game/Handlers/PetitionsHandler.cs | 20 +- Source/Game/Handlers/QueryHandler.cs | 8 +- Source/Game/Handlers/QuestHandler.cs | 20 +- Source/Game/Handlers/SocialHandler.cs | 2 +- Source/Game/Handlers/SpellHandler.cs | 20 +- Source/Game/Handlers/TaxiHandler.cs | 4 +- Source/Game/Handlers/ToyHandler.cs | 2 +- Source/Game/Handlers/TradeHandler.cs | 42 ++-- Source/Game/Handlers/TraitHandler.cs | 2 +- .../Handlers/TransmogrificationHandler.cs | 6 +- Source/Game/Handlers/VehicleHandler.cs | 36 ++-- Source/Game/Handlers/VoidStorageHandler.cs | 14 +- Source/Game/Loot/Loot.cs | 10 +- Source/Game/Loot/LootManager.cs | 2 +- Source/Game/Mails/Mail.cs | 4 +- Source/Game/Maps/GridNotifiers.cs | 68 +++---- Source/Game/Maps/Instances/InstanceScript.cs | 28 +-- Source/Game/Maps/Map.cs | 93 ++++----- Source/Game/Maps/MapManager.cs | 20 +- Source/Game/Miscellaneous/Formulas.cs | 6 +- Source/Game/Movement/AbstractFollower.cs | 4 +- .../Generators/ChaseMovementGenerator.cs | 8 +- .../Generators/ConfusedMovementGenerator.cs | 6 +- .../Generators/FollowMovementGenerator.cs | 2 +- .../Generators/GenericMovementGenerator.cs | 2 +- .../Game/Movement/Generators/PointMovement.cs | 2 +- .../Generators/RandomMovementGenerator.cs | 2 +- .../Movement/Generators/WaypointMovement.cs | 4 +- Source/Game/Movement/MotionMaster.cs | 10 +- Source/Game/Movement/MoveSplineInitArgs.cs | 2 +- Source/Game/Networking/PacketManager.cs | 4 +- Source/Game/Networking/Packets/ChatPackets.cs | 10 +- .../Game/Networking/Packets/CombatPackets.cs | 2 +- Source/Game/Networking/Packets/MailPackets.cs | 2 +- .../Game/Networking/Packets/PartyPackets.cs | 4 +- .../Game/Networking/Packets/QueryPackets.cs | 2 +- .../Game/Networking/Packets/SpellPackets.cs | 12 +- Source/Game/OutdoorPVP/OutdoorPvP.cs | 24 +-- Source/Game/Phasing/PhasingHandler.cs | 74 +++---- Source/Game/Pools/PoolManager.cs | 2 +- Source/Game/Quest/Quest.cs | 2 +- .../Quest/QuestObjectiveCriteriaManager.cs | 2 +- Source/Game/Scenarios/Scenario.cs | 6 +- Source/Game/Scripting/CoreScripts.cs | 6 +- Source/Game/Scripting/ScriptManager.cs | 32 +-- Source/Game/Scripting/SpellScript.cs | 2 +- Source/Game/Server/WorldSession.cs | 31 ++- Source/Game/Spells/Auras/Aura.cs | 22 +- Source/Game/Spells/Auras/AuraEffect.cs | 54 ++--- Source/Game/Spells/Spell.cs | 190 +++++++++--------- Source/Game/Spells/SpellCastTargets.cs | 6 +- Source/Game/Spells/SpellEffects.cs | 130 ++++++------ Source/Game/Spells/SpellHistory.cs | 30 +-- Source/Game/Spells/SpellInfo.cs | 34 ++-- Source/Game/Spells/SpellManager.cs | 20 +- Source/Game/Text/CreatureTextManager.cs | 18 +- Source/Game/Warden/WardenWin.cs | 4 +- Source/Game/World/WorldManager.cs | 20 +- Source/Scripts/Spells/DemonHunter.cs | 2 +- Source/Scripts/Spells/Druid.cs | 4 +- Source/Scripts/Spells/Paladin.cs | 16 +- Source/Scripts/Spells/Quest.cs | 2 +- Source/Scripts/Spells/Rogue.cs | 14 +- 208 files changed, 2266 insertions(+), 2329 deletions(-) diff --git a/Source/Game/AI/AISelector.cs b/Source/Game/AI/AISelector.cs index 564aacc02..140c63470 100644 --- a/Source/Game/AI/AISelector.cs +++ b/Source/Game/AI/AISelector.cs @@ -74,7 +74,7 @@ namespace Game.AI else if (creature.IsCritter() && !creature.HasUnitTypeMask(UnitTypeMask.Guardian)) return new CritterAI(creature); - if (!creature.IsCivilian() && !creature.IsNeutralToAll()) + if (creature.IsCivilian() && !creature.IsNeutralToAll()) return new AggressorAI(creature); if (creature.IsCivilian() || creature.IsNeutralToAll()) diff --git a/Source/Game/AI/CoreAI/CombatAI.cs b/Source/Game/AI/CoreAI/CombatAI.cs index 27fc5e929..70a9f4ab1 100644 --- a/Source/Game/AI/CoreAI/CombatAI.cs +++ b/Source/Game/AI/CoreAI/CombatAI.cs @@ -331,15 +331,15 @@ namespace Game.AI if (_conditionsTimer <= diff) { Vehicle vehicleKit = me.GetVehicleKit(); - if (vehicleKit) + if (vehicleKit != null) { foreach (var pair in vehicleKit.Seats) { Unit passenger = Global.ObjAccessor.GetUnit(me, pair.Value.Passenger.Guid); - if (passenger) + if (passenger != null) { Player player = passenger.ToPlayer(); - if (player) + if (player != null) { if (!Global.ConditionMgr.IsObjectMeetingNotGroupedConditions(ConditionSourceType.CreatureTemplateVehicle, me.GetEntry(), player, me)) { diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs index d7020c9d1..65c457f40 100644 --- a/Source/Game/AI/CoreAI/CreatureAI.cs +++ b/Source/Game/AI/CoreAI/CreatureAI.cs @@ -119,7 +119,7 @@ namespace Game.AI public void TriggerAlert(Unit who) { // If there's no target, or target isn't a player do nothing - if (!who || !who.IsTypeId(TypeId.Player)) + if (who == null || !who.IsTypeId(TypeId.Player)) return; // If this unit isn't an NPC, is already distracted, is fighting, is confused, stunned or fleeing, do nothing @@ -178,7 +178,7 @@ namespace Game.AI if (summon != null) { // Only apply this to specific types of summons - if (!summon.GetVehicle() && ShouldFollowOnSpawn(summon.m_Properties) && summon.CanFollowOwner()) + if (summon.GetVehicle() == null && ShouldFollowOnSpawn(summon.m_Properties) && summon.CanFollowOwner()) { Unit owner = summon.GetCharmerOrOwner(); if (owner != null) @@ -311,7 +311,7 @@ namespace Game.AI public CypherStrings VisualizeBoundary(TimeSpan duration, Unit owner = null, bool fill = false) { - if (!owner) + if (owner == null) return 0; if (_boundary.Empty()) @@ -368,7 +368,7 @@ namespace Game.AI { var pos = new Position(startPosition.GetPositionX() + front.Key * SharedConst.BoundaryVisualizeStepSize, startPosition.GetPositionY() + front.Value * SharedConst.BoundaryVisualizeStepSize, spawnZ); TempSummon point = owner.SummonCreature(SharedConst.BoundaryVisualizeCreature, pos, TempSummonType.TimedDespawn, duration); - if (point) + if (point != null) { point.SetObjectScale(SharedConst.BoundaryVisualizeCreatureScale); point.SetUnitFlag(UnitFlags.Stunned); diff --git a/Source/Game/AI/CoreAI/PetAI.cs b/Source/Game/AI/CoreAI/PetAI.cs index 1ca002d2e..857d49564 100644 --- a/Source/Game/AI/CoreAI/PetAI.cs +++ b/Source/Game/AI/CoreAI/PetAI.cs @@ -34,11 +34,11 @@ namespace Game.AI else _updateAlliesTimer -= diff; - if (me.GetVictim() && me.GetVictim().IsAlive()) + if (me.GetVictim() != null && me.GetVictim().IsAlive()) { // is only necessary to stop casting, the pet must not exit combat if (me.GetCurrentSpell(CurrentSpellTypes.Channeled) == null && // ignore channeled spells (Pin, Seduction) - (me.GetVictim() && me.GetVictim().HasBreakableByDamageCrowdControlAura(me))) + (me.GetVictim() != null && me.GetVictim().HasBreakableByDamageCrowdControlAura(me))) { me.InterruptNonMeleeSpells(false); return; @@ -71,7 +71,7 @@ namespace Game.AI // All other cases (ie: defensive) - Targets are assigned by DamageTaken(), OwnerAttackedBy(), OwnerAttacked(), etc. Unit nextTarget = SelectNextTarget(me.HasReactState(ReactStates.Aggressive)); - if (nextTarget) + if (nextTarget != null) AttackStart(nextTarget); else HandleReturnMovement(); @@ -117,10 +117,10 @@ namespace Game.AI // Some spells can target enemy or friendly (DK Ghoul's Leap) // Check for enemy first (pet then owner) Unit target = me.GetAttackerForHelper(); - if (!target && owner) + if (target == null && owner != null) target = owner.GetAttackerForHelper(); - if (target) + if (target != null) { if (CanAttack(target) && spell.CanAutoCast(target)) { @@ -144,7 +144,7 @@ namespace Game.AI Unit ally = Global.ObjAccessor.GetUnit(me, tar); //only buff targets that are in combat, unless the spell can only be cast while out of combat - if (!ally) + if (ally == null) continue; if (spell.CanAutoCast(ally)) @@ -160,7 +160,7 @@ namespace Game.AI if (!spellUsed) spell.Dispose(); } - else if (me.GetVictim() && CanAttack(me.GetVictim()) && spellInfo.CanBeUsedInCombat(me)) + else if (me.GetVictim() != null && CanAttack(me.GetVictim()) && spellInfo.CanBeUsedInCombat(me)) { Spell spell = new(me, spellInfo, TriggerCastFlags.None); if (spell.CanAutoCast(me.GetVictim())) @@ -201,7 +201,7 @@ namespace Game.AI { // Called from Unit.Kill() in case where pet or owner kills something // if owner killed this victim, pet may still be attacking something else - if (me.GetVictim() && me.GetVictim() != victim) + if (me.GetVictim() != null && me.GetVictim() != victim) return; // Clear target just in case. May help problem where health / focus / mana @@ -213,7 +213,7 @@ namespace Game.AI // Before returning to owner, see if there are more things to attack Unit nextTarget = SelectNextTarget(false); - if (nextTarget) + if (nextTarget != null) AttackStart(nextTarget); else HandleReturnMovement(); // Return @@ -254,7 +254,7 @@ namespace Game.AI return; // Prevent pet from disengaging from current target - if (me.GetVictim() && me.GetVictim().IsAlive()) + if (me.GetVictim() != null && me.GetVictim().IsAlive()) return; // Continue to evaluate and attack if necessary @@ -275,7 +275,7 @@ namespace Game.AI return; // Prevent pet from disengaging from current target - if (me.GetVictim() && me.GetVictim().IsAlive()) + if (me.GetVictim() != null && me.GetVictim().IsAlive()) return; // Continue to evaluate and attack if necessary @@ -295,24 +295,24 @@ namespace Game.AI // Check pet attackers first so we don't drag a bunch of targets to the owner Unit myAttacker = me.GetAttackerForHelper(); - if (myAttacker) + if (myAttacker != null) if (!myAttacker.HasBreakableByDamageCrowdControlAura()) return myAttacker; // Not sure why we wouldn't have an owner but just in case... - if (!me.GetCharmerOrOwner()) + if (me.GetCharmerOrOwner() == null) return null; // Check owner attackers Unit ownerAttacker = me.GetCharmerOrOwner().GetAttackerForHelper(); - if (ownerAttacker) + if (ownerAttacker != null) if (!ownerAttacker.HasBreakableByDamageCrowdControlAura()) return ownerAttacker; // Check owner victim // 3.0.2 - Pets now start attacking their owners victim in defensive mode as soon as the hunter does Unit ownerVictim = me.GetCharmerOrOwner().GetVictim(); - if (ownerVictim) + if (ownerVictim != null) return ownerVictim; // Neither pet or owner had a target and aggressive pets can pick any target @@ -323,7 +323,7 @@ namespace Game.AI if (!me.GetCharmInfo().IsReturning() || me.GetCharmInfo().IsFollowing() || me.GetCharmInfo().IsAtStay()) { Unit nearTarget = me.SelectNearestHostileUnitInAggroRange(true, true); - if (nearTarget) + if (nearTarget != null) return nearTarget; } } @@ -443,7 +443,7 @@ namespace Game.AI { // If data is owner's GUIDLow then we've reached follow point, // otherwise we're probably chasing a creature - if (me.GetCharmerOrOwner() && me.GetCharmInfo() != null && id == me.GetCharmerOrOwner().GetGUID().GetCounter() && me.GetCharmInfo().IsReturning()) + if (me.GetCharmerOrOwner() != null && me.GetCharmInfo() != null && id == me.GetCharmerOrOwner().GetGUID().GetCounter() && me.GetCharmInfo().IsReturning()) { ClearCharmInfoFlags(); me.GetCharmInfo().SetIsFollowing(true); @@ -461,7 +461,7 @@ namespace Game.AI // IMPORTANT: The order in which things are checked is important, be careful if you add or remove checks // Hmmm... - if (!victim) + if (victim == null) return false; if (!victim.IsAlive()) @@ -496,18 +496,18 @@ namespace Game.AI return (me.IsWithinMeleeRange(victim) || me.GetCharmInfo().IsCommandAttack()); // Pets attacking something (or chasing) should only switch targets if owner tells them to - if (me.GetVictim() && me.GetVictim() != victim) + if (me.GetVictim() != null && me.GetVictim() != victim) { // Check if our owner selected this target and clicked "attack" Unit ownerTarget; Player owner = me.GetCharmerOrOwner().ToPlayer(); - if (owner) + if (owner != null) ownerTarget = owner.GetSelectedUnit(); else ownerTarget = me.GetCharmerOrOwner().GetVictim(); - if (ownerTarget && me.GetCharmInfo().IsCommandAttack()) - return (victim.GetGUID() == ownerTarget.GetGUID()); + if (ownerTarget != null && me.GetCharmInfo().IsCommandAttack()) + return victim.GetGUID() == ownerTarget.GetGUID(); } // Follow @@ -552,7 +552,7 @@ namespace Game.AI // dont allow pets to follow targets far away from owner Unit owner = me.GetCharmerOrOwner(); - if (owner) + if (owner != null) if (owner.GetExactDist(me) >= (owner.GetVisibilityRange() - 10.0f)) return true; @@ -581,30 +581,30 @@ namespace Game.AI _updateAlliesTimer = 10 * Time.InMilliseconds; // update friendly targets every 10 seconds, lesser checks increase performance Unit owner = me.GetCharmerOrOwner(); - if (!owner) + if (owner == null) return; Group group = null; Player player = owner.ToPlayer(); - if (player) + if (player != null) group = player.GetGroup(); // only pet and owner/not in group.ok - if (_allySet.Count == 2 && !group) + if (_allySet.Count == 2 && group == null) return; // owner is in group; group members filled in already (no raid . subgroupcount = whole count) - if (group && !group.IsRaidGroup() && _allySet.Count == (group.GetMembersCount() + 2)) + if (group != null && !group.IsRaidGroup() && _allySet.Count == (group.GetMembersCount() + 2)) return; _allySet.Clear(); _allySet.Add(me.GetGUID()); - if (group) // add group + if (group != null) // add group { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player target = refe.GetSource(); - if (!target || !target.IsInMap(owner) || !group.SameSubGroup(owner.ToPlayer(), target)) + if (target == null || !target.IsInMap(owner) || !group.SameSubGroup(owner.ToPlayer(), target)) continue; if (target.GetGUID() == owner.GetGUID()) diff --git a/Source/Game/AI/PlayerAI/PlayerAI.cs b/Source/Game/AI/PlayerAI/PlayerAI.cs index 234cbc8ea..8b4e501ad 100644 --- a/Source/Game/AI/PlayerAI/PlayerAI.cs +++ b/Source/Game/AI/PlayerAI/PlayerAI.cs @@ -391,7 +391,7 @@ namespace Game.AI bool IsPlayerHealer(Player who) { - if (!who) + if (who == null) return false; var chrSpec = who.GetPrimarySpecializationEntry(); @@ -400,7 +400,7 @@ namespace Game.AI bool IsPlayerRangedAttacker(Player who) { - if (!who) + if (who == null) return false; var chrSpec = who.GetPrimarySpecializationEntry(); @@ -455,12 +455,12 @@ namespace Game.AI break; case SpellTarget.Victim: pTarget = me.GetVictim(); - if (!pTarget) + if (pTarget == null) return null; break; case SpellTarget.Charmer: pTarget = me.GetCharmer(); - if (!pTarget) + if (pTarget == null) return null; break; case SpellTarget.Self: @@ -526,13 +526,13 @@ namespace Game.AI return; Unit victim = me.GetVictim(); - if (!victim) + if (victim == null) return; uint rangedAttackSpell = 0; Item rangedItem = me.GetItemByPos(InventorySlots.Bag0, EquipmentSlot.Ranged); - ItemTemplate rangedTemplate = rangedItem ? rangedItem.GetTemplate() : null; + ItemTemplate rangedTemplate = rangedItem != null ? rangedItem.GetTemplate() : null; if (rangedTemplate != null) { switch ((ItemSubClassWeapon)rangedTemplate.GetSubClass()) @@ -610,13 +610,13 @@ namespace Game.AI // helper functions to determine player info public bool IsHealer(Player who = null) { - return (!who || who == me) ? _isSelfHealer : IsPlayerHealer(who); + return (who == null || who == me) ? _isSelfHealer : IsPlayerHealer(who); } - public bool IsRangedAttacker(Player who = null) { return (!who || who == me) ? _isSelfRangedAttacker : IsPlayerRangedAttacker(who); } - public ChrSpecialization GetSpec(Player who = null) { return (!who || who == me) ? _selfSpec : who.GetPrimarySpecialization(); } + public bool IsRangedAttacker(Player who = null) { return (who == null || who == me) ? _isSelfRangedAttacker : IsPlayerRangedAttacker(who); } + public ChrSpecialization GetSpec(Player who = null) { return (who == null || who == me) ? _selfSpec : who.GetPrimarySpecialization(); } public void SetIsRangedAttacker(bool state) { _isSelfRangedAttacker = state; } // this allows overriding of the default ranged attacker detection - public virtual Unit SelectAttackTarget() { return me.GetCharmer() ? me.GetCharmer().GetVictim() : null; } + public virtual Unit SelectAttackTarget() { return me.GetCharmer() != null ? me.GetCharmer().GetVictim() : null; } public enum SpellTarget { @@ -659,7 +659,7 @@ namespace Game.AI public override Unit SelectAttackTarget() { Unit charmer = me.GetCharmer(); - if (charmer) + if (charmer != null) { UnitAI charmerAI = charmer.GetAI(); if (charmerAI != null) @@ -925,7 +925,7 @@ namespace Game.AI VerifyAndPushSpellCast(spells, SPELL_RUNE_TAP, TARGET_NONE, 2); VerifyAndPushSpellCast(spells, SPELL_HYSTERIA, TARGET_SELF, 5); if (Creature* creatureCharmer = GetCharmer()) - if (!creatureCharmer.IsDungeonBoss() && !creatureCharmer.isWorldBoss()) + if (creature == nullCharmer.IsDungeonBoss() && !creatureCharmer.isWorldBoss()) VerifyAndPushSpellCast(spells, SPELL_HYSTERIA, creatureCharmer, 15); VerifyAndPushSpellCast(spells, SPELL_HEART_STRIKE, TARGET_VICTIM, 2); if (hasFF && hasBP) @@ -1115,9 +1115,9 @@ namespace Game.AI { VerifyAndPushSpellCast(spells, SPELL_NOURISH, creatureCharmer, 5); VerifyAndPushSpellCast(spells, SPELL_WILD_GROWTH, creatureCharmer, 5); - if (!creatureCharmer.GetAuraApplicationOfRankedSpell(SPELL_REJUVENATION, me.GetGUID())) + if (creature == nullCharmer.GetAuraApplicationOfRankedSpell(SPELL_REJUVENATION, me.GetGUID())) VerifyAndPushSpellCast(spells, SPELL_REJUVENATION, creatureCharmer, 8); - if (!creatureCharmer.GetAuraApplicationOfRankedSpell(SPELL_REGROWTH, me.GetGUID())) + if (creature == nullCharmer.GetAuraApplicationOfRankedSpell(SPELL_REGROWTH, me.GetGUID())) VerifyAndPushSpellCast(spells, SPELL_REGROWTH, creatureCharmer, 8); uint8 lifebloomStacks = 0; if (Aura const* lifebloom = creatureCharmer.GetAura(SPELL_LIFEBLOOM, me.GetGUID())) @@ -1200,7 +1200,7 @@ namespace Game.AI public override void UpdateAI(uint diff) { Creature charmer = GetCharmer(); - if (!charmer) + if (charmer == null) return; //kill self if charm aura has infinite duration @@ -1220,10 +1220,10 @@ namespace Game.AI if (charmer.IsEngaged()) { Unit target = me.GetVictim(); - if (!target || !CanAIAttack(target)) + if (target == null || !CanAIAttack(target)) { target = SelectAttackTarget(); - if (!target || !CanAIAttack(target)) + if (target == null || !CanAIAttack(target)) { if (!_isFollowing) { diff --git a/Source/Game/AI/ScriptedAI/ScriptedAI.cs b/Source/Game/AI/ScriptedAI/ScriptedAI.cs index 94c113d66..e9156cde6 100644 --- a/Source/Game/AI/ScriptedAI/ScriptedAI.cs +++ b/Source/Game/AI/ScriptedAI/ScriptedAI.cs @@ -109,10 +109,10 @@ namespace Game.AI /// public void AddThreat(Unit victim, float amount, Unit who = null) { - if (!victim) + if (victim == null) return; - if (!who) + if (who == null) who = me; who.GetThreatManager().AddThreat(victim, amount, null, true, true); @@ -126,10 +126,10 @@ namespace Game.AI /// public void ModifyThreatByPercent(Unit victim, int pct, Unit who = null) { - if (!victim) + if (victim == null) return; - if (!who) + if (who == null) who = me; who.GetThreatManager().ModifyThreatByPercent(victim, pct); @@ -142,10 +142,10 @@ namespace Game.AI /// public void ResetThreat(Unit victim, Unit who) { - if (!victim) + if (victim == null) return; - if (!who) + if (who == null) who = me; who.GetThreatManager().ResetThreat(victim); @@ -157,7 +157,7 @@ namespace Game.AI /// public void ResetThreatList(Unit who = null) { - if (!who) + if (who == null) who = me; who.GetThreatManager().ResetAllThreat(); @@ -171,10 +171,10 @@ namespace Game.AI /// public float GetThreat(Unit victim, Unit who = null) { - if (!victim) + if (victim == null) return 0.0f; - if (!who) + if (who == null) who = me; return who.GetThreatManager().GetThreat(victim); @@ -645,11 +645,11 @@ namespace Game.AI delayToRespawn = TimeSpan.FromSeconds(2); } - if (!who) + if (who == null) who = me; TempSummon whoSummon = who.ToTempSummon(); - if (whoSummon) + if (whoSummon != null) { Log.outWarn(LogFilter.ScriptsAi, $"BossAI::_DespawnAtEvade: called on a temporary summon (who: {who.GetGUID()})"); whoSummon.UnSummon(); @@ -705,7 +705,7 @@ namespace Game.AI void _JustEngagedWith() { Unit target = SelectTarget(SelectTargetMethod.Random, 0, 0.0f, true); - if (target) + if (target != null) AttackStart(target); } @@ -713,7 +713,7 @@ namespace Game.AI { summons.Summon(summon); Unit target = SelectTarget(SelectTargetMethod.Random, 0, 0.0f, true); - if (target) + if (target != null) summon.GetAI().AttackStart(target); } @@ -772,7 +772,7 @@ namespace Game.AI foreach (var id in this) { Creature summon = ObjectAccessor.GetCreature(_me, id); - if (summon && summon.IsAIEnabled() && (entry == 0 || summon.GetEntry() == entry)) + if (summon != null && summon.IsAIEnabled() && (entry == 0 || summon.GetEntry() == entry)) { summon.GetAI().DoZoneInCombat(); } @@ -784,7 +784,7 @@ namespace Game.AI foreach (var id in this) { Creature summon = ObjectAccessor.GetCreature(_me, id); - if (!summon) + if (summon == null) Remove(id); else if (summon.GetEntry() == entry) { @@ -800,7 +800,7 @@ namespace Game.AI { Creature summon = ObjectAccessor.GetCreature(_me, this.FirstOrDefault()); RemoveAt(0); - if (summon) + if (summon != null) summon.DespawnOrUnsummon(); } } @@ -821,7 +821,7 @@ namespace Game.AI { foreach (var id in this) { - if (!ObjectAccessor.GetCreature(_me, id)) + if (ObjectAccessor.GetCreature(_me, id) == null) Remove(id); } } @@ -847,7 +847,7 @@ namespace Game.AI foreach (var id in this) { Creature summon = ObjectAccessor.GetCreature(_me, id); - if (summon && summon.GetEntry() == entry) + if (summon != null && summon.GetEntry() == entry) return true; } @@ -859,7 +859,7 @@ namespace Game.AI foreach (var guid in summons) { Creature summon = ObjectAccessor.GetCreature(_me, guid); - if (summon && summon.IsAIEnabled()) + if (summon != null && summon.IsAIEnabled()) summon.GetAI().DoAction(action); } } diff --git a/Source/Game/AI/ScriptedAI/ScriptedEscortAI.cs b/Source/Game/AI/ScriptedAI/ScriptedEscortAI.cs index ec74dc286..3948b0b7e 100644 --- a/Source/Game/AI/ScriptedAI/ScriptedEscortAI.cs +++ b/Source/Game/AI/ScriptedAI/ScriptedEscortAI.cs @@ -33,7 +33,7 @@ namespace Game.AI //see followerAI bool AssistPlayerInCombatAgainst(Unit who) { - if (!who || !who.GetVictim()) + if (who == null || who.GetVictim() == null) return false; if (me.HasReactState(ReactStates.Passive)) @@ -44,7 +44,7 @@ namespace Game.AI return false; //not a player - if (!who.GetVictim().GetCharmerOrOwnerPlayerOrPlayerItself()) + if (who.GetVictim().GetCharmerOrOwnerPlayerOrPlayerItself() == null) return false; //never attack friendly @@ -78,15 +78,15 @@ namespace Game.AI return; Player player = GetPlayerForEscort(); - if (player) + if (player != null) { Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { Player member = groupRef.GetSource(); - if (member) + if (member != null) if (member.IsInMap(player)) member.FailQuest(_escortQuest.Id); } @@ -145,15 +145,15 @@ namespace Game.AI bool IsPlayerOrGroupInRange() { Player player = GetPlayerForEscort(); - if (player) + if (player != null) { Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { Player member = groupRef.GetSource(); - if (member) + if (member != null) if (me.IsWithinDistInMap(member, GetMaxPlayerDistance())) return true; } diff --git a/Source/Game/AI/ScriptedAI/ScriptedFollowerAI.cs b/Source/Game/AI/ScriptedAI/ScriptedFollowerAI.cs index c0a52250f..e70eaeace 100644 --- a/Source/Game/AI/ScriptedAI/ScriptedFollowerAI.cs +++ b/Source/Game/AI/ScriptedAI/ScriptedFollowerAI.cs @@ -47,15 +47,15 @@ namespace Game.AI // @todo need a better check for quests with time limit. Player player = GetLeaderForFollower(); - if (player) + if (player != null) { Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { Player member = groupRef.GetSource(); - if (member) + if (member != null) if (member.IsInMap(player)) member.FailQuest(_questForFollow); } @@ -104,10 +104,10 @@ namespace Game.AI bool questAbandoned = (_questForFollow != 0); Player player = GetLeaderForFollower(); - if (player) + if (player != null) { Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null && (maxRangeExceeded || questAbandoned); groupRef = groupRef.Next()) { @@ -247,19 +247,19 @@ namespace Game.AI Player GetLeaderForFollower() { Player player = Global.ObjAccessor.GetPlayer(me, _leaderGUID); - if (player) + if (player != null) { if (player.IsAlive()) return player; else { Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { Player member = groupRef.GetSource(); - if (member && me.IsWithinDistInMap(member, 100.0f) && member.IsAlive()) + if (member != null && me.IsWithinDistInMap(member, 100.0f) && member.IsAlive()) { Log.outDebug(LogFilter.Scripts, $"FollowerAI::GetLeaderForFollower: GetLeader changed and returned new leader. ({me.GetGUID()})"); _leaderGUID = member.GetGUID(); @@ -279,7 +279,7 @@ namespace Game.AI //The flag (type_flag) is unconfirmed, but used here for further research and is a good candidate. bool ShouldAssistPlayerInCombatAgainst(Unit who) { - if (!who || !who.GetVictim()) + if (who == null || who.GetVictim() == null) return false; //experimental (unknown) flag not present diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs index a145b4705..1d099a337 100644 --- a/Source/Game/AI/SmartScripts/SmartAI.cs +++ b/Source/Game/AI/SmartScripts/SmartAI.cs @@ -90,7 +90,7 @@ namespace Game.AI // Do not use AddEscortState, removing everything from previous _escortState = SmartEscortState.Escorting; - if (invoker && invoker.IsPlayer()) + if (invoker != null && invoker.IsPlayer()) { _escortNPCFlags = (uint)me.GetNpcFlags(); me.ReplaceAllNpcFlags(NPCFlags.None); @@ -226,7 +226,7 @@ namespace Game.AI player.FailQuest(EscortQuestID); Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { @@ -234,7 +234,7 @@ namespace Game.AI if (!groupGuy.IsInMap(player)) continue; - if (!fail && groupGuy.IsAtGroupRewardDistance(me) && !groupGuy.GetCorpse()) + if (!fail && groupGuy.IsAtGroupRewardDistance(me) && groupGuy.GetCorpse() == null) groupGuy.AreaExploredOrEventHappens(EscortQuestID); else if (fail) groupGuy.FailQuest(EscortQuestID); @@ -340,7 +340,7 @@ namespace Game.AI return true; Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { @@ -458,7 +458,7 @@ namespace Game.AI else { Unit target = !_followGuid.IsEmpty() ? Global.ObjAccessor.GetUnit(me, _followGuid) : null; - if (target) + if (target != null) { me.GetMotionMaster().MoveFollow(target, _followDist, _followAngle); // evade is not cleared in MoveFollow, so we can't keep it @@ -832,7 +832,7 @@ namespace Game.AI { if (on) { - if (!me.HasReactState(ReactStates.Passive) && me.GetVictim() && !me.GetMotionMaster().HasMovementGenerator(movement => + if (!me.HasReactState(ReactStates.Passive) && me.GetVictim() != null && !me.GetMotionMaster().HasMovementGenerator(movement => { return movement.GetMovementGeneratorType() == MovementGeneratorType.Chase && movement.Mode == MovementGeneratorMode.Default && movement.Priority == MovementGeneratorPriority.Normal; })) @@ -1013,7 +1013,7 @@ namespace Game.AI { if (_followArrivedTimer < diff) { - if (me.FindNearestCreature(_followArrivedEntry, SharedConst.InteractionDistance, true)) + if (me.FindNearestCreature(_followArrivedEntry, SharedConst.InteractionDistance, true) != null) { StopFollow(true); return; diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs index 664847775..2fb104bed 100644 --- a/Source/Game/AI/SmartScripts/SmartScript.cs +++ b/Source/Game/AI/SmartScripts/SmartScript.cs @@ -323,17 +323,17 @@ namespace Game.AI foreach (var target in targets) { Player player = target.ToPlayer(); - if (player) + if (player != null) { Quest quest = Global.ObjectMgr.GetQuestTemplate(e.Action.questOffer.questId); if (quest != null) { - if (_me && e.Action.questOffer.directAdd == 0) + if (_me != null && e.Action.questOffer.directAdd == 0) { if (player.CanTakeQuest(quest, true)) { WorldSession session = player.GetSession(); - if (session) + if (session != null) { PlayerMenu menu = new(session); menu.SendQuestGiverQuestDetails(quest, _me.GetGUID(), true, false); @@ -464,7 +464,7 @@ namespace Game.AI triggerFlag = TriggerCastFlags.FullMask; } - if (_me) + if (_me != null) { if (e.Action.cast.castFlags.HasAnyFlag((uint)SmartCastFlags.InterruptPrevious)) _me.InterruptNonMeleeSpells(false); @@ -480,7 +480,7 @@ namespace Game.AI else successfulSpellCast = true; } - else if (_go) + else if (_go != null) _go.CastSpell(target.ToUnit(), e.Action.cast.spell, new CastSpellExtraArgs(triggerFlag)); } else @@ -671,7 +671,7 @@ namespace Game.AI } case SmartActions.FleeForAssist: { - if (!_me) + if (_me == null) break; _me.DoFleeToGetAssistance(); @@ -690,7 +690,7 @@ namespace Game.AI // If invoker was pet or charm Player playerCharmed = unit.GetCharmerOrOwnerPlayerOrPlayerItself(); - if (playerCharmed && GetBaseObject() != null) + if (playerCharmed != null && GetBaseObject() != null) { playerCharmed.GroupEventHappens(e.Action.quest.questId, GetBaseObject()); Log.outDebug(LogFilter.ScriptsAi, "SmartScript.ProcessAction: SMART_ACTION_CALL_GROUPEVENTHAPPENS: Player {0}, group credit for quest {1}", @@ -712,7 +712,7 @@ namespace Game.AI } case SmartActions.CombatStop: { - if (!_me) + if (_me == null) break; _me.CombatStop(true); @@ -1174,7 +1174,7 @@ namespace Game.AI case SmartActions.SummonGo: { WorldObject summoner = GetBaseObjectOrUnitInvoker(unit); - if (!summoner) + if (summoner == null) break; foreach (var target in targets) @@ -1814,7 +1814,7 @@ namespace Game.AI target = targets.SelectRandom(); Position pos = new(e.Target.x, e.Target.y, e.Target.z); - if (target) + if (target != null) { float x, y, z; target.GetPosition(out x, out y, out z); @@ -1889,9 +1889,9 @@ namespace Game.AI e.Action.sendGossipMenu.gossipMenuId, e.Action.sendGossipMenu.gossipNpcTextId); // override default gossip - if (_me) + if (_me != null) ((SmartAI)_me.GetAI()).SetGossipReturn(true); - else if (_go) + else if (_go != null) ((SmartGameObjectAI)_go.GetAI()).SetGossipReturn(true); foreach (var target in targets) @@ -2217,7 +2217,7 @@ namespace Game.AI else if (!targets.Empty()) map = targets.First().GetMap(); - if (map) + if (map != null) map.Respawn((SpawnObjectType)e.Action.respawnData.spawnType, e.Action.respawnData.spawnId); else Log.outError(LogFilter.Sql, $"SmartScript.ProcessAction: Entry {e.EntryOrGuid} SourceType {e.GetScriptType()}, Event {e.EventId} - tries to respawn by spawnId but does not provide a map"); @@ -2264,7 +2264,7 @@ namespace Game.AI foreach (var target in targets) { Player playerTarget = target.ToPlayer(); - if (playerTarget) + if (playerTarget != null) playerTarget.GetSceneMgr().PlayScene(e.Action.scene.sceneId); } @@ -2275,7 +2275,7 @@ namespace Game.AI foreach (var target in targets) { Player playerTarget = target.ToPlayer(); - if (playerTarget) + if (playerTarget != null) playerTarget.GetSceneMgr().CancelSceneBySceneId(e.Action.scene.sceneId); } @@ -2370,7 +2370,7 @@ namespace Game.AI { Conversation conversation = Conversation.CreateConversation(e.Action.conversation.id, playerTarget, playerTarget, playerTarget.GetGUID(), null); - if (!conversation) + if (conversation == null) Log.outWarn(LogFilter.ScriptsAi, $"SmartScript.ProcessAction: SMART_ACTION_CREATE_CONVERSATION: id {e.Action.conversation.id}, baseObject {baseObject?.GetName()}, target {playerTarget.GetName()} - failed to create"); } } @@ -2652,7 +2652,7 @@ namespace Game.AI } break; case SmartTargets.Farthest: - if (_me) + if (_me != null) { Unit u = _me.GetAI().SelectTarget(SelectTargetMethod.MaxDistance, 0, new FarthestTargetSelector(_me, (float)e.Target.farthest.maxDist, e.Target.farthest.playerOnly != 0, e.Target.farthest.isInLos != 0)); if (u != null) @@ -2674,12 +2674,12 @@ namespace Game.AI if (player != null) { Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference groupRef = group.GetFirstMember(); groupRef != null; groupRef = groupRef.Next()) { Player member = groupRef.GetSource(); - if (member) + if (member != null) if (member.IsInMap(player)) targets.Add(member); } @@ -2797,7 +2797,7 @@ namespace Game.AI } Creature target = FindCreatureNear(scriptTrigger != null ? scriptTrigger : baseObject, e.Target.unitGUID.dbGuid); - if (target) + if (target != null) if (target != null && (e.Target.unitGUID.entry == 0 || target.GetEntry() == e.Target.unitGUID.entry)) targets.Add(target); break; @@ -2811,7 +2811,7 @@ namespace Game.AI } GameObject target = FindGameObjectNear(scriptTrigger != null ? scriptTrigger : baseObject, e.Target.goGUID.dbGuid); - if (target) + if (target != null) if (target != null && (e.Target.goGUID.entry == 0 || target.GetEntry() == e.Target.goGUID.entry)) targets.Add(target); break; @@ -2865,7 +2865,7 @@ namespace Game.AI } Creature target = refObj.FindNearestCreature(e.Target.unitClosest.entry, e.Target.unitClosest.dist != 0 ? e.Target.unitClosest.dist : 100, e.Target.unitClosest.dead == 0); - if (target) + if (target != null) targets.Add(target); break; } @@ -2882,7 +2882,7 @@ namespace Game.AI } GameObject target = refObj.FindNearestGameObject(e.Target.goClosest.entry, e.Target.goClosest.dist != 0 ? e.Target.goClosest.dist : 100); - if (target) + if (target != null) targets.Add(target); break; } @@ -2899,7 +2899,7 @@ namespace Game.AI } Player target = refObj.SelectNearestPlayer(e.Target.playerDistance.dist); - if (target) + if (target != null) targets.Add(target); break; } @@ -2911,10 +2911,10 @@ namespace Game.AI if (charmerOrOwnerGuid.IsEmpty()) { TempSummon tempSummon = _me.ToTempSummon(); - if (tempSummon) + if (tempSummon != null) { WorldObject summoner = tempSummon.GetSummoner(); - if (summoner) + if (summoner != null) charmerOrOwnerGuid = summoner.GetGUID(); } } @@ -2929,7 +2929,7 @@ namespace Game.AI else if (_go != null) { Unit owner = Global.ObjAccessor.GetUnit(_go, _go.GetOwnerGUID()); - if (owner) + if (owner != null) targets.Add(owner); } @@ -2978,7 +2978,7 @@ namespace Game.AI } case SmartTargets.LootRecipients: { - if (_me) + if (_me != null) { foreach (ObjectGuid tapperGuid in _me.GetTapList()) { @@ -2991,7 +2991,7 @@ namespace Game.AI } case SmartTargets.VehiclePassenger: { - if (_me && _me.IsVehicle()) + if (_me != null && _me.IsVehicle()) { foreach (var pair in _me.GetVehicleKit().Seats) { @@ -3527,7 +3527,7 @@ namespace Game.AI } case SmartEvents.DistanceCreature: { - if (!_me) + if (_me == null) return; Creature creature = null; @@ -3536,7 +3536,7 @@ namespace Game.AI { creature = FindCreatureNear(_me, e.Event.distance.guid); - if (!creature) + if (creature == null) return; if (!_me.IsInRange(creature, 0, e.Event.distance.dist)) @@ -3550,14 +3550,14 @@ namespace Game.AI creature = list.FirstOrDefault(); } - if (creature) + if (creature != null) ProcessTimedAction(e, e.Event.distance.repeat, e.Event.distance.repeat, creature); break; } case SmartEvents.DistanceGameobject: { - if (!_me) + if (_me == null) return; GameObject gameobject = null; @@ -3566,7 +3566,7 @@ namespace Game.AI { gameobject = FindGameObjectNear(_me, e.Event.distance.guid); - if (!gameobject) + if (gameobject == null) return; if (!_me.IsInRange(gameobject, 0, e.Event.distance.dist)) @@ -3580,7 +3580,7 @@ namespace Game.AI gameobject = list.FirstOrDefault(); } - if (gameobject) + if (gameobject != null) ProcessTimedAction(e, e.Event.distance.repeat, e.Event.distance.repeat, null, 0, 0, false, null, gameobject); break; @@ -3675,7 +3675,7 @@ namespace Game.AI // Delay flee for assist event if stunned or rooted if (e.GetActionType() == SmartActions.FleeForAssist) { - if (_me && _me.HasUnitState(UnitState.Root | UnitState.LostControl)) + if (_me != null && _me.HasUnitState(UnitState.Root | UnitState.LostControl)) { e.Timer = 1; return; @@ -3766,7 +3766,7 @@ namespace Game.AI { if ((_scriptType == SmartScriptType.Creature || _scriptType == SmartScriptType.GameObject || _scriptType == SmartScriptType.AreaTriggerEntity || _scriptType == SmartScriptType.AreaTriggerEntityServerside) - && !GetBaseObject()) + && GetBaseObject() == null) return; if (_me != null && _me.IsInEvadeMode()) @@ -4093,7 +4093,7 @@ namespace Game.AI Unit DoSelectLowestHpFriendly(float range, uint MinHPDiff) { - if (!_me) + if (_me == null) return null; var u_check = new MostHPMissingInRange(_me, range, MinHPDiff); @@ -4144,7 +4144,7 @@ namespace Game.AI Unit DoFindClosestFriendlyInRange(float range) { - if (!_me) + if (_me == null) return null; var u_check = new AnyFriendlyUnitInObjectRangeCheck(_me, _me, range); @@ -4230,11 +4230,11 @@ namespace Game.AI public bool IsCharmedCreature(WorldObject obj) { - if (!obj) + if (obj == null) return false; Creature creatureObj = obj.ToCreature(); - if (creatureObj) + if (creatureObj != null) return creatureObj.IsCharmed(); return false; @@ -4352,10 +4352,10 @@ namespace Game.AI void ResetBaseObject() { WorldObject lookupRoot = _me; - if (!lookupRoot) + if (lookupRoot == null) lookupRoot = _go; - if (lookupRoot) + if (lookupRoot != null) { if (!_meOrigGUID.IsEmpty()) { diff --git a/Source/Game/Accounts/AccountManager.cs b/Source/Game/Accounts/AccountManager.cs index d6f3f505c..ef3b87af5 100644 --- a/Source/Game/Accounts/AccountManager.cs +++ b/Source/Game/Accounts/AccountManager.cs @@ -80,10 +80,10 @@ namespace Game ObjectGuid guid = ObjectGuid.Create(HighGuid.Player, result.Read(0)); // Kick if player is online - Player p = Global.ObjAccessor.FindPlayer(guid); - if (p) + Player player = Global.ObjAccessor.FindPlayer(guid); + if (player != null) { - WorldSession s = p.GetSession(); + WorldSession s = player.GetSession(); s.KickPlayer("AccountMgr::DeleteAccount Deleting the account"); // mark session to remove at next session list update s.LogoutPlayer(false); // logout player without waiting next session list update } diff --git a/Source/Game/Achievements/AchievementManager.cs b/Source/Game/Achievements/AchievementManager.cs index 187228263..a46fbc2a2 100644 --- a/Source/Game/Achievements/AchievementManager.cs +++ b/Source/Game/Achievements/AchievementManager.cs @@ -504,7 +504,7 @@ namespace Game.Achievements if (achievement.Flags.HasAnyFlag(AchievementFlags.ShowInGuildNews)) { Guild guild = referencePlayer.GetGuild(); - if (guild) + if (guild != null) guild.AddGuildNews(GuildNews.PlayerAchievement, referencePlayer.GetGUID(), (uint)(achievement.Flags & AchievementFlags.ShowInGuildHeader), achievement.Id); } @@ -577,7 +577,7 @@ namespace Game.Achievements SQLTransaction trans = new(); Item item = reward.ItemId != 0 ? Item.CreateItem(reward.ItemId, 1, ItemContext.None, _owner) : null; - if (item) + if (item != null) { // save new item before send item.SaveToDB(trans); // save for prevent lost at next mail load, if send fail then item will deleted @@ -654,7 +654,7 @@ namespace Game.Achievements if (!achievement.Flags.HasAnyFlag(AchievementFlags.TrackingFlag)) { Guild guild = Global.GuildMgr.GetGuildById(_owner.GetGuildId()); - if (guild) + if (guild != null) { BroadcastTextBuilder say_builder = new(_owner, ChatMsg.GuildAchievement, (uint)BroadcastTextIds.AchivementEarned, _owner.GetNativeGender(), _owner, achievement.Id); var say_do = new LocalizedDo(say_builder); @@ -972,7 +972,7 @@ namespace Game.Achievements if (achievement.Flags.HasAnyFlag(AchievementFlags.ShowInGuildNews)) { Guild guild = referencePlayer.GetGuild(); - if (guild) + if (guild != null) guild.AddGuildNews(GuildNews.Achievement, ObjectGuid.Empty, (uint)(achievement.Flags & AchievementFlags.ShowInGuildHeader), achievement.Id); } @@ -987,12 +987,12 @@ namespace Game.Achievements ca.CompletingPlayers.Add(referencePlayer.GetGUID()); Group group = referencePlayer.GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player groupMember = refe.GetSource(); - if (groupMember) + if (groupMember != null) if (groupMember.GetGuildId() == _owner.GetId()) ca.CompletingPlayers.Add(groupMember.GetGUID()); } diff --git a/Source/Game/Achievements/CriteriaHandler.cs b/Source/Game/Achievements/CriteriaHandler.cs index 2550af549..c27f8a52c 100644 --- a/Source/Game/Achievements/CriteriaHandler.cs +++ b/Source/Game/Achievements/CriteriaHandler.cs @@ -51,7 +51,7 @@ namespace Game.Achievements return; } - if (!referencePlayer) + if (referencePlayer == null) { Log.outDebug(LogFilter.Achievement, "UpdateCriteria: Player is NULL! Cant update criteria"); return; @@ -590,7 +590,7 @@ namespace Game.Achievements progress.Changed = true; progress.Date = GameTime.GetGameTime(); // set the date to the latest update. - progress.PlayerGUID = referencePlayer ? referencePlayer.GetGUID() : ObjectGuid.Empty; + progress.PlayerGUID = referencePlayer != null ? referencePlayer.GetGUID() : ObjectGuid.Empty; _criteriaProgress[criteria.Id] = progress; TimeSpan timeElapsed = TimeSpan.Zero; @@ -898,7 +898,7 @@ namespace Game.Achievements return false; break; case CriteriaFailEvent.ModifyPartyStatus: - if (referencePlayer.GetGroup()) + if (referencePlayer.GetGroup() != null) return false; break; default: @@ -1010,7 +1010,7 @@ namespace Game.Achievements return false; Map map = referencePlayer.IsInWorld ? referencePlayer.GetMap() : Global.MapMgr.FindMap(referencePlayer.GetMapId(), referencePlayer.GetInstanceId()); - if (!map || !map.IsDungeon()) + if (map == null || !map.IsDungeon()) return false; //FIXME: work only for instances where max == min for players @@ -1019,7 +1019,7 @@ namespace Game.Achievements break; } case CriteriaType.KilledByPlayer: - if (miscValue1 == 0 || !refe || !refe.IsTypeId(TypeId.Player)) + if (miscValue1 == 0 || refe == null || !refe.IsTypeId(TypeId.Player)) return false; break; case CriteriaType.DieFromEnviromentalDamage: @@ -1145,7 +1145,7 @@ namespace Game.Achievements return false; // map specific case (BG in fact) expected player targeted damage/heal - if (!refe || !refe.IsTypeId(TypeId.Player)) + if (refe == null || !refe.IsTypeId(TypeId.Player)) return false; } break; @@ -1369,17 +1369,17 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetToPlayerLevelDeltaGreaterThan: // 22 - if (!refe || !refe.IsUnit() || referencePlayer.GetLevel() + reqValue < refe.ToUnit().GetLevel()) + if (refe == null || !refe.IsUnit() || referencePlayer.GetLevel() + reqValue < refe.ToUnit().GetLevel()) return false; break; case ModifierTreeType.PlayerLevelEqualTargetLevel: // 23 - if (!refe || !refe.IsUnit() || referencePlayer.GetLevel() != refe.ToUnit().GetLevel()) + if (refe == null || !refe.IsUnit() || referencePlayer.GetLevel() != refe.ToUnit().GetLevel()) return false; break; case ModifierTreeType.PlayerInArenaWithTeamSize: // 24 { Battleground bg = referencePlayer.GetBattleground(); - if (!bg || !bg.IsArena() || bg.GetArenaType() != (ArenaTypes)reqValue) + if (bg == null || !bg.IsArena() || bg.GetArenaType() != (ArenaTypes)reqValue) return false; break; } @@ -1400,7 +1400,7 @@ namespace Game.Achievements return false; break; case ModifierTreeType.LessThanTappers: // 29 - if (referencePlayer.GetGroup() && referencePlayer.GetGroup().GetMembersCount() >= reqValue) + if (referencePlayer.GetGroup() != null && referencePlayer.GetGroup().GetMembersCount() >= reqValue) return false; break; case ModifierTreeType.CreatureType: // 30 @@ -1414,7 +1414,7 @@ namespace Game.Achievements } case ModifierTreeType.CreatureFamily: // 31 { - if (!refe) + if (refe == null) return false; if (!refe.IsCreature() || refe.ToCreature().GetCreatureTemplate().Family != (CreatureFamily)reqValue) return false; @@ -1434,11 +1434,11 @@ namespace Game.Achievements return false; break; case ModifierTreeType.PlayerIsNotInParty: // 35 - if (referencePlayer.GetGroup()) + if (referencePlayer.GetGroup() != null) return false; break; case ModifierTreeType.PlayerIsInParty: // 36 - if (!referencePlayer.GetGroup()) + if (referencePlayer.GetGroup() == null) return false; break; case ModifierTreeType.HasPersonalRatingEqualOrGreaterThan: // 37 @@ -1469,7 +1469,7 @@ namespace Game.Achievements } case ModifierTreeType.TargetIsInZone: // 42 { - if (!refe) + if (refe == null) return false; uint zoneId = refe.GetAreaId(); AreaTableRecord areaEntry = CliDB.AreaTableStorage.LookupByKey(zoneId); @@ -1496,11 +1496,11 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetHealthAbovePercent: // 47 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetHealthPct() < reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetHealthPct() < reqValue) return false; break; case ModifierTreeType.TargetHealthEqualsPercent: // 48 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetHealthPct() != reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetHealthPct() != reqValue) return false; break; case ModifierTreeType.PlayerHealthBelowValue: // 49 @@ -1516,15 +1516,15 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetHealthBelowValue: // 52 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetHealth() > reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetHealth() > reqValue) return false; break; case ModifierTreeType.TargetHealthAboveValue: // 53 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetHealth() < reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetHealth() < reqValue) return false; break; case ModifierTreeType.TargetHealthEqualsValue: // 54 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetHealth() != reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetHealth() != reqValue) return false; break; case ModifierTreeType.TargetIsPlayerAndMeetsCondition: // 55 @@ -1594,7 +1594,7 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetLevelEqualOrGreaterThan: // 70 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetLevel() < reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetLevel() < reqValue) return false; break; case ModifierTreeType.PlayerLevelEqualOrLessThan: // 71 @@ -1602,7 +1602,7 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetLevelEqualOrLessThan: // 72 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetLevel() > reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetLevel() > reqValue) return false; break; case ModifierTreeType.ModifierTree: // 73 @@ -2764,7 +2764,7 @@ namespace Game.Achievements return false; Item artifact = referencePlayer.GetItemByGuid(artifactAura.GetCastItemGUID()); - if (!artifact) + if (artifact == null) return false; var artifactPower = artifact.GetArtifactPower((uint)secondaryAsset); @@ -2876,7 +2876,7 @@ namespace Game.Achievements case ModifierTreeType.PlayerAzeriteLevelEqualOrGreaterThan: // 235 { Item heartOfAzeroth = referencePlayer.GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.Everywhere); - if (!heartOfAzeroth || heartOfAzeroth.ToAzeriteItem().GetLevel() < reqValue) + if (heartOfAzeroth == null || heartOfAzeroth.ToAzeriteItem().GetLevel() < reqValue) return false; break; } @@ -3050,7 +3050,7 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetAuraStackCountEqual: // 256 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetAuraCount((uint)secondaryAsset) != reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetAuraCount((uint)secondaryAsset) != reqValue) return false; break; case ModifierTreeType.PlayerAuraStackCountEqualOrGreaterThan: // 257 @@ -3058,7 +3058,7 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetAuraStackCountEqualOrGreaterThan: // 258 - if (!refe || !refe.IsUnit() || refe.ToUnit().GetAuraCount((uint)secondaryAsset) < reqValue) + if (refe == null || !refe.IsUnit() || refe.ToUnit().GetAuraCount((uint)secondaryAsset) < reqValue) return false; break; case ModifierTreeType.PlayerHasAzeriteEssenceRankLessThan: // 259 @@ -3183,7 +3183,7 @@ namespace Game.Achievements } case ModifierTreeType.TargetLevelWithinContentTuning: // 269 { - if (!refe || !refe.IsUnit()) + if (refe == null || !refe.IsUnit()) return false; uint level = refe.ToUnit().GetLevel(); @@ -3215,7 +3215,7 @@ namespace Game.Achievements } case ModifierTreeType.TargetLevelWithinOrAboveContentTuning: // 273 { - if (!refe || !refe.IsUnit()) + if (refe == null || !refe.IsUnit()) return false; uint level = refe.ToUnit().GetLevel(); @@ -3334,7 +3334,7 @@ namespace Game.Achievements } case ModifierTreeType.TargetIsInAreaGroup: // 299 { - if (!refe) + if (refe == null) return false; var areas = Global.DB2Mgr.GetAreasForGroup(reqValue); @@ -3427,7 +3427,7 @@ namespace Game.Achievements return false; break; case ModifierTreeType.TargetCovenant: // 314 - if (!refe || !refe.IsPlayer()) + if (refe == null || !refe.IsPlayer()) return false; if (refe.ToPlayer().m_playerData.CovenantID != reqValue) return false; @@ -4560,7 +4560,7 @@ namespace Game.Achievements case CriteriaDataType.Script: { Unit unitTarget = null; - if (target) + if (target != null) unitTarget = target.ToUnit(); return Global.ScriptMgr.OnCriteriaCheck(ScriptId, source.ToPlayer(), unitTarget.ToUnit()); } @@ -4579,7 +4579,7 @@ namespace Game.Achievements case CriteriaDataType.BgLossTeamScore: { Battleground bg = source.GetBattleground(); - if (!bg) + if (bg == null) return false; int score = (int)bg.GetTeamScore(bg.GetPlayerTeam(source.GetGUID()) == Team.Alliance ? Framework.Constants.TeamId.Horde : Framework.Constants.TeamId.Alliance); @@ -4625,7 +4625,7 @@ namespace Game.Achievements { CharTitlesRecord titleInfo = CliDB.CharTitlesStorage.LookupByKey(KnownTitle.Id); if (titleInfo != null) - return source && source.HasTitle(titleInfo.MaskID); + return source != null && source.HasTitle(titleInfo.MaskID); return false; } diff --git a/Source/Game/Arenas/Arena.cs b/Source/Game/Arenas/Arena.cs index 975407f60..1ead61a89 100644 --- a/Source/Game/Arenas/Arena.cs +++ b/Source/Game/Arenas/Arena.cs @@ -112,7 +112,7 @@ namespace Game.Arenas if (winnerArenaTeam != null && loserArenaTeam != null && winnerArenaTeam != loserArenaTeam) { Player player = _GetPlayer(guid, bgPlayer.OfflineRemoveTime != 0, "Arena.RemovePlayerAtLeave"); - if (player) + if (player != null) loserArenaTeam.MemberLost(player, GetArenaMatchmakerRating(GetOtherTeam(bgPlayer.Team))); else loserArenaTeam.OfflineMemberLost(guid, GetArenaMatchmakerRating(GetOtherTeam(bgPlayer.Team))); @@ -189,7 +189,7 @@ namespace Game.Arenas foreach (var score in PlayerScores) { Player player = Global.ObjAccessor.FindPlayer(score.Key); - if (player) + if (player != null) { Log.outDebug(LogFilter.Arena, "Statistics match Type: {0} for {1} (GUID: {2}, Team: {3}, IP: {4}): {5}", GetArenaType(), player.GetName(), score.Key, player.GetArenaTeamId((byte)(GetArenaType() == ArenaTypes.Team5v5 ? 2 : (GetArenaType() == ArenaTypes.Team3v3 ? 1 : 0))), @@ -229,7 +229,7 @@ namespace Game.Arenas } Player player = _GetPlayer(pair.Key, pair.Value.OfflineRemoveTime != 0, "Arena.EndBattleground"); - if (!player) + if (player == null) continue; // per player calculation @@ -251,7 +251,7 @@ namespace Game.Arenas if (guildId != 0) { Guild guild = Global.GuildMgr.GetGuildById(guildId); - if (guild) + if (guild != null) guild.UpdateCriteria(CriteriaType.WinAnyRankedArena, Math.Max(winnerArenaTeam.GetRating(), 1), 0, 0, null, player); } } diff --git a/Source/Game/Arenas/ArenaTeam.cs b/Source/Game/Arenas/ArenaTeam.cs index f9d2688e7..a3bdf16b1 100644 --- a/Source/Game/Arenas/ArenaTeam.cs +++ b/Source/Game/Arenas/ArenaTeam.cs @@ -77,7 +77,7 @@ namespace Game.Arenas // Get player name and class either from db or character cache CharacterCacheEntry characterInfo; Player player = Global.ObjAccessor.FindPlayer(playerGuid); - if (player) + if (player != null) { playerClass = player.GetClass(); playerName = player.GetName(); @@ -91,7 +91,7 @@ namespace Game.Arenas return false; // Check if player is already in a similar arena team - if ((player && player.GetArenaTeamId(GetSlot()) != 0) || Global.CharacterCacheStorage.GetCharacterArenaTeamIdByGuid(playerGuid, GetArenaType()) != 0) + if ((player != null && player.GetArenaTeamId(GetSlot()) != 0) || Global.CharacterCacheStorage.GetCharacterArenaTeamIdByGuid(playerGuid, GetArenaType()) != 0) { Log.outDebug(LogFilter.Arena, "Arena: {0} {1} already has an arena team of type {2}", playerGuid.ToString(), playerName, GetArenaType()); return false; @@ -144,7 +144,7 @@ namespace Game.Arenas DB.Characters.Execute(stmt); // Inform player if online - if (player) + if (player != null) { player.SetInArenaTeam(teamId, GetSlot(), GetArenaType()); player.SetArenaTeamIdInvited(0); @@ -254,7 +254,7 @@ namespace Game.Arenas { // Disable remove/promote buttons Player oldCaptain = Global.ObjAccessor.FindPlayer(GetCaptain()); - if (oldCaptain) + if (oldCaptain != null) oldCaptain.SetArenaTeamInfoField(GetSlot(), ArenaTeamInfoType.Member, 1); // Set new captain @@ -268,10 +268,10 @@ namespace Game.Arenas // Enable remove/promote buttons Player newCaptain = Global.ObjAccessor.FindPlayer(guid); - if (newCaptain) + if (newCaptain != null) { newCaptain.SetArenaTeamInfoField(GetSlot(), ArenaTeamInfoType.Member, 0); - if (oldCaptain) + if (oldCaptain != null) { Log.outDebug(LogFilter.Arena, "Player: {0} [GUID: {1}] promoted player: {2} [GUID: {3}] to leader of arena team [Id: {4}, Name: {5}] [Type: {6}].", oldCaptain.GetName(), oldCaptain.GetGUID().ToString(), newCaptain.GetName(), @@ -295,7 +295,7 @@ namespace Game.Arenas // Remove arena team info from player data Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { // delete all info regarding this team for (uint i = 0; i < (int)ArenaTeamInfoType.End; ++i) @@ -319,7 +319,7 @@ namespace Game.Arenas if (session != null) { Player player = session.GetPlayer(); - if (player) + if (player != null) Log.outDebug(LogFilter.Arena, "Player: {0} [GUID: {1}] disbanded arena team type: {2} [Id: {3}, Name: {4}].", player.GetName(), player.GetGUID().ToString(), GetArenaType(), GetId(), GetName()); } @@ -387,7 +387,7 @@ namespace Game.Arenas foreach (var member in Members) { Player player = Global.ObjAccessor.FindPlayer(member.Guid); - if (player) + if (player != null) SendStats(player.GetSession()); } } @@ -397,7 +397,7 @@ namespace Game.Arenas foreach (var member in Members) { Player player = Global.ObjAccessor.FindPlayer(member.Guid); - if (player) + if (player != null) player.SendPacket(packet); } } @@ -441,7 +441,7 @@ namespace Game.Arenas public uint GetAverageMMR(Group group) { - if (!group) + if (group == null) return 0; uint matchMakerRating = 0; @@ -449,7 +449,7 @@ namespace Game.Arenas foreach (var member in Members) { // Skip if player is not online - if (!Global.ObjAccessor.FindPlayer(member.Guid)) + if (Global.ObjAccessor.FindPlayer(member.Guid) == null) continue; // Skip if player is not a member of group @@ -545,7 +545,7 @@ namespace Game.Arenas foreach (var member in Members) { Player player = Global.ObjAccessor.FindPlayer(member.Guid); - if (player) + if (player != null) player.UpdateCriteria(CriteriaType.EarnTeamArenaRating, stats.Rating, type); } } @@ -740,7 +740,7 @@ namespace Game.Arenas foreach (var member in Members) { Player player = Global.ObjAccessor.FindPlayer(member.Guid); - if (player) + if (player != null) if (player.GetMap().IsBattleArena()) return true; } @@ -816,7 +816,7 @@ namespace Game.Arenas else PersonalRating += (ushort)mod; - if (player) + if (player != null) { player.SetArenaTeamInfoField(ArenaTeam.GetSlotByType(type), ArenaTeamInfoType.PersonalRating, PersonalRating); player.UpdateCriteria(CriteriaType.EarnPersonalArenaRating, PersonalRating, type); diff --git a/Source/Game/Arenas/Zones/DalaranSewers.cs b/Source/Game/Arenas/Zones/DalaranSewers.cs index f54780e66..67befc3d3 100644 --- a/Source/Game/Arenas/Zones/DalaranSewers.cs +++ b/Source/Game/Arenas/Zones/DalaranSewers.cs @@ -43,7 +43,7 @@ namespace Game.Arenas foreach (var pair in GetPlayers()) { Player player = _GetPlayer(pair, "BattlegroundDS::StartingEventOpenDoors"); - if (player) + if (player != null) player.RemoveAurasDueToSpell(DalaranSewersSpells.DemonicCircle); } } @@ -92,9 +92,9 @@ namespace Game.Arenas result &= AddObject(DalaranSewersObjectTypes.Water1, DalaranSewersGameObjects.Water1, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120); result &= AddObject(DalaranSewersObjectTypes.Water2, DalaranSewersGameObjects.Water2, 1291.56f, 790.837f, 7.1f, 3.14238f, 0, 0, 0.694215f, -0.719768f, 120); - result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.WaterfallKnockback, 1292.587f, 790.2205f, 7.19796f, 3.054326f, TeamId.Neutral, BattlegroundConst.RespawnImmediately); - result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback1, 1369.977f, 817.2882f, 16.08718f, 3.106686f, TeamId.Neutral, BattlegroundConst.RespawnImmediately); - result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback2, 1212.833f, 765.3871f, 16.09484f, 0.0f, TeamId.Neutral, BattlegroundConst.RespawnImmediately); + result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.WaterfallKnockback, 1292.587f, 790.2205f, 7.19796f, 3.054326f, TeamId.Neutral, BattlegroundConst.RespawnImmediately) != null; + result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback1, 1369.977f, 817.2882f, 16.08718f, 3.106686f, TeamId.Neutral, BattlegroundConst.RespawnImmediately) != null; + result &= AddCreature(DalaranSewersData.NpcWaterSpout, DalaranSewersCreatureTypes.PipeKnockback2, 1212.833f, 765.3871f, 16.09484f, 0.0f, TeamId.Neutral, BattlegroundConst.RespawnImmediately) != null; if (!result) { Log.outError(LogFilter.Sql, "DalaranSewersArena: Failed to spawn collision object!"); @@ -135,7 +135,7 @@ namespace Game.Arenas { // Repeat knockback while the waterfall still active Creature waterSpout = GetBGCreature(DalaranSewersCreatureTypes.WaterfallKnockback); - if (waterSpout) + if (waterSpout != null) waterSpout.CastSpell(waterSpout, DalaranSewersSpells.WaterSpout, true); _events.ScheduleEvent(eventId, DalaranSewersData.WaterfallKnockbackTimer); } @@ -145,7 +145,7 @@ namespace Game.Arenas for (int i = DalaranSewersCreatureTypes.PipeKnockback1; i <= DalaranSewersCreatureTypes.PipeKnockback2; ++i) { Creature waterSpout = GetBGCreature(i); - if (waterSpout) + if (waterSpout != null) waterSpout.CastSpell(waterSpout, DalaranSewersSpells.Flush, true); } } @@ -154,7 +154,7 @@ namespace Game.Arenas }); } - EventMap _events; + EventMap _events = new(); } struct DalaranSewersEvents diff --git a/Source/Game/Arenas/Zones/RingofValor.cs b/Source/Game/Arenas/Zones/RingofValor.cs index f16ba4503..dbc673eba 100644 --- a/Source/Game/Arenas/Zones/RingofValor.cs +++ b/Source/Game/Arenas/Zones/RingofValor.cs @@ -160,7 +160,7 @@ namespace Game.Arenas for (byte i = RingofValorObjectTypes.Pilar1; i <= RingofValorObjectTypes.PilarCollision4; ++i) { GameObject go = GetBGObject(i); - if (go) + if (go != null) { if (i >= RingofValorObjectTypes.PilarCollision1) { @@ -171,7 +171,7 @@ namespace Game.Arenas foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) go.SendUpdateToPlayer(player); } } diff --git a/Source/Game/AuctionHouse/AuctionManager.cs b/Source/Game/AuctionHouse/AuctionManager.cs index bef17f673..b1d145ffb 100644 --- a/Source/Game/AuctionHouse/AuctionManager.cs +++ b/Source/Game/AuctionHouse/AuctionManager.cs @@ -256,7 +256,7 @@ namespace Game public void AddAItem(Item item) { - Cypher.Assert(item); + Cypher.Assert(item != null); Cypher.Assert(!_itemsByGuid.ContainsKey(item.GetGUID())); _itemsByGuid[item.GetGUID()] = item; } @@ -1263,7 +1263,7 @@ namespace Game if (auctionItem.GetCount() >= remainingQuantity) { Item clonedItem = auctionItem.CloneItem(remainingQuantity, player); - if (!clonedItem) + if (clonedItem == null) { player.GetSession().SendAuctionCommandResult(0, AuctionCommand.PlaceBid, AuctionResult.CommodityPurchaseFailed, delayForNextAction); return false; @@ -1366,9 +1366,9 @@ namespace Game Player oldBidder = Global.ObjAccessor.FindConnectedPlayer(auction.Bidder); // old bidder exist - if ((oldBidder || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Bidder)))// && !sAuctionBotConfig.IsBotChar(auction.Bidder)) + if ((oldBidder != null || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Bidder)))// && !sAuctionBotConfig.IsBotChar(auction.Bidder)) { - if (oldBidder) + if (oldBidder != null) { AuctionOutbidNotification packet = new(); packet.BidAmount = newBidAmount; @@ -1388,14 +1388,14 @@ namespace Game public void SendAuctionWon(AuctionPosting auction, Player bidder, SQLTransaction trans) { uint bidderAccId; - if (!bidder) + if (bidder == null) bidder = Global.ObjAccessor.FindConnectedPlayer(auction.Bidder); // try lookup bidder when called from .Update // data for gm.log string bidderName = ""; bool logGmTrade= auction.ServerFlags.HasFlag(AuctionPostingServerFlag.GmLogBuyer); - if (bidder) + if (bidder != null) { bidderAccId = bidder.GetSession().GetAccountId(); bidderName = bidder.GetName(); @@ -1437,7 +1437,7 @@ namespace Game mail.AddItem(item); } - if (bidder) + if (bidder != null) { AuctionWonNotification packet = new(); packet.Info.Initialize(auction, auction.Items[0]); @@ -1460,17 +1460,17 @@ namespace Game //call this method to send mail to auction owner, when auction is successful, it does not clear ram public void SendAuctionSold(AuctionPosting auction, Player owner, SQLTransaction trans) { - if (!owner) + if (owner == null) owner = Global.ObjAccessor.FindConnectedPlayer(auction.Owner); // owner exist - if ((owner || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Owner)))// && !sAuctionBotConfig.IsBotChar(auction.Owner)) + if ((owner != null || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Owner)))// && !sAuctionBotConfig.IsBotChar(auction.Owner)) { ulong auctionHouseCut = CalculateAuctionHouseCut(auction.BidAmount); ulong profit = auction.BidAmount + auction.Deposit - auctionHouseCut; //FIXME: what do if owner offline - if (owner) + if (owner != null) { owner.UpdateCriteria(CriteriaType.MoneyEarnedFromAuctions, profit); owner.UpdateCriteria(CriteriaType.HighestAuctionSale, auction.BidAmount); @@ -1489,9 +1489,9 @@ namespace Game { Player owner = Global.ObjAccessor.FindConnectedPlayer(auction.Owner); // owner exist - if ((owner || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Owner)))// && !sAuctionBotConfig.IsBotChar(auction.Owner)) + if ((owner != null || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Owner)))// && !sAuctionBotConfig.IsBotChar(auction.Owner)) { - if (owner) + if (owner != null) owner.GetSession().SendAuctionClosedNotification(auction, 0.0f, false); int itemIndex = 0; @@ -1533,7 +1533,7 @@ namespace Game Player bidder = Global.ObjAccessor.FindConnectedPlayer(auction.Bidder); // bidder exist - if ((bidder || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Bidder)))// && !sAuctionBotConfig.IsBotChar(auction.Bidder)) + if ((bidder != null || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Bidder)))// && !sAuctionBotConfig.IsBotChar(auction.Bidder)) new MailDraft(Global.AuctionHouseMgr.BuildItemAuctionMailSubject(AuctionMailType.Removed, auction), "") .AddMoney(auction.BidAmount) .SendMailTo(trans, new MailReceiver(bidder, auction.Bidder), new MailSender(this), MailCheckMask.Copied); @@ -1541,11 +1541,11 @@ namespace Game public void SendAuctionInvoice(AuctionPosting auction, Player owner, SQLTransaction trans) { - if (!owner) + if (owner == null) owner = Global.ObjAccessor.FindConnectedPlayer(auction.Owner); // owner exist (online or offline) - if ((owner || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Owner)))// && !sAuctionBotConfig.IsBotChar(auction.Owner)) + if ((owner != null || Global.CharacterCacheStorage.HasCharacterCacheEntry(auction.Owner)))// && !sAuctionBotConfig.IsBotChar(auction.Owner)) { ByteBuffer tempBuffer = new(); tempBuffer.WritePackedTime(GameTime.GetGameTime() + WorldConfig.GetIntValue(WorldCfg.MailDeliveryDelay)); diff --git a/Source/Game/BattleFields/BattleField.cs b/Source/Game/BattleFields/BattleField.cs index e229bd485..1273477f7 100644 --- a/Source/Game/BattleFields/BattleField.cs +++ b/Source/Game/BattleFields/BattleField.cs @@ -83,7 +83,7 @@ namespace Game.BattleFields { m_PlayersInWar[player.GetTeamId()].Remove(player.GetGUID()); Group group = player.GetGroup(); - if (group) // Remove the player from the raid group + if (group != null) // Remove the player from the raid group group.RemoveMember(player.GetGUID()); OnPlayerLeaveWar(player); @@ -171,7 +171,7 @@ namespace Game.BattleFields foreach (var guid in m_players[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) InvitePlayerToQueue(player); } } @@ -193,7 +193,7 @@ namespace Game.BattleFields foreach (var guid in m_PlayersInQueue[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (m_PlayersInWar[player.GetTeamId()].Count + m_InvitedPlayers[player.GetTeamId()].Count < m_MaxPlayer) InvitePlayerToWar(player); @@ -214,7 +214,7 @@ namespace Game.BattleFields foreach (var guid in m_players[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (m_PlayersInWar[player.GetTeamId()].Contains(player.GetGUID()) || m_InvitedPlayers[player.GetTeamId()].ContainsKey(player.GetGUID())) continue; @@ -229,14 +229,14 @@ namespace Game.BattleFields void InvitePlayerToWar(Player player) { - if (!player) + if (player == null) return; // todo needed ? if (player.IsInFlight()) return; - if (player.InArena() || player.GetBattleground()) + if (player.InArena() || player.GetBattleground() != null) { m_PlayersInQueue[player.GetTeamId()].Remove(player.GetGUID()); return; @@ -262,7 +262,7 @@ namespace Game.BattleFields public void InitStalker(uint entry, Position pos) { Creature creature = SpawnCreature(entry, pos); - if (creature) + if (creature != null) StalkerGuid = creature.GetGUID(); else Log.outError(LogFilter.Battlefield, "Battlefield.InitStalker: could not spawn Stalker (Creature entry {0}), zone messeges will be un-available", entry); @@ -275,7 +275,7 @@ namespace Game.BattleFields foreach (var guid in m_PlayersInWar[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) if (player.IsAFK()) KickPlayerFromBattlefield(guid); } @@ -285,7 +285,7 @@ namespace Game.BattleFields public void KickPlayerFromBattlefield(ObjectGuid guid) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) if (player.GetZoneId() == GetZoneId()) player.TeleportTo(KickPosition); } @@ -383,7 +383,7 @@ namespace Game.BattleFields foreach (var guid in m_PlayersInWar[teamIndex]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (spellId > 0) player.CastSpell(player, (uint)spellId, true); @@ -400,7 +400,7 @@ namespace Game.BattleFields foreach (var guid in m_players[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendPacket(data); } } @@ -413,7 +413,7 @@ namespace Game.BattleFields foreach (var guid in m_PlayersInQueue[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendPacket(data); } } @@ -426,7 +426,7 @@ namespace Game.BattleFields foreach (var guid in m_PlayersInWar[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendPacket(data); } } @@ -435,7 +435,7 @@ namespace Game.BattleFields public void SendWarning(uint id, WorldObject target = null) { Creature stalker = GetCreature(StalkerGuid); - if (stalker) + if (stalker != null) Global.CreatureTextMgr.SendChat(stalker, (byte)id, target); } @@ -472,7 +472,7 @@ namespace Game.BattleFields creature.SetVisible(true); creature.RemoveUnitFlag(UnitFlags.NonAttackable); creature.SetUninteractible(false); - if (!creature.IsAlive()) + if (creature.IsAlive()) creature.Respawn(true); if (aggressive) creature.SetReactState(ReactStates.Aggressive); @@ -491,7 +491,7 @@ namespace Game.BattleFields foreach (var guid in m_Groups[teamIndex]) { Group group = Global.GroupMgr.GetGroupByGUID(guid); - if (group) + if (group != null) if (!group.IsFull()) return group; } @@ -504,7 +504,7 @@ namespace Game.BattleFields foreach (var guid in m_Groups[teamIndex]) { Group group = Global.GroupMgr.GetGroupByGUID(guid); - if (group) + if (group != null) if (group.IsMember(plguid)) return group; } @@ -518,11 +518,11 @@ namespace Game.BattleFields return false; Group oldgroup = player.GetGroup(); - if (oldgroup) + if (oldgroup != null) oldgroup.RemoveMember(player.GetGUID()); Group group = GetFreeBfRaid(player.GetTeamId()); - if (!group) + if (group == null) { group = new Group(); group.SetBattlefieldGroup(this); @@ -594,7 +594,7 @@ namespace Game.BattleFields } Creature creature = Creature.CreateCreature(entry, m_Map, pos); - if (!creature) + if (creature == null) { Log.outError(LogFilter.Battlefield, "Battlefield:SpawnCreature: Can't create creature entry: {0}", entry); return null; @@ -621,7 +621,7 @@ namespace Game.BattleFields // Create gameobject GameObject go = GameObject.CreateGameObject(entry, m_Map, pos, rotation, 255, GameObjectState.Ready); - if (!go) + if (go == null) { Log.outError(LogFilter.Battlefield, "Battlefield:SpawnGameObject: Cannot create gameobject template {1}! Battlefield not created!", entry); return null; @@ -637,14 +637,14 @@ namespace Game.BattleFields public Creature GetCreature(ObjectGuid guid) { - if (!m_Map) + if (m_Map == null) return null; return m_Map.GetCreature(guid); } public GameObject GetGameObject(ObjectGuid guid) { - if (!m_Map) + if (m_Map == null) return null; return m_Map.GetGameObject(guid); } @@ -788,7 +788,7 @@ namespace Game.BattleFields public void SetSpirit(Creature spirit, int teamIndex) { - if (!spirit) + if (spirit == null) { Log.outError(LogFilter.Battlefield, "BfGraveyard:SetSpirit: Invalid Spirit."); return; @@ -826,8 +826,8 @@ namespace Game.BattleFields if (m_SpiritGuide[TeamId.Alliance].IsEmpty() || m_SpiritGuide[TeamId.Horde].IsEmpty()) return false; - if (!m_Bf.GetCreature(m_SpiritGuide[TeamId.Alliance]) || - !m_Bf.GetCreature(m_SpiritGuide[TeamId.Horde])) + if (m_Bf.GetCreature(m_SpiritGuide[TeamId.Alliance]) == null || + m_Bf.GetCreature(m_SpiritGuide[TeamId.Horde]) == null) return false; return (m_SpiritGuide[TeamId.Alliance] == guid || m_SpiritGuide[TeamId.Horde] == guid); @@ -869,7 +869,7 @@ namespace Game.BattleFields if (!m_capturePointGUID.IsEmpty()) { GameObject capturePoint = m_Bf.GetGameObject(m_capturePointGUID); - if (capturePoint) + if (capturePoint != null) { player.SendUpdateWorldState(capturePoint.GetGoInfo().ControlZone.worldState1, 1); player.SendUpdateWorldState(capturePoint.GetGoInfo().ControlZone.worldstate2, (uint)(Math.Ceiling((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f))); @@ -885,7 +885,7 @@ namespace Game.BattleFields if (!m_capturePointGUID.IsEmpty()) { GameObject capturePoint = m_Bf.GetGameObject(m_capturePointGUID); - if (capturePoint) + if (capturePoint != null) player.SendUpdateWorldState(capturePoint.GetGoInfo().ControlZone.worldState1, 0); } @@ -898,7 +898,7 @@ namespace Game.BattleFields return; GameObject capturePoint = m_Bf.GetGameObject(m_capturePointGUID); - if (capturePoint) + if (capturePoint != null) { // send this too, sometimes the slider disappears, dunno why :( SendUpdateWorldState(capturePoint.GetGoInfo().ControlZone.worldState1, 1); @@ -911,7 +911,7 @@ namespace Game.BattleFields public bool SetCapturePointData(GameObject capturePoint) { - Cypher.Assert(capturePoint); + Cypher.Assert(capturePoint != null); Log.outError(LogFilter.Battlefield, "Creating capture point {0}", capturePoint.GetEntry()); @@ -956,7 +956,7 @@ namespace Game.BattleFields if (!m_capturePointGUID.IsEmpty()) { GameObject capturePoint = m_Bf.GetGameObject(m_capturePointGUID); - if (capturePoint) + if (capturePoint != null) { capturePoint.SetRespawnTime(0); // not save respawn time capturePoint.Delete(); @@ -974,7 +974,7 @@ namespace Game.BattleFields return false; GameObject capturePoint = m_Bf.GetGameObject(m_capturePointGUID); - if (capturePoint) + if (capturePoint != null) { float radius = capturePoint.GetGoInfo().ControlZone.radius; @@ -983,7 +983,7 @@ namespace Game.BattleFields foreach (var guid in m_activePlayers[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (!capturePoint.IsWithinDistInMap(player, radius) || !player.IsOutdoorPvPActive()) HandlePlayerLeave(player); @@ -1098,7 +1098,7 @@ namespace Game.BattleFields foreach (var guid in m_activePlayers[team]) // send to all players present in the area { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendUpdateWorldState(field, value); } } @@ -1123,7 +1123,7 @@ namespace Game.BattleFields foreach (var _guid in m_activePlayers[team]) { Player player = Global.ObjAccessor.FindPlayer(_guid); - if (player) + if (player != null) player.KilledMonsterCredit(id, guid); } } diff --git a/Source/Game/BattleGrounds/BattleGround.cs b/Source/Game/BattleGrounds/BattleGround.cs index 4950f0ce6..ba892a2e9 100644 --- a/Source/Game/BattleGrounds/BattleGround.cs +++ b/Source/Game/BattleGrounds/BattleGround.cs @@ -50,7 +50,7 @@ namespace Game.BattleGrounds Global.BattlegroundMgr.RemoveBattleground(GetTypeID(), GetInstanceID()); // unload map - if (m_Map) + if (m_Map != null) { m_Map.UnloadAll(); // unload all objects (they may hold a reference to bg in their ZoneScript pointer) m_Map.SetUnload(); // mark for deletion by MapManager @@ -152,7 +152,7 @@ namespace Game.BattleGrounds foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (player.IsGameMaster()) continue; @@ -273,7 +273,7 @@ namespace Game.BattleGrounds foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.ResetAllPowers(); } } @@ -291,7 +291,7 @@ namespace Game.BattleGrounds foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendPacket(timer); } @@ -302,7 +302,7 @@ namespace Game.BattleGrounds { m_Events |= BattlegroundEventFlags.Event1; - if (!FindBgMap()) + if (FindBgMap() == null) { Log.outError(LogFilter.Battleground, $"Battleground._ProcessJoin: map (map id: {GetMapId()}, instance id: {m_InstanceID}) is not created!"); EndNow(); @@ -364,7 +364,7 @@ namespace Game.BattleGrounds foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { // Correctly display EnemyUnitFrame player.SetArenaFaction((byte)player.GetBGTeam()); @@ -393,7 +393,7 @@ namespace Game.BattleGrounds foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { player.RemoveAurasDueToSpell(BattlegroundConst.SpellPreparation); player.ResetAllPowers(); @@ -433,7 +433,7 @@ namespace Game.BattleGrounds if (!offlineRemove) { player = Global.ObjAccessor.FindPlayer(guid); - if (!player) + if (player == null) Log.outError(LogFilter.Battleground, $"Battleground.{context}: player ({guid}) not found for BG (map: {GetMapId()}, instance id: {m_InstanceID})!"); } return player; @@ -447,7 +447,7 @@ namespace Game.BattleGrounds Player _GetPlayerForTeam(Team teamId, KeyValuePair pair, string context) { Player player = _GetPlayer(pair, context); - if (player) + if (player != null) { Team team = pair.Value.Team; if (team == 0) @@ -460,7 +460,7 @@ namespace Game.BattleGrounds public BattlegroundMap GetBgMap() { - Cypher.Assert(m_Map); + Cypher.Assert(m_Map != null); return m_Map; } @@ -480,7 +480,7 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayer(pair, "SendPacketToAll"); - if (player) + if (player != null) player.SendPacket(packet); } } @@ -490,7 +490,7 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayerForTeam(team, pair, "SendPacketToTeam"); - if (player) + if (player != null) { if (player != except) player.SendPacket(packet); @@ -531,7 +531,7 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayerForTeam(team, pair, "CastSpellOnTeam"); - if (player) + if (player != null) player.CastSpell(player, SpellID, true); } } @@ -541,7 +541,7 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayerForTeam(team, pair, "RemoveAuraOnTeam"); - if (player) + if (player != null) player.RemoveAura(SpellID); } } @@ -551,7 +551,7 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayerForTeam(team, pair, "RewardHonorToTeam"); - if (player) + if (player != null) UpdatePlayerScore(player, ScoreType.BonusHonor, Honor); } } @@ -565,7 +565,7 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayerForTeam(team, pair, "RewardReputationToTeam"); - if (!player) + if (player == null) continue; if (player.HasPlayerFlagEx(PlayerFlagsEx.MercenaryMode)) @@ -648,7 +648,7 @@ namespace Game.BattleGrounds Team team = pair.Value.Team; Player player = _GetPlayer(pair, "EndBattleground"); - if (!player) + if (player == null) continue; // should remove spirit of redemption @@ -726,7 +726,7 @@ namespace Game.BattleGrounds if (guildId != 0) { Guild guild = Global.GuildMgr.GetGuildById(guildId); - if (guild) + if (guild != null) guild.UpdateCriteria(CriteriaType.WinBattleground, player.GetMapId(), 0, 0, null, player); } } @@ -791,7 +791,7 @@ namespace Game.BattleGrounds PlayerScores.Remove(guid); Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { // should remove spirit of redemption if (player.HasAuraType(AuraType.SpiritOfRedemption)) @@ -822,7 +822,7 @@ namespace Game.BattleGrounds if (participant) // if the player was a match participant, remove auras, calc rating, update queue { - if (player) + if (player != null) { player.ClearAfkReports(); @@ -847,7 +847,7 @@ namespace Game.BattleGrounds // remove from raid group if player is member Group group = GetBgRaid(team); - if (group) + if (group != null) { if (!group.RemoveMember(guid)) // group was disbanded SetBgRaid(team, null); @@ -866,7 +866,7 @@ namespace Game.BattleGrounds SendPacketToTeam(team, playerLeft, player); } - if (player) + if (player != null) { // Do next only if found in Battleground player.SetBattlegroundId(0, BattlegroundTypeId.None); // We're not in BG. @@ -1055,7 +1055,7 @@ namespace Game.BattleGrounds { ObjectGuid playerGuid = player.GetGUID(); Group group = GetBgRaid(team); - if (!group) // first player joined + if (group == null) // first player joined { group = new Group(); SetBgRaid(team, group); @@ -1072,12 +1072,14 @@ namespace Game.BattleGrounds { group.AddMember(player); Group originalGroup = player.GetOriginalGroup(); - if (originalGroup) + if (originalGroup != null) + { if (originalGroup.IsLeader(playerGuid)) { group.ChangeLeader(playerGuid); group.SendUpdate(); } + } } } } @@ -1235,7 +1237,7 @@ namespace Game.BattleGrounds score.Value.BuildPvPLogPlayerDataPacket(out playerData); Player player = Global.ObjAccessor.GetPlayer(GetBgMap(), playerData.PlayerGUID); - if (player) + if (player != null) { playerData.IsInWorld = true; playerData.PrimaryTalentTree = (int)player.GetPrimarySpecialization(); @@ -1269,7 +1271,7 @@ namespace Game.BattleGrounds public bool AddObject(int type, uint entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint respawnTime = 0, GameObjectState goState = GameObjectState.Ready) { Map map = FindBgMap(); - if (!map) + if (map == null) return false; Quaternion rotation = new(rotation0, rotation1, rotation2, rotation3); @@ -1286,7 +1288,7 @@ namespace Game.BattleGrounds // and when loading it (in go.LoadFromDB()), a new guid would be assigned to the object, and a new object would be created // So we must create it specific for this instance GameObject go = GameObject.CreateGameObject(entry, GetBgMap(), new Position(x, y, z, o), rotation, 255, goState); - if (!go) + if (go == null) { Log.outError(LogFilter.Battleground, $"Battleground.AddObject: cannot create gameobject (entry: {entry}) for BG (map: {GetMapId()}, instance id: {m_InstanceID})!"); return false; @@ -1310,7 +1312,7 @@ namespace Game.BattleGrounds public void DoorClose(int type) { GameObject obj = GetBgMap().GetGameObject(BgObjects[type]); - if (obj) + if (obj != null) { // If doors are open, close it if (obj.GetLootState() == LootState.Activated && obj.GetGoState() != GameObjectState.Ready) @@ -1326,7 +1328,7 @@ namespace Game.BattleGrounds public void DoorOpen(int type) { GameObject obj = GetBgMap().GetGameObject(BgObjects[type]); - if (obj) + if (obj != null) { obj.SetLootState(LootState.Activated); obj.SetGoState(GameObjectState.Active); @@ -1341,7 +1343,7 @@ namespace Game.BattleGrounds return null; GameObject obj = GetBgMap().GetGameObject(BgObjects[type]); - if (!obj) + if (obj == null) Log.outError(LogFilter.Battleground, $"Battleground.GetBGObject: gameobject (type: {type}, {BgObjects[type]}) not found for BG (map: {GetMapId()}, instance id: {m_InstanceID})!"); return obj; @@ -1353,7 +1355,7 @@ namespace Game.BattleGrounds return null; Creature creature = GetBgMap().GetCreature(BgCreatures[type]); - if (!creature) + if (creature == null) Log.outError(LogFilter.Battleground, $"Battleground.GetBGCreature: creature (type: {type}, {BgCreatures[type]}) not found for BG (map: {GetMapId()}, instance id: {m_InstanceID})!"); return creature; @@ -1370,7 +1372,7 @@ namespace Game.BattleGrounds if (map != null) { GameObject obj = map.GetGameObject(BgObjects[type]); - if (obj) + if (obj != null) { if (respawntime != 0) { @@ -1400,7 +1402,7 @@ namespace Game.BattleGrounds public virtual Creature AddCreature(uint entry, int type, float x, float y, float z, float o, int teamIndex = TeamId.Neutral, uint respawntime = 0, Transport transport = null) { Map map = FindBgMap(); - if (!map) + if (map == null) return null; if (Global.ObjectMgr.GetCreatureTemplate(entry) == null) @@ -1410,10 +1412,10 @@ namespace Game.BattleGrounds } - if (transport) + if (transport != null) { Creature transCreature = transport.SummonPassenger(entry, new Position(x, y, z, o), TempSummonType.ManualDespawn); - if (transCreature) + if (transCreature != null) { BgCreatures[type] = transCreature.GetGUID(); return transCreature; @@ -1425,7 +1427,7 @@ namespace Game.BattleGrounds Position pos = new(x, y, z, o); Creature creature = Creature.CreateCreature(entry, map, pos); - if (!creature) + if (creature == null) { Log.outError(LogFilter.Battleground, $"Battleground.AddCreature: cannot create creature (entry: {entry}) for BG (map: {GetMapId()}, instance id: {m_InstanceID})!"); return null; @@ -1455,7 +1457,7 @@ namespace Game.BattleGrounds return true; Creature creature = GetBgMap().GetCreature(BgCreatures[type]); - if (creature) + if (creature != null) { creature.AddObjectToRemoveList(); BgCreatures[type].Clear(); @@ -1473,7 +1475,7 @@ namespace Game.BattleGrounds return true; GameObject obj = GetBgMap().GetGameObject(BgObjects[type]); - if (obj) + if (obj != null) { obj.SetRespawnTime(0); // not save respawn time obj.Delete(); @@ -1562,7 +1564,7 @@ namespace Game.BattleGrounds // Add +1 deaths UpdatePlayerScore(victim, ScoreType.Deaths, 1); // Add +1 kills to group and +1 killing_blows to killer - if (killer) + if (killer != null) { // Don't reward credit for killing ourselves, like fall damage of hellfire (warlock) if (killer == victim) @@ -1576,7 +1578,7 @@ namespace Game.BattleGrounds foreach (var (guid, player) in m_Players) { Player creditedPlayer = Global.ObjAccessor.FindPlayer(guid); - if (!creditedPlayer || creditedPlayer == killer) + if (creditedPlayer == null || creditedPlayer == killer) continue; if (player.Team == killerTeam && creditedPlayer.IsAtGroupRewardDistance(victim)) @@ -1650,7 +1652,7 @@ namespace Game.BattleGrounds if (pair.Value.Team == Team) { Player player = Global.ObjAccessor.FindPlayer(pair.Key); - if (player && player.IsAlive()) + if (player != null && player.IsAlive()) ++count; } } @@ -1669,9 +1671,9 @@ namespace Game.BattleGrounds void SetBgRaid(Team team, Group bg_raid) { Group old_raid = m_BgRaids[GetTeamIndexByTeamId(team)]; - if (old_raid) + if (old_raid != null) old_raid.SetBattlegroundGroup(null); - if (bg_raid) + if (bg_raid != null) bg_raid.SetBattlegroundGroup(this); m_BgRaids[GetTeamIndexByTeamId(team)] = bg_raid; } @@ -1688,7 +1690,7 @@ namespace Game.BattleGrounds foreach (var guid in GetPlayers().Keys) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) GameEvents.TriggerForPlayer(gameEventId, player); } } @@ -1700,7 +1702,7 @@ namespace Game.BattleGrounds void RewardXPAtKill(Player killer, Player victim) { - if (WorldConfig.GetBoolValue(WorldCfg.BgXpForKill) && killer && victim) + if (WorldConfig.GetBoolValue(WorldCfg.BgXpForKill) && killer != null && victim != null) new KillRewarder(new[] { killer }, victim, true).Reward(); } @@ -1911,16 +1913,11 @@ namespace Game.BattleGrounds foreach (var pair in m_Players) { Player player = _GetPlayer(pair, "BroadcastWorker"); - if (player) + if (player != null) _do.Invoke(player); } } - public static implicit operator bool (Battleground bg) - { - return bg != null; - } - #region Fields protected Dictionary PlayerScores = new(); // Player scores // Player lists, those need to be accessible by inherited classes diff --git a/Source/Game/BattleGrounds/BattleGroundManager.cs b/Source/Game/BattleGrounds/BattleGroundManager.cs index 7d0c0f556..49488a1a4 100644 --- a/Source/Game/BattleGrounds/BattleGroundManager.cs +++ b/Source/Game/BattleGrounds/BattleGroundManager.cs @@ -189,7 +189,7 @@ namespace Game.BattleGrounds { var bgs = it.Value.m_Battlegrounds; var bg = bgs.LookupByKey(instanceId); - if (bg) + if (bg != null) return bg; } @@ -402,7 +402,7 @@ namespace Game.BattleGrounds public void SendToBattleground(Player player, uint instanceId, BattlegroundTypeId bgTypeId) { Battleground bg = GetBattleground(instanceId, bgTypeId); - if (bg) + if (bg != null) { uint mapid = bg.GetMapId(); Team team = player.GetBGTeam(); @@ -676,7 +676,7 @@ namespace Game.BattleGrounds public void AddBattleground(Battleground bg) { - if (bg) + if (bg != null) bgDataStore[bg.GetTypeID()].m_Battlegrounds[bg.GetInstanceID()] = bg; } diff --git a/Source/Game/BattleGrounds/BattleGroundQueue.cs b/Source/Game/BattleGrounds/BattleGroundQueue.cs index 67fdaddf8..1555df4e5 100644 --- a/Source/Game/BattleGrounds/BattleGroundQueue.cs +++ b/Source/Game/BattleGrounds/BattleGroundQueue.cs @@ -80,12 +80,12 @@ namespace Game.BattleGrounds } //add players from group to ginfo - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (!member) + if (member == null) continue; // this should never happen PlayerQueueInfo pl_info = new(); @@ -210,7 +210,7 @@ namespace Game.BattleGrounds { string playerName = "Unknown"; Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) playerName = player.GetName(); Log.outDebug(LogFilter.Battleground, "BattlegroundQueue: couldn't find player {0} ({1})", playerName, guid.ToString()); return; @@ -264,7 +264,7 @@ namespace Game.BattleGrounds if (decreaseInvitedCount && group.IsInvitedToBGInstanceGUID != 0) { Battleground bg = Global.BattlegroundMgr.GetBattleground(group.IsInvitedToBGInstanceGUID, (BattlegroundTypeId)m_queueId.BattlemasterListId); - if (bg) + if (bg != null) bg.DecreaseInvitedCount(group.Team); } @@ -287,7 +287,7 @@ namespace Game.BattleGrounds { Log.outDebug(LogFilter.Battleground, "UPDATING memberLost's personal arena rating for {0} by opponents rating: {1}", guid.ToString(), group.OpponentsTeamRating); Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) at.MemberLost(player, group.OpponentsMatchmakerRating); else at.OfflineMemberLost(guid, group.OpponentsMatchmakerRating); @@ -310,7 +310,7 @@ namespace Game.BattleGrounds // remove next player, this is recursive // first send removal information Player plr2 = Global.ObjAccessor.FindConnectedPlayer(group.Players.FirstOrDefault().Key); - if (plr2) + if (plr2 != null) { uint queueSlot = plr2.GetBattlegroundQueueIndex(m_queueId); @@ -378,7 +378,7 @@ namespace Game.BattleGrounds // get the player Player player = Global.ObjAccessor.FindPlayer(guid); // if offline, skip him, this should not happen - player is removed from queue when he logs out - if (!player) + if (player == null) continue; // invite the player @@ -911,7 +911,7 @@ namespace Game.BattleGrounds GroupQueueInfo aTeam = queueArray[TeamId.Alliance]; GroupQueueInfo hTeam = queueArray[TeamId.Horde]; Battleground arena = Global.BattlegroundMgr.CreateNewBattleground(m_queueId, bracket_id); - if (!arena) + if (arena == null) { Log.outError(LogFilter.Battleground, "BattlegroundQueue.Update couldn't create arena instance for rated arena match!"); return; @@ -1156,7 +1156,7 @@ namespace Game.BattleGrounds { Player player = Global.ObjAccessor.FindPlayer(m_PlayerGuid); // player logged off (we should do nothing, he is correctly removed from queue in another procedure) - if (!player) + if (player == null) return true; Battleground bg = Global.BattlegroundMgr.GetBattleground(m_BgInstanceGUID, m_BgTypeId); @@ -1206,7 +1206,7 @@ namespace Game.BattleGrounds public override bool Execute(ulong e_time, uint p_time) { Player player = Global.ObjAccessor.FindPlayer(m_PlayerGuid); - if (!player) + if (player == null) // player logged off (we should do nothing, he is correctly removed from queue in another procedure) return true; @@ -1226,7 +1226,7 @@ namespace Game.BattleGrounds player.RemoveBattlegroundQueueId(m_BgQueueTypeId); bgQueue.RemovePlayer(m_PlayerGuid, true); //update queues if Battleground isn't ended - if (bg && bg.IsBattleground() && bg.GetStatus() != BattlegroundStatus.WaitLeave) + if (bg != null && bg.IsBattleground() && bg.GetStatus() != BattlegroundStatus.WaitLeave) Global.BattlegroundMgr.ScheduleQueueUpdate(0, m_BgQueueTypeId, bg.GetBracketId()); BattlefieldStatusNone battlefieldStatus; diff --git a/Source/Game/BattleGrounds/Zones/ArathiBasin.cs b/Source/Game/BattleGrounds/Zones/ArathiBasin.cs index 496f51709..154bf2ab6 100644 --- a/Source/Game/BattleGrounds/Zones/ArathiBasin.cs +++ b/Source/Game/BattleGrounds/Zones/ArathiBasin.cs @@ -354,13 +354,13 @@ namespace Game.BattleGrounds.Zones CastSpellOnTeam(BattlegroundConst.AbQuestReward4Bases, team); Creature trigger = !BgCreatures[node + 7].IsEmpty() ? GetBGCreature(node + 7) : null; // 0-6 spirit guides - if (!trigger) + if (trigger == null) trigger = AddCreature(SharedConst.WorldTrigger, node + 7, NodePositions[node], GetTeamIndexByTeamId(team)); //add bonus honor aura trigger creature when node is accupied //cast bonus aura (+50% honor in 25yards) //aura should only apply to players who have accupied the node, set correct faction for trigger - if (trigger) + if (trigger != null) { trigger.SetFaction(team == Team.Alliance ? 84u : 83u); trigger.CastSpell(trigger, BattlegroundConst.SpellHonorableDefender25y, false); @@ -389,7 +389,7 @@ namespace Game.BattleGrounds.Zones byte node = ABBattlegroundNodes.NodeStables; GameObject obj = GetBgMap().GetGameObject(BgObjects[node * 8 + 7]); - while ((node < ABBattlegroundNodes.DynamicNodesCount) && ((!obj) || (!source.IsWithinDistInMap(obj, 10)))) + while ((node < ABBattlegroundNodes.DynamicNodesCount) && ((obj == null) || (!source.IsWithinDistInMap(obj, 10)))) { ++node; obj = GetBgMap().GetGameObject(BgObjects[node * 8 + ABObjectTypes.AuraContested]); diff --git a/Source/Game/BattleGrounds/Zones/EyeofStorm.cs b/Source/Game/BattleGrounds/Zones/EyeofStorm.cs index 3b22f535d..b4f9bf778 100644 --- a/Source/Game/BattleGrounds/Zones/EyeofStorm.cs +++ b/Source/Game/BattleGrounds/Zones/EyeofStorm.cs @@ -153,13 +153,13 @@ namespace Game.BattleGrounds.Zones for (byte i = 0; i < EotSPoints.PointsMax; ++i) { obj = GetBgMap().GetGameObject(BgObjects[EotSObjectTypes.TowerCapFelReaver + i]); - if (obj) + if (obj != null) { byte j = 0; while (j < m_PlayersNearPoint[EotSPoints.PointsMax].Count) { Player player = Global.ObjAccessor.FindPlayer(m_PlayersNearPoint[EotSPoints.PointsMax][j]); - if (!player) + if (player == null) { Log.outError(LogFilter.Battleground, "BattlegroundEY:CheckSomeoneJoinedPoint: Player ({0}) could not be found!", m_PlayersNearPoint[EotSPoints.PointsMax][j].ToString()); ++j; @@ -194,13 +194,13 @@ namespace Game.BattleGrounds.Zones for (byte i = 0; i < EotSPoints.PointsMax; ++i) { obj = GetBgMap().GetGameObject(BgObjects[EotSObjectTypes.TowerCapFelReaver + i]); - if (obj) + if (obj != null) { byte j = 0; while (j < m_PlayersNearPoint[i].Count) { Player player = Global.ObjAccessor.FindPlayer(m_PlayersNearPoint[i][j]); - if (!player) + if (player == null) { Log.outError(LogFilter.Battleground, "BattlegroundEY:CheckSomeoneLeftPoint Player ({0}) could not be found!", m_PlayersNearPoint[i][j].ToString()); //move non-existing players to "free space" - this will cause many errors showing in log, but it is a very important bug @@ -256,7 +256,7 @@ namespace Game.BattleGrounds.Zones for (byte i = 0; i < m_PlayersNearPoint[point].Count; ++i) { Player player = Global.ObjAccessor.FindPlayer(m_PlayersNearPoint[point][i]); - if (player) + if (player != null) { player.SendUpdateWorldState(EotSWorldStateIds.ProgressBarStatus, (uint)m_PointBarStatus[point]); Team team = GetPlayerTeam(player.GetGUID()); @@ -375,7 +375,7 @@ namespace Game.BattleGrounds.Zones { if (m_FlagKeeper == guid) { - if (player) + if (player != null) EventPlayerDroppedFlag(player); else { @@ -578,7 +578,7 @@ namespace Game.BattleGrounds.Zones RespawnFlag(true); GameObject obj = GetBgMap().GetGameObject(GetDroppedFlagGUID()); - if (obj) + if (obj != null) obj.Delete(); else Log.outError(LogFilter.Battleground, "BattlegroundEY: Unknown dropped flag ({0}).", GetDroppedFlagGUID().ToString()); @@ -764,13 +764,13 @@ namespace Game.BattleGrounds.Zones return; Creature trigger = GetBGCreature(Point + 6);//0-5 spirit guides - if (!trigger) + if (trigger == null) trigger = AddCreature(SharedConst.WorldTrigger, Point + 6, EotSMisc.TriggerPositions[Point], GetTeamIndexByTeamId(Team)); //add bonus honor aura trigger creature when node is accupied //cast bonus aura (+50% honor in 25yards) //aura should only apply to players who have accupied the node, set correct faction for trigger - if (trigger) + if (trigger != null) { trigger.SetFaction(Team == Team.Alliance ? 84u : 83); trigger.CastSpell(trigger, BattlegroundConst.SpellHonorableDefender25y, false); diff --git a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs index 3b5b1f5dc..10e777bbf 100644 --- a/Source/Game/BattleGrounds/Zones/StrandofAncients.cs +++ b/Source/Game/BattleGrounds/Zones/StrandofAncients.cs @@ -58,7 +58,7 @@ namespace Game.BattleGrounds.Zones foreach (var pair in GetPlayers()) { Player player = Global.ObjAccessor.FindPlayer(pair.Key); - if (player) + if (player != null) SendTransportsRemove(player); } @@ -77,7 +77,7 @@ namespace Game.BattleGrounds.Zones for (byte i = 0; i < GateStatus.Length; ++i) GateStatus[i] = Attackers == TeamId.Horde ? SAGateState.AllianceGateOk : SAGateState.HordeGateOk; - if (!AddCreature(SAMiscConst.NpcEntries[SACreatureTypes.Kanrethad], SACreatureTypes.Kanrethad, SAMiscConst.NpcSpawnlocs[SACreatureTypes.Kanrethad])) + if (AddCreature(SAMiscConst.NpcEntries[SACreatureTypes.Kanrethad], SACreatureTypes.Kanrethad, SAMiscConst.NpcSpawnlocs[SACreatureTypes.Kanrethad]) == null) { Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn Kanrethad, aborted. Entry: {SAMiscConst.NpcEntries[SACreatureTypes.Kanrethad]}"); return false; @@ -135,7 +135,7 @@ namespace Game.BattleGrounds.Zones //By capturing GYs. for (byte i = 0; i < SACreatureTypes.Demolisher5; i++) { - if (!AddCreature(SAMiscConst.NpcEntries[i], i, SAMiscConst.NpcSpawnlocs[i], Attackers == TeamId.Alliance ? TeamId.Horde : TeamId.Alliance, 600)) + if (AddCreature(SAMiscConst.NpcEntries[i], i, SAMiscConst.NpcSpawnlocs[i], Attackers == TeamId.Alliance ? TeamId.Horde : TeamId.Alliance, 600) == null) { Log.outError(LogFilter.Battleground, $"SOTA: couldn't spawn Cannon or demolisher, Entry: {SAMiscConst.NpcEntries[i]}, Attackers: {(Attackers == TeamId.Alliance ? "Horde(1)" : "Alliance(0)")}"); continue; @@ -252,7 +252,7 @@ namespace Game.BattleGrounds.Zones foreach (var pair in GetPlayers()) { Player player = Global.ObjAccessor.FindPlayer(pair.Key); - if (player) + if (player != null) SendTransportInit(player); } } @@ -276,15 +276,15 @@ namespace Game.BattleGrounds.Zones { foreach (var pair in GetPlayers()) { - Player p = Global.ObjAccessor.FindPlayer(pair.Key); - if (p) + Player player = Global.ObjAccessor.FindPlayer(pair.Key); + if (player != null) { - UpdateData data = new(p.GetMapId()); - GetBGObject(i).BuildValuesUpdateBlockForPlayer(data, p); + UpdateData data = new(player.GetMapId()); + GetBGObject(i).BuildValuesUpdateBlockForPlayer(data, player); UpdateObject pkt; data.BuildPacket(out pkt); - p.SendPacket(pkt); + player.SendPacket(pkt); } } } @@ -318,9 +318,9 @@ namespace Game.BattleGrounds.Zones UpdateWorldState(SAWorldStateIds.Timer, (int)(GameTime.GetGameTime() + EndRoundTimer)); if (TotalTime >= SATimers.WarmupLength) { - Creature c = GetBGCreature(SACreatureTypes.Kanrethad); - if (c) - SendChatMessage(c, SATextIds.RoundStarted); + Creature creature = GetBGCreature(SACreatureTypes.Kanrethad); + if (creature != null) + SendChatMessage(creature, SATextIds.RoundStarted); TotalTime = 0; ToggleTimer(); @@ -342,9 +342,9 @@ namespace Game.BattleGrounds.Zones UpdateWorldState(SAWorldStateIds.Timer, (int)(GameTime.GetGameTime() + EndRoundTimer)); if (TotalTime >= 60000) { - Creature c = GetBGCreature(SACreatureTypes.Kanrethad); - if (c) - SendChatMessage(c, SATextIds.RoundStarted); + Creature creature = GetBGCreature(SACreatureTypes.Kanrethad); + if (creature != null) + SendChatMessage(creature, SATextIds.RoundStarted); TotalTime = 0; ToggleTimer(); @@ -355,9 +355,9 @@ namespace Game.BattleGrounds.Zones SetStatus(BattlegroundStatus.InProgress); foreach (var pair in GetPlayers()) { - Player p = Global.ObjAccessor.FindPlayer(pair.Key); - if (p) - p.RemoveAurasDueToSpell(BattlegroundConst.SpellPreparation); + Player player = Global.ObjAccessor.FindPlayer(pair.Key); + if (player != null) + player.RemoveAurasDueToSpell(BattlegroundConst.SpellPreparation); } } if (TotalTime >= 30000) @@ -443,7 +443,7 @@ namespace Game.BattleGrounds.Zones foreach (var pair in GetPlayers()) { Player player = Global.ObjAccessor.FindPlayer(pair.Key); - if (player) + if (player != null) { // should remove spirit of redemption if (player.HasAuraType(AuraType.SpiritOfRedemption)) @@ -488,12 +488,12 @@ namespace Game.BattleGrounds.Zones public override void ProcessEvent(WorldObject obj, uint eventId, WorldObject invoker = null) { GameObject go = obj.ToGameObject(); - if (go) + if (go != null) { switch (go.GetGoType()) { case GameObjectTypes.Goober: - if (invoker) + if (invoker != null) if (eventId == (uint)SAEventIds.BG_SA_EVENT_TITAN_RELIC_ACTIVATED) TitanRelicActivated(invoker.ToPlayer()); break; @@ -509,9 +509,9 @@ namespace Game.BattleGrounds.Zones { GateStatus[gateId] = Attackers == TeamId.Horde ? SAGateState.AllianceGateDamaged : SAGateState.HordeGateDamaged; - Creature c = obj.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); - if (c) - SendChatMessage(c, (byte)gate.DamagedText, invoker); + Creature creature = obj.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); + if (creature != null) + SendChatMessage(creature, (byte)gate.DamagedText, invoker); PlaySoundToAll(Attackers == TeamId.Alliance ? SASoundIds.WallAttackedAlliance : SASoundIds.WallAttackedHorde); } @@ -523,9 +523,9 @@ namespace Game.BattleGrounds.Zones if (gateId < 5) DelObject((int)gateId + 14); - Creature c = obj.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); - if (c) - SendChatMessage(c, (byte)gate.DestroyedText, invoker); + Creature creature = obj.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); + if (creature != null) + SendChatMessage(creature, (byte)gate.DestroyedText, invoker); PlaySoundToAll(Attackers == TeamId.Alliance ? SASoundIds.WallDestroyedAlliance : SASoundIds.WallDestroyedHorde); @@ -552,13 +552,13 @@ namespace Game.BattleGrounds.Zones break; } - if (invoker) + if (invoker != null) { Unit unit = invoker.ToUnit(); - if (unit) + if (unit != null) { Player player = unit.GetCharmerOrOwnerPlayerOrPlayerItself(); - if (player) + if (player != null) { UpdatePlayerScore(player, ScoreType.DestroyedWall, 1); if (rewardHonor) @@ -605,14 +605,14 @@ namespace Game.BattleGrounds.Zones for (byte i = SACreatureTypes.Gun1; i <= SACreatureTypes.Gun10; i++) { Creature gun = GetBGCreature(i); - if (gun) + if (gun != null) gun.SetFaction(SAMiscConst.Factions[Attackers != 0 ? TeamId.Alliance : TeamId.Horde]); } for (byte i = SACreatureTypes.Demolisher1; i <= SACreatureTypes.Demolisher4; i++) { Creature dem = GetBGCreature(i); - if (dem) + if (dem != null) dem.SetFaction(SAMiscConst.Factions[Attackers]); } } @@ -626,7 +626,7 @@ namespace Game.BattleGrounds.Zones for (byte i = SACreatureTypes.Demolisher1; i <= SACreatureTypes.Demolisher4; i++) { Creature dem = GetBGCreature(i); - if (dem) + if (dem != null) { if (start) { @@ -704,7 +704,7 @@ namespace Game.BattleGrounds.Zones void UpdateObjectInteractionFlags(uint objectId) { GameObject go = GetBGObject((int)objectId); - if (go) + if (go != null) { if (CanInteractWithObject(objectId)) go.RemoveFlag(GameObjectFlags.NotSelectable); @@ -774,23 +774,23 @@ namespace Game.BattleGrounds.Zones npc = SACreatureTypes.Rigspark; Creature rigspark = AddCreature(SAMiscConst.NpcEntries[npc], (int)npc, SAMiscConst.NpcSpawnlocs[npc], Attackers); - if (rigspark) + if (rigspark != null) rigspark.GetAI().Talk(SATextIds.SparklightRigsparkSpawn); for (byte j = SACreatureTypes.Demolisher7; j <= SACreatureTypes.Demolisher8; j++) { AddCreature(SAMiscConst.NpcEntries[j], j, SAMiscConst.NpcSpawnlocs[j], (Attackers == TeamId.Alliance ? TeamId.Horde : TeamId.Alliance), 600); Creature dem = GetBGCreature(j); - if (dem) + if (dem != null) dem.SetFaction(SAMiscConst.Factions[Attackers]); } UpdateWorldState(SAWorldStateIds.LeftGyAlliance, GraveyardStatus[i] == TeamId.Alliance ? 1 : 0); UpdateWorldState(SAWorldStateIds.LeftGyHorde, GraveyardStatus[i] == TeamId.Horde ? 1 : 0); - Creature c = source.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); - if (c) - SendChatMessage(c, teamId == TeamId.Alliance ? SATextIds.WestGraveyardCapturedA : SATextIds.WestGraveyardCapturedH, source); + Creature creature = source.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); + if (creature != null) + SendChatMessage(creature, teamId == TeamId.Alliance ? SATextIds.WestGraveyardCapturedA : SATextIds.WestGraveyardCapturedH, source); } break; case SAGraveyards.RightCapturableGy: @@ -802,7 +802,7 @@ namespace Game.BattleGrounds.Zones npc = SACreatureTypes.Sparklight; Creature sparklight = AddCreature(SAMiscConst.NpcEntries[npc], (int)npc, SAMiscConst.NpcSpawnlocs[npc], Attackers); - if (sparklight) + if (sparklight != null) sparklight.GetAI().Talk(SATextIds.SparklightRigsparkSpawn); for (byte j = SACreatureTypes.Demolisher5; j <= SACreatureTypes.Demolisher6; j++) @@ -810,16 +810,16 @@ namespace Game.BattleGrounds.Zones AddCreature(SAMiscConst.NpcEntries[j], j, SAMiscConst.NpcSpawnlocs[j], Attackers == TeamId.Alliance ? TeamId.Horde : TeamId.Alliance, 600); Creature dem = GetBGCreature(j); - if (dem) + if (dem != null) dem.SetFaction(SAMiscConst.Factions[Attackers]); } UpdateWorldState(SAWorldStateIds.RightGyAlliance, GraveyardStatus[i] == TeamId.Alliance ? 1 : 0); UpdateWorldState(SAWorldStateIds.RightGyHorde, GraveyardStatus[i] == TeamId.Horde ? 1 : 0); - Creature c = source.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); - if (c) - SendChatMessage(c, teamId == TeamId.Alliance ? SATextIds.EastGraveyardCapturedA : SATextIds.EastGraveyardCapturedH, source); + Creature creature = source.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); + if (creature != null) + SendChatMessage(creature, teamId == TeamId.Alliance ? SATextIds.EastGraveyardCapturedA : SATextIds.EastGraveyardCapturedH, source); } break; case SAGraveyards.CentralCapturableGy: @@ -832,9 +832,9 @@ namespace Game.BattleGrounds.Zones UpdateWorldState(SAWorldStateIds.CenterGyAlliance, GraveyardStatus[i] == TeamId.Alliance ? 1 : 0); UpdateWorldState(SAWorldStateIds.CenterGyHorde, GraveyardStatus[i] == TeamId.Horde ? 1 : 0); - Creature c = source.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); - if (c) - SendChatMessage(c, teamId == TeamId.Alliance ? SATextIds.SouthGraveyardCapturedA : SATextIds.SouthGraveyardCapturedH, source); + Creature creature = source.FindNearestCreature(SharedConst.WorldTrigger, 500.0f); + if (creature != null) + SendChatMessage(creature, teamId == TeamId.Alliance ? SATextIds.SouthGraveyardCapturedA : SATextIds.SouthGraveyardCapturedH, source); } break; default: @@ -845,7 +845,7 @@ namespace Game.BattleGrounds.Zones void TitanRelicActivated(Player clicker) { - if (!clicker) + if (clicker == null) return; if (CanInteractWithObject(SAObjectTypes.TitanRelic)) @@ -866,7 +866,7 @@ namespace Game.BattleGrounds.Zones foreach (var pair in GetPlayers()) { Player player = Global.ObjAccessor.FindPlayer(pair.Key); - if (player) + if (player != null) if (GetTeamIndexByTeamId(GetPlayerTeam(player.GetGUID())) == Attackers) player.UpdateCriteria(CriteriaType.BeSpellTarget, 65246); } @@ -876,9 +876,9 @@ namespace Game.BattleGrounds.Zones TotalTime = 0; ToggleTimer(); - Creature c = GetBGCreature(SACreatureTypes.Kanrethad); - if (c) - SendChatMessage(c, SATextIds.Round1Finished); + Creature creature = GetBGCreature(SACreatureTypes.Kanrethad); + if (creature != null) + SendChatMessage(creature, SATextIds.Round1Finished); UpdateWaitTimer = 5000; SignaledRoundTwo = false; @@ -898,7 +898,7 @@ namespace Game.BattleGrounds.Zones foreach (var pair in GetPlayers()) { Player player = Global.ObjAccessor.FindPlayer(pair.Key); - if (player) + if (player != null) if (GetTeamIndexByTeamId(GetPlayerTeam(player.GetGUID())) == Attackers && RoundScores[1].winner == Attackers) player.UpdateCriteria(CriteriaType.BeSpellTarget, 65246); } @@ -941,10 +941,10 @@ namespace Game.BattleGrounds.Zones { if (!BgCreatures[i].IsEmpty()) { - Creature Demolisher = GetBGCreature(i); - if (Demolisher) + Creature demolisher = GetBGCreature(i); + if (demolisher != null) { - if (Demolisher.IsDead()) + if (demolisher.IsDead()) { // Demolisher is not in list if (!DemoliserRespawnList.ContainsKey(i)) @@ -955,8 +955,8 @@ namespace Game.BattleGrounds.Zones { if (DemoliserRespawnList[i] < GameTime.GetGameTimeMS()) { - Demolisher.Relocate(SAMiscConst.NpcSpawnlocs[i]); - Demolisher.Respawn(); + demolisher.Relocate(SAMiscConst.NpcSpawnlocs[i]); + demolisher.Respawn(); DemoliserRespawnList.Remove(i); } } diff --git a/Source/Game/BattleGrounds/Zones/WarsongGluch.cs b/Source/Game/BattleGrounds/Zones/WarsongGluch.cs index 33d6cb1ec..505aef043 100644 --- a/Source/Game/BattleGrounds/Zones/WarsongGluch.cs +++ b/Source/Game/BattleGrounds/Zones/WarsongGluch.cs @@ -97,11 +97,11 @@ namespace Game.BattleGrounds.Zones { // Apply Stage 1 (Focused Assault) Player player = Global.ObjAccessor.FindPlayer(m_FlagKeepers[0]); - if (player) + if (player != null) player.CastSpell(player, WSGSpellId.FocusedAssault, true); player = Global.ObjAccessor.FindPlayer(m_FlagKeepers[1]); - if (player) + if (player != null) player.CastSpell(player, WSGSpellId.FocusedAssault, true); _flagDebuffState = 1; @@ -110,14 +110,14 @@ namespace Game.BattleGrounds.Zones { // Apply Stage 2 (Brutal Assault) Player player = Global.ObjAccessor.FindPlayer(m_FlagKeepers[0]); - if (player) + if (player != null) { player.RemoveAurasDueToSpell(WSGSpellId.FocusedAssault); player.CastSpell(player, WSGSpellId.BrutalAssault, true); } player = Global.ObjAccessor.FindPlayer(m_FlagKeepers[1]); - if (player) + if (player != null) { player.RemoveAurasDueToSpell(WSGSpellId.FocusedAssault); player.CastSpell(player, WSGSpellId.BrutalAssault, true); @@ -132,14 +132,14 @@ namespace Game.BattleGrounds.Zones // Remove assault debuffs, reset timers Player player = Global.ObjAccessor.FindPlayer(m_FlagKeepers[0]); - if (player) + if (player != null) { player.RemoveAurasDueToSpell(WSGSpellId.FocusedAssault); player.RemoveAurasDueToSpell(WSGSpellId.BrutalAssault); } player = Global.ObjAccessor.FindPlayer(m_FlagKeepers[1]); - if (player) + if (player != null) { player.RemoveAurasDueToSpell(WSGSpellId.FocusedAssault); player.RemoveAurasDueToSpell(WSGSpellId.BrutalAssault); @@ -231,7 +231,7 @@ namespace Game.BattleGrounds.Zones PlaySoundToAll(WSGSound.FlagsRespawned); GameObject obj = GetBgMap().GetGameObject(GetDroppedFlagGUID(team)); - if (obj) + if (obj != null) obj.Delete(); else Log.outError(LogFilter.Battleground, "unknown droped flag ({0})", GetDroppedFlagGUID(team).ToString()); @@ -547,7 +547,7 @@ namespace Game.BattleGrounds.Zones // sometimes flag aura not removed :( if (IsAllianceFlagPickedup() && m_FlagKeepers[TeamId.Alliance] == guid) { - if (!player) + if (player == null) { Log.outError(LogFilter.Battleground, "BattlegroundWS: Removing offline player who has the FLAG!!"); SetAllianceFlagPicker(ObjectGuid.Empty); @@ -558,7 +558,7 @@ namespace Game.BattleGrounds.Zones } if (IsHordeFlagPickedup() && m_FlagKeepers[TeamId.Horde] == guid) { - if (!player) + if (player == null) { Log.outError(LogFilter.Battleground, "BattlegroundWS: Removing offline player who has the FLAG!!"); SetHordeFlagPicker(ObjectGuid.Empty); diff --git a/Source/Game/BattlePets/BattlePetManager.cs b/Source/Game/BattlePets/BattlePetManager.cs index 45b184222..d020d9c38 100644 --- a/Source/Game/BattlePets/BattlePetManager.cs +++ b/Source/Game/BattlePets/BattlePetManager.cs @@ -573,7 +573,7 @@ namespace Game.BattlePets return; Item item = _owner.GetPlayer().StoreNewItem(dest, SharedConst.BattlePetCageItemId, true); - if (!item) + if (item == null) return; item.SetModifier(ItemModifier.BattlePetSpeciesId, pet.PacketInfo.Species); @@ -808,7 +808,7 @@ namespace Game.BattlePets { Player player = _owner.GetPlayer(); Creature summonedBattlePet = player.GetSummonedBattlePet(); - if (summonedBattlePet) + if (summonedBattlePet != null) { summonedBattlePet.DespawnOrUnsummon(); player.SetBattlePetData(null); diff --git a/Source/Game/BlackMarket/BlackMarketManager.cs b/Source/Game/BlackMarket/BlackMarketManager.cs index 0fc554fa9..f0d7d31a7 100644 --- a/Source/Game/BlackMarket/BlackMarketManager.cs +++ b/Source/Game/BlackMarket/BlackMarketManager.cs @@ -206,7 +206,7 @@ namespace Game.BlackMarket string bidderName = ""; bool logGmTrade; - if (bidder) + if (bidder != null) { bidderAccId = bidder.GetSession().GetAccountId(); bidderName = bidder.GetName(); @@ -227,7 +227,7 @@ namespace Game.BlackMarket // Create item BlackMarketTemplate templ = entry.GetTemplate(); Item item = Item.CreateItem(templ.Item.ItemID, templ.Quantity, ItemContext.BlackMarket); - if (!item) + if (item == null) return; if (templ.Item.ItemBonus != null) @@ -245,7 +245,7 @@ namespace Game.BlackMarket Log.outCommand(bidderAccId, "GM {0} (Account: {1}) won item in blackmarket auction: {2} (Entry: {3} Count: {4}) and payed gold : {5}.", bidderName, bidderAccId, item.GetTemplate().GetName(), item.GetEntry(), item.GetCount(), entry.GetCurrentBid() / MoneyConstants.Gold); - if (bidder) + if (bidder != null) bidder.GetSession().SendBlackMarketWonNotification(entry, item); new MailDraft(entry.BuildAuctionMailSubject(BMAHMailAuctionAnswers.Won), entry.BuildAuctionMailBody()) @@ -261,14 +261,14 @@ namespace Game.BlackMarket Player oldBidder = Global.ObjAccessor.FindConnectedPlayer(oldBidder_guid); uint oldBidder_accId = 0; - if (!oldBidder) + if (oldBidder == null) oldBidder_accId = Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(oldBidder_guid); // old bidder exist - if (!oldBidder && oldBidder_accId == 0) + if (oldBidder == null && oldBidder_accId == 0) return; - if (oldBidder) + if (oldBidder != null) oldBidder.GetSession().SendBlackMarketOutbidNotification(entry.GetTemplate()); new MailDraft(entry.BuildAuctionMailSubject(BMAHMailAuctionAnswers.Outbid), entry.BuildAuctionMailBody()) diff --git a/Source/Game/Calendar/CalendarManager.cs b/Source/Game/Calendar/CalendarManager.cs index 0395f42c6..8ae979a5f 100644 --- a/Source/Game/Calendar/CalendarManager.cs +++ b/Source/Game/Calendar/CalendarManager.cs @@ -434,7 +434,7 @@ namespace Game ObjectGuid invitee = invite.InviteeGuid; Player player = Global.ObjAccessor.FindPlayer(invitee); - uint level = player ? player.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(invitee); + uint level = player != null ? player.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(invitee); CalendarInviteAdded packet = new(); packet.EventID = calendarEvent != null ? calendarEvent.EventId : 0; @@ -449,7 +449,7 @@ namespace Game if (calendarEvent == null) // Pre-invite { player = Global.ObjAccessor.FindPlayer(invite.SenderGuid); - if (player) + if (player != null) player.SendPacket(packet); } else @@ -538,18 +538,18 @@ namespace Game packet.TextureID = calendarEvent.TextureId; Guild guild = Global.GuildMgr.GetGuildById(calendarEvent.GuildId); - packet.EventGuildID = guild ? guild.GetGUID() : ObjectGuid.Empty; + packet.EventGuildID = guild != null ? guild.GetGUID() : ObjectGuid.Empty; if (calendarEvent.IsGuildEvent() || calendarEvent.IsGuildAnnouncement()) { guild = Global.GuildMgr.GetGuildById(calendarEvent.GuildId); - if (guild) + if (guild != null) guild.BroadcastPacket(packet); } else { Player player = Global.ObjAccessor.FindPlayer(invite.InviteeGuid); - if (player) + if (player != null) player.SendPacket(packet); } } @@ -557,7 +557,7 @@ namespace Game public void SendCalendarEvent(ObjectGuid guid, CalendarEvent calendarEvent, CalendarSendEventType sendType) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (!player) + if (player == null) return; List eventInviteeList = _invites[calendarEvent.EventId]; @@ -575,15 +575,15 @@ namespace Game packet.TextureID = calendarEvent.TextureId; Guild guild = Global.GuildMgr.GetGuildById(calendarEvent.GuildId); - packet.EventGuildID = (guild ? guild.GetGUID() : ObjectGuid.Empty); + packet.EventGuildID = (guild != null ? guild.GetGUID() : ObjectGuid.Empty); foreach (var calendarInvite in eventInviteeList) { ObjectGuid inviteeGuid = calendarInvite.InviteeGuid; Player invitee = Global.ObjAccessor.FindPlayer(inviteeGuid); - uint inviteeLevel = invitee ? invitee.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(inviteeGuid); - ulong inviteeGuildId = invitee ? invitee.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(inviteeGuid); + uint inviteeLevel = invitee != null ? invitee.GetLevel() : Global.CharacterCacheStorage.GetCharacterLevelByGuid(inviteeGuid); + ulong inviteeGuildId = invitee != null ? invitee.GetGuildId() : Global.CharacterCacheStorage.GetCharacterGuildIdByGuid(inviteeGuid); CalendarEventInviteInfo inviteInfo = new(); inviteInfo.Guid = inviteeGuid; @@ -604,7 +604,7 @@ namespace Game void SendCalendarEventInviteRemoveAlert(ObjectGuid guid, CalendarEvent calendarEvent, CalendarInviteStatus status) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { CalendarInviteRemovedAlert packet = new(); packet.Date = calendarEvent.Date; @@ -619,14 +619,14 @@ namespace Game public void SendCalendarClearPendingAction(ObjectGuid guid) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendPacket(new CalendarClearPendingAction()); } public void SendCalendarCommandResult(ObjectGuid guid, CalendarError err, string param = null) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { CalendarCommandResult packet = new(); packet.Command = 1; // FIXME @@ -651,7 +651,7 @@ namespace Game if (calendarEvent.IsGuildEvent() || calendarEvent.IsGuildAnnouncement()) { Guild guild = Global.GuildMgr.GetGuildById(calendarEvent.GuildId); - if (guild) + if (guild != null) guild.BroadcastPacket(packet); } @@ -660,7 +660,7 @@ namespace Game foreach (var playerCalendarEvent in invites) { Player player = Global.ObjAccessor.FindPlayer(playerCalendarEvent.InviteeGuid); - if (player) + if (player != null) if (!calendarEvent.IsGuildEvent() || player.GetGuildId() != calendarEvent.GuildId) player.SendPacket(packet); } diff --git a/Source/Game/Chat/Channels/Channel.cs b/Source/Game/Chat/Channels/Channel.cs index e6158ff5f..baf98fb63 100644 --- a/Source/Game/Chat/Channels/Channel.cs +++ b/Source/Game/Chat/Channels/Channel.cs @@ -151,7 +151,7 @@ namespace Game.Chat if (HasFlag(ChannelFlags.Lfg) && WorldConfig.GetBoolValue(WorldCfg.RestrictedLfgChannel) && Global.AccountMgr.IsPlayerAccount(player.GetSession().GetSecurity()) && //FIXME: Move to RBAC - player.GetGroup()) + player.GetGroup() != null) { var builder = new ChannelNameBuilder(this, new NotInLFGAppend()); SendToOne(builder, guid); @@ -285,9 +285,9 @@ namespace Game.Chat return; } - Player bad = Global.ObjAccessor.FindPlayerByName(badname); - ObjectGuid victim = bad ? bad.GetGUID() : ObjectGuid.Empty; - if (bad == null || victim.IsEmpty() || !IsOn(victim)) + Player badPlayer = Global.ObjAccessor.FindPlayerByName(badname); + ObjectGuid victim = badPlayer != null ? badPlayer.GetGUID() : ObjectGuid.Empty; + if (badPlayer == null || victim.IsEmpty() || !IsOn(victim)) { ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(badname)); SendToOne(builder, good); @@ -322,7 +322,7 @@ namespace Game.Chat } _playersStore.Remove(victim); - bad.LeftChannel(this); + badPlayer.LeftChannel(this); if (changeowner && _ownershipEnabled && !_playersStore.Empty()) { @@ -350,8 +350,8 @@ namespace Game.Chat return; } - Player bad = Global.ObjAccessor.FindPlayerByName(badname); - ObjectGuid victim = bad ? bad.GetGUID() : ObjectGuid.Empty; + Player badPlayer = Global.ObjAccessor.FindPlayerByName(badname); + ObjectGuid victim = badPlayer != null ? badPlayer.GetGUID() : ObjectGuid.Empty; if (victim.IsEmpty() || !IsBanned(victim)) { @@ -417,13 +417,13 @@ namespace Game.Chat if (guid == _ownerGuid && p2n == player.GetName() && mod) return; - Player newp = Global.ObjAccessor.FindPlayerByName(p2n); - ObjectGuid victim = newp ? newp.GetGUID() : ObjectGuid.Empty; + Player newPlayer = Global.ObjAccessor.FindPlayerByName(p2n); + ObjectGuid victim = newPlayer != null ? newPlayer.GetGUID() : ObjectGuid.Empty; - if (newp == null || victim.IsEmpty() || !IsOn(victim) || - (player.GetTeam() != newp.GetTeam() && + if (newPlayer == null || victim.IsEmpty() || !IsOn(victim) || + (player.GetTeam() != newPlayer.GetTeam() && (!player.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel) || - !newp.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel)))) + !newPlayer.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel)))) { ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(p2n)); SendToOne(builder, guid); @@ -438,9 +438,9 @@ namespace Game.Chat } if (mod) - SetModerator(newp.GetGUID(), set); + SetModerator(newPlayer.GetGUID(), set); else - SetMute(newp.GetGUID(), set); + SetMute(newPlayer.GetGUID(), set); } public void SetInvisible(Player player, bool on) @@ -473,13 +473,13 @@ namespace Game.Chat return; } - Player newp = Global.ObjAccessor.FindPlayerByName(newname); - ObjectGuid victim = newp ? newp.GetGUID() : ObjectGuid.Empty; + Player newPlayer = Global.ObjAccessor.FindPlayerByName(newname); + ObjectGuid victim = newPlayer != null ? newPlayer.GetGUID() : ObjectGuid.Empty; - if (newp == null || victim.IsEmpty() || !IsOn(victim) || - (player.GetTeam() != newp.GetTeam() && + if (newPlayer == null || victim.IsEmpty() || !IsOn(victim) || + (player.GetTeam() != newPlayer.GetTeam() && (!player.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel) || - !newp.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel)))) + !newPlayer.GetSession().HasPermission(RBACPermissions.TwoSideInteractionChannel)))) { ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(newname)); SendToOne(builder, guid); @@ -532,7 +532,7 @@ namespace Game.Chat // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters // MODERATOR, GAME MASTER, ADMINISTRATOR can see all - if (member && (player.GetSession().HasPermission(RBACPermissions.WhoSeeAllSecLevels) || + if (member != null && (player.GetSession().HasPermission(RBACPermissions.WhoSeeAllSecLevels) || member.GetSession().GetSecurity() <= (AccountTypes)gmLevelInWhoList) && member.IsVisibleGloballyFor(player)) { @@ -603,7 +603,7 @@ namespace Game.Chat } Player player = Global.ObjAccessor.FindConnectedPlayer(guid); - SendToAll(new ChannelSayBuilder(this, lang, what, guid, _channelGuid), !playerInfo.IsModerator() ? guid : ObjectGuid.Empty, !playerInfo.IsModerator() && player ? player.GetSession().GetAccountGUID() : ObjectGuid.Empty); + SendToAll(new ChannelSayBuilder(this, lang, what, guid, _channelGuid), !playerInfo.IsModerator() ? guid : ObjectGuid.Empty, !playerInfo.IsModerator() && player != null ? player.GetSession().GetAccountGUID() : ObjectGuid.Empty); } public void AddonSay(ObjectGuid guid, string prefix, string what, bool isLogged) @@ -630,7 +630,7 @@ namespace Game.Chat Player player = Global.ObjAccessor.FindConnectedPlayer(guid); SendToAllWithAddon(new ChannelWhisperBuilder(this, isLogged ? Language.AddonLogged : Language.Addon, what, prefix, guid), prefix, !playerInfo.IsModerator() ? guid : ObjectGuid.Empty, - !playerInfo.IsModerator() && player ? player.GetSession().GetAccountGUID() : ObjectGuid.Empty); + !playerInfo.IsModerator() && player != null ? player.GetSession().GetAccountGUID() : ObjectGuid.Empty); } public void Invite(Player player, string newname) @@ -645,7 +645,7 @@ namespace Game.Chat } Player newp = Global.ObjAccessor.FindPlayerByName(newname); - if (!newp || !newp.IsGMVisible()) + if (newp == null || !newp.IsGMVisible()) { ChannelNameBuilder builder = new(this, new PlayerNotFoundAppend(newname)); SendToOne(builder, guid); @@ -786,7 +786,7 @@ namespace Game.Chat foreach (var pair in _playersStore) { Player player = Global.ObjAccessor.FindConnectedPlayer(pair.Key); - if (player) + if (player != null) if (guid.IsEmpty() || !player.GetSocial().HasIgnore(guid, accountGuid)) localizer.Invoke(player); } @@ -801,7 +801,7 @@ namespace Game.Chat if (pair.Key != who) { Player player = Global.ObjAccessor.FindConnectedPlayer(pair.Key); - if (player) + if (player != null) localizer.Invoke(player); } } @@ -812,7 +812,7 @@ namespace Game.Chat LocalizedDo localizer = new(builder); Player player = Global.ObjAccessor.FindConnectedPlayer(who); - if (player) + if (player != null) localizer.Invoke(player); } @@ -823,7 +823,7 @@ namespace Game.Chat foreach (var pair in _playersStore) { Player player = Global.ObjAccessor.FindConnectedPlayer(pair.Key); - if (player) + if (player != null) if (player.GetSession().IsAddonRegistered(addonPrefix) && (guid.IsEmpty() || !player.GetSocial().HasIgnore(guid, accountGuid))) localizer.Invoke(player); } diff --git a/Source/Game/Chat/Channels/ChannelAppenders.cs b/Source/Game/Chat/Channels/ChannelAppenders.cs index da83f4cd1..6bac0012d 100644 --- a/Source/Game/Chat/Channels/ChannelAppenders.cs +++ b/Source/Game/Chat/Channels/ChannelAppenders.cs @@ -105,7 +105,7 @@ namespace Game.Chat PacketSenderOwning packet = new(); Player player = Global.ObjAccessor.FindConnectedPlayer(_guid); - if (player) + if (player != null) packet.Data.Initialize(ChatMsg.Channel, _lang, player, player, _what, 0, _source.GetName(localeIdx)); else { @@ -143,7 +143,7 @@ namespace Game.Chat PacketSenderOwning packet = new(); Player player = Global.ObjAccessor.FindConnectedPlayer(_guid); - if (player) + if (player != null) packet.Data.Initialize(ChatMsg.Channel, _lang, player, player, _what, 0, _source.GetName(localeIdx), Locale.enUS, _prefix); else { diff --git a/Source/Game/Chat/CommandHandler.cs b/Source/Game/Chat/CommandHandler.cs index ee4875cac..acd16792b 100644 --- a/Source/Game/Chat/CommandHandler.cs +++ b/Source/Game/Chat/CommandHandler.cs @@ -218,7 +218,7 @@ namespace Game.Chat return 0; Player player = Global.ObjAccessor.FindPlayerByName(idS); - if (player) + if (player != null) return player.GetGUID().GetCounter(); ObjectGuid guid = Global.CharacterCacheStorage.GetCharacterGuidByName(idS); @@ -320,7 +320,7 @@ namespace Game.Chat return null; Unit selected = _session.GetPlayer().GetSelectedUnit(); - if (selected) + if (selected != null) return selected; return _session.GetPlayer(); @@ -356,7 +356,7 @@ namespace Game.Chat // first try with selected target Player targetPlayer = Global.ObjAccessor.FindConnectedPlayer(selected); // if the target is not a player, then return self - if (!targetPlayer) + if (targetPlayer == null) targetPlayer = _session.GetPlayer(); return targetPlayer; @@ -376,7 +376,7 @@ namespace Game.Chat public Creature GetCreatureFromPlayerMapByDbGuid(ulong lowguid) { - if (!_session) + if (_session == null) return null; // Select the first alive creature or a dead one if not found @@ -586,7 +586,7 @@ namespace Game.Chat guid = Global.CharacterCacheStorage.GetCharacterGuidByName(name); } - if (player) + if (player != null) { group = player.GetGroup(); if (guid.IsEmpty() || !offline) @@ -594,7 +594,7 @@ namespace Game.Chat } else { - if (GetSelectedPlayer()) + if (GetSelectedPlayer() != null) player = GetSelectedPlayer(); else player = _session.GetPlayer(); diff --git a/Source/Game/Chat/CommandManager.cs b/Source/Game/Chat/CommandManager.cs index 9463ada09..5253b4756 100644 --- a/Source/Game/Chat/CommandManager.cs +++ b/Source/Game/Chat/CommandManager.cs @@ -337,8 +337,8 @@ namespace Game.Chat } Log.outCommand(session.GetAccountId(), $"Command: {cmdStr} [Player: {player.GetName()} ({player.GetGUID()}) (Account: {session.GetAccountId()}) " + - $"X: {player.GetPositionX()} Y: {player.GetPositionY()} Z: {player.GetPositionZ()} Map: {player.GetMapId()} ({(player.GetMap() ? player.GetMap().GetMapName() : "Unknown")}) " + - $"Area: {areaId} ({areaName}) Zone: {zoneName} Selected: {(player.GetSelectedUnit() ? player.GetSelectedUnit().GetName() : "")} ({targetGuid})]"); + $"X: {player.GetPositionX()} Y: {player.GetPositionY()} Z: {player.GetPositionZ()} Map: {player.GetMapId()} ({(player.GetMap() != null ? player.GetMap().GetMapName() : "Unknown")}) " + + $"Area: {areaId} ({areaName}) Zone: {zoneName} Selected: {(player.GetSelectedUnit() != null ? player.GetSelectedUnit().GetName() : "")} ({targetGuid})]"); } public void SendCommandHelp(CommandHandler handler) diff --git a/Source/Game/Chat/Commands/AccountCommands.cs b/Source/Game/Chat/Commands/AccountCommands.cs index ba6aee733..3c9ba002e 100644 --- a/Source/Game/Chat/Commands/AccountCommands.cs +++ b/Source/Game/Chat/Commands/AccountCommands.cs @@ -623,7 +623,7 @@ namespace Game.Chat else { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) return false; accountId = player.GetSession().GetAccountId(); @@ -708,7 +708,7 @@ namespace Game.Chat else { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) return false; accountId = player.GetSession().GetAccountId(); diff --git a/Source/Game/Chat/Commands/AchievementCommands.cs b/Source/Game/Chat/Commands/AchievementCommands.cs index 57f7ff78d..d3472716a 100644 --- a/Source/Game/Chat/Commands/AchievementCommands.cs +++ b/Source/Game/Chat/Commands/AchievementCommands.cs @@ -16,7 +16,7 @@ namespace Game.Chat.Commands static bool HandleAchievementAddCommand(CommandHandler handler, AchievementRecord achievementEntry) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; diff --git a/Source/Game/Chat/Commands/BanCommands.cs b/Source/Game/Chat/Commands/BanCommands.cs index e34235081..505877164 100644 --- a/Source/Game/Chat/Commands/BanCommands.cs +++ b/Source/Game/Chat/Commands/BanCommands.cs @@ -105,7 +105,7 @@ namespace Game.Chat.Commands break; } - string author = handler.GetSession() ? handler.GetSession().GetPlayerName() : "Server"; + string author = handler.GetSession() != null ? handler.GetSession().GetPlayerName() : "Server"; switch (Global.WorldMgr.BanAccount(mode, nameOrIP, duration, reason, author)) { case BanReturn.Success: @@ -180,7 +180,7 @@ namespace Game.Chat.Commands Player target = Global.ObjAccessor.FindPlayerByName(name); ObjectGuid targetGuid; - if (!target) + if (target == null) { targetGuid = Global.CharacterCacheStorage.GetCharacterGuidByName(name); if (targetGuid.IsEmpty()) @@ -314,7 +314,7 @@ namespace Game.Chat.Commands handler.SendSysMessage(CypherStrings.BanlistMatchingcharacter); // Chat short output - if (handler.GetSession()) + if (handler.GetSession() != null) { do { @@ -405,7 +405,7 @@ namespace Game.Chat.Commands handler.SendSysMessage(CypherStrings.BanlistMatchingip); // Chat short output - if (handler.GetSession()) + if (handler.GetSession() != null) { do { @@ -458,7 +458,7 @@ namespace Game.Chat.Commands handler.SendSysMessage(CypherStrings.BanlistMatchingaccount); // Chat short output - if (handler.GetSession()) + if (handler.GetSession() != null) { do { diff --git a/Source/Game/Chat/Commands/CastCommands.cs b/Source/Game/Chat/Commands/CastCommands.cs index a111bbe96..a8319c738 100644 --- a/Source/Game/Chat/Commands/CastCommands.cs +++ b/Source/Game/Chat/Commands/CastCommands.cs @@ -16,7 +16,7 @@ namespace Game.Chat static bool HandleCastCommand(CommandHandler handler, uint spellId, [OptionalArg] string triggeredStr) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; @@ -37,7 +37,7 @@ namespace Game.Chat static bool HandleCastBackCommand(CommandHandler handler, uint spellId, [OptionalArg] string triggeredStr) { Creature caster = handler.GetSelectedCreature(); - if (!caster) + if (caster == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; @@ -77,7 +77,7 @@ namespace Game.Chat static bool HandleCastSelfCommand(CommandHandler handler, uint spellId, [OptionalArg] string triggeredStr) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; @@ -99,13 +99,13 @@ namespace Game.Chat static bool HandleCastTargetCommad(CommandHandler handler, uint spellId, [OptionalArg] string triggeredStr) { Creature caster = handler.GetSelectedCreature(); - if (!caster) + if (caster == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; } - if (!caster.GetVictim()) + if (caster.GetVictim() == null) { handler.SendSysMessage(CypherStrings.SelectedTargetNotHaveVictim); return false; @@ -127,7 +127,7 @@ namespace Game.Chat static bool HandleCastDestCommand(CommandHandler handler, uint spellId, float x, float y, float z, [OptionalArg] string triggeredStr) { Unit caster = handler.GetSelectedUnit(); - if (!caster) + if (caster == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; diff --git a/Source/Game/Chat/Commands/CharacterCommands.cs b/Source/Game/Chat/Commands/CharacterCommands.cs index c5d6d7803..516d2382f 100644 --- a/Source/Game/Chat/Commands/CharacterCommands.cs +++ b/Source/Game/Chat/Commands/CharacterCommands.cs @@ -138,7 +138,7 @@ namespace Game.Chat if (session != null) { Player sessionPlayer = session.GetPlayer(); - if (sessionPlayer) + if (sessionPlayer != null) Log.outCommand(session.GetAccountId(), "GM {0} (Account: {1}) forced rename {2} to player {3} (Account: {4})", sessionPlayer.GetName(), session.GetAccountId(), newName, sessionPlayer.GetName(), Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(sessionPlayer.GetGUID())); } else @@ -212,7 +212,7 @@ namespace Game.Chat DB.Characters.Execute(stmt); } - if (!handler.GetSession() || (handler.GetSession().GetPlayer() != player.GetConnectedPlayer())) // including chr == NULL + if (handler.GetSession() == null || (handler.GetSession().GetPlayer() != player.GetConnectedPlayer())) // including chr == NULL handler.SendSysMessage(CypherStrings.YouChangeLvl, handler.PlayerLink(player.GetName()), newlevel); return true; @@ -602,7 +602,7 @@ namespace Game.Chat { string dateStr = Time.UnixTimeToDateTime(info.deleteDate).ToShortDateString(); - if (!handler.GetSession()) + if (handler.GetSession() == null) handler.SendSysMessage(CypherStrings.CharacterDeletedListLineConsole, info.guid.ToString(), info.name, info.accountName.IsEmpty() ? "" : info.accountName, info.accountId, dateStr); @@ -612,7 +612,7 @@ namespace Game.Chat info.accountId, dateStr); } - if (!handler.GetSession()) + if (handler.GetSession() == null) handler.SendSysMessage(CypherStrings.CharacterDeletedListBar); } diff --git a/Source/Game/Chat/Commands/CheatCommands.cs b/Source/Game/Chat/Commands/CheatCommands.cs index 9ecb65aaf..99182218b 100644 --- a/Source/Game/Chat/Commands/CheatCommands.cs +++ b/Source/Game/Chat/Commands/CheatCommands.cs @@ -56,7 +56,7 @@ namespace Game.Chat.Commands static bool HandleExploreCheatCommand(CommandHandler handler, bool reveal) { Player chr = handler.GetSelectedPlayer(); - if (!chr) + if (chr == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -155,7 +155,7 @@ namespace Game.Chat.Commands static bool HandleTaxiCheatCommand(CommandHandler handler, bool? enableArg) { Player chr = handler.GetSelectedPlayer(); - if (!chr) + if (chr == null) chr = handler.GetSession().GetPlayer(); else if (handler.HasLowerSecurity(chr, ObjectGuid.Empty)) // check online security return false; diff --git a/Source/Game/Chat/Commands/DebugCommands.cs b/Source/Game/Chat/Commands/DebugCommands.cs index 6fd61a5c5..cab8d032a 100644 --- a/Source/Game/Chat/Commands/DebugCommands.cs +++ b/Source/Game/Chat/Commands/DebugCommands.cs @@ -25,7 +25,7 @@ namespace Game.Chat static bool HandleDebugAnimCommand(CommandHandler handler, Emote emote) { Unit unit = handler.GetSelectedUnit(); - if (unit) + if (unit != null) unit.HandleEmoteCommand(emote); handler.SendSysMessage($"Playing emote {emote}"); @@ -68,11 +68,11 @@ namespace Game.Chat static bool HandleDebugBoundaryCommand(CommandHandler handler, string fill, uint durationArg) { Player player = handler.GetPlayer(); - if (!player) + if (player == null) return false; Creature target = handler.GetSelectedCreature(); - if (!target || !target.IsAIEnabled()) + if (target == null || !target.IsAIEnabled()) return false; TimeSpan duration = durationArg != 0 ? TimeSpan.FromSeconds(durationArg) : TimeSpan.Zero; @@ -90,7 +90,7 @@ namespace Game.Chat static bool HandleDebugCombatListCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) target = handler.GetPlayer(); handler.SendSysMessage($"Combat refs: (Combat state: {target.IsInCombat()} | Manager state: {target.GetCombatManager().HasCombat()})"); @@ -112,7 +112,7 @@ namespace Game.Chat static bool HandleDebugConversationCommand(CommandHandler handler, uint conversationEntry) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -132,7 +132,7 @@ namespace Game.Chat static bool HandleDebugEnterVehicleCommand(CommandHandler handler, uint entry, sbyte seatId = -1) { Unit target = handler.GetSelectedUnit(); - if (!target || !target.IsVehicle()) + if (target == null || !target.IsVehicle()) return false; if (entry == 0) @@ -143,7 +143,7 @@ namespace Game.Chat var searcher = new CreatureSearcher(handler.GetPlayer(), check); Cell.VisitAllObjects(handler.GetPlayer(), searcher, 30.0f); var passenger = searcher.GetTarget(); - if (!passenger || passenger == target) + if (passenger == null || passenger == target) return false; passenger.EnterVehicle(target, seatId); } @@ -175,7 +175,7 @@ namespace Game.Chat return false; Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) player = handler.GetPlayer(); if (!listQueue && !checkAll) @@ -188,15 +188,15 @@ namespace Game.Chat continue; Item item = player.GetItemByPos(InventorySlots.Bag0, i); - if (item) + if (item != null) { Bag bag = item.ToBag(); - if (bag) + if (bag != null) { for (byte j = 0; j < bag.GetBagSize(); ++j) { Item item2 = bag.GetItemByPos(j); - if (item2) + if (item2 != null) if (item2.GetState() == state) handler.SendSysMessage("bag: 255 slot: {0} guid: {1} owner: {2}", item2.GetSlot(), item2.GetGUID().ToString(), item2.GetOwnerGUID().ToString()); } @@ -213,11 +213,11 @@ namespace Game.Chat for (int i = 0; i < updateQueue.Count; ++i) { Item item = updateQueue[i]; - if (!item) + if (item == null) continue; Bag container = item.GetContainer(); - byte bagSlot = container ? container.GetSlot() : InventorySlots.Bag0; + byte bagSlot = container != null ? container.GetSlot() : InventorySlots.Bag0; string st = ""; switch (item.GetState()) @@ -252,7 +252,7 @@ namespace Game.Chat continue; Item item = player.GetItemByPos(InventorySlots.Bag0, i); - if (!item) + if (item == null) continue; if (item.GetSlot() != i) @@ -270,7 +270,7 @@ namespace Game.Chat } Bag container = item.GetContainer(); - if (container) + if (container != null) { handler.SendSysMessage("The item with slot {0} and guid {1} has a container (slot: {2}, guid: {3}) but shouldn't!", item.GetSlot(), item.GetGUID().ToString(), container.GetSlot(), container.GetGUID().ToString()); error = true; @@ -309,12 +309,12 @@ namespace Game.Chat } Bag bag = item.ToBag(); - if (bag) + if (bag != null) { for (byte j = 0; j < bag.GetBagSize(); ++j) { Item item2 = bag.GetItemByPos(j); - if (!item2) + if (item2 == null) continue; if (item2.GetSlot() != j) @@ -332,7 +332,7 @@ namespace Game.Chat } Bag container1 = item2.GetContainer(); - if (!container1) + if (container1 == null) { handler.SendSysMessage("The item in bag {0} at slot {1} with guid {2} has no container!", bag.GetSlot(), item2.GetSlot(), item2.GetGUID().ToString()); error = true; @@ -383,7 +383,7 @@ namespace Game.Chat for (int i = 0; i < updateQueue.Count; ++i) { Item item = updateQueue[i]; - if (!item) + if (item == null) continue; if (item.GetOwnerGUID() != player.GetGUID()) @@ -550,7 +550,7 @@ namespace Game.Chat static bool HandleDebugItemExpireCommand(CommandHandler handler, ulong guid) { Item item = handler.GetPlayer().GetItemByGuid(ObjectGuid.Create(HighGuid.Item, guid)); - if (!item) + if (item == null) return false; handler.GetPlayer().DestroyItem(item.GetBagSlot(), item.GetSlot(), true); @@ -580,7 +580,7 @@ namespace Game.Chat static bool HandleDebugLoadCellsCommandHelper(CommandHandler handler, Map map, uint? tileX, uint? tileY) { - if (!map) + if (map == null) return false; // Load 1 single tile if specified, otherwise load the whole map @@ -610,7 +610,7 @@ namespace Game.Chat static bool HandleDebugGetLootRecipientCommand(CommandHandler handler) { Creature target = handler.GetSelectedCreature(); - if (!target) + if (target == null) return false; handler.SendSysMessage($"Loot recipients for creature {target.GetName()} ({target.GetGUID()}, SpawnID {target.GetSpawnId()}) are:"); @@ -627,7 +627,7 @@ namespace Game.Chat static bool HandleDebugLoSCommand(CommandHandler handler) { Unit unit = handler.GetSelectedUnit(); - if (unit) + if (unit != null) { Player player = handler.GetPlayer(); handler.SendSysMessage($"Checking LoS {player.GetName()} . {unit.GetName()}:"); @@ -643,7 +643,7 @@ namespace Game.Chat static bool HandleDebugMoveflagsCommand(CommandHandler handler, uint? moveFlags, uint? moveFlagsExtra) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) target = handler.GetPlayer(); if (!moveFlags.HasValue) @@ -684,7 +684,7 @@ namespace Game.Chat if (linked == "linked") { Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) nearestLoc = bg.GetClosestGraveyard(player); else { @@ -763,7 +763,7 @@ namespace Game.Chat static bool HandleDebugPhaseCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -782,7 +782,7 @@ namespace Game.Chat static bool HandleDebugPlayerConditionCommand(CommandHandler handler, uint playerConditionId) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -900,7 +900,7 @@ namespace Game.Chat static bool HandleDebugSetAuraStateCommand(CommandHandler handler, AuraStateType? state, bool apply) { Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; @@ -925,7 +925,7 @@ namespace Game.Chat handler.GetPlayer().GetClosePoint(out x, out y, out z, handler.GetPlayer().GetCombatReach()); if (id == 0) - return handler.GetPlayer().SummonCreature(entry, x, y, z, o); + return handler.GetPlayer().SummonCreature(entry, x, y, z, o) != null; CreatureTemplate creatureTemplate = Global.ObjectMgr.GetCreatureTemplate(entry); if (creatureTemplate == null) @@ -939,7 +939,7 @@ namespace Game.Chat Position pos = new(x, y, z, o); Creature creature = Creature.CreateCreature(entry, map, pos, id); - if (!creature) + if (creature == null) return false; map.AddToMap(creature); @@ -1086,7 +1086,7 @@ namespace Game.Chat static bool HandleDebugTransportCommand(CommandHandler handler, string operation) { Transport transport = handler.GetPlayer().GetTransport(); - if (!transport) + if (transport == null) return false; bool start = false; @@ -1267,7 +1267,7 @@ namespace Game.Chat Player player = handler.GetPlayer(); Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; diff --git a/Source/Game/Chat/Commands/DeserterCommands.cs b/Source/Game/Chat/Commands/DeserterCommands.cs index 074a142cd..73aa9c4e5 100644 --- a/Source/Game/Chat/Commands/DeserterCommands.cs +++ b/Source/Game/Chat/Commands/DeserterCommands.cs @@ -52,7 +52,7 @@ namespace Game.Chat.Commands static bool HandleDeserterAdd(CommandHandler handler, uint time, bool isInstance) { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -72,7 +72,7 @@ namespace Game.Chat.Commands static bool HandleDeserterRemove(CommandHandler handler, bool isInstance) { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; diff --git a/Source/Game/Chat/Commands/GameObjectCommands.cs b/Source/Game/Chat/Commands/GameObjectCommands.cs index 9e43ceb41..18db7a8dc 100644 --- a/Source/Game/Chat/Commands/GameObjectCommands.cs +++ b/Source/Game/Chat/Commands/GameObjectCommands.cs @@ -21,7 +21,7 @@ namespace Game.Chat static bool HandleGameObjectActivateCommand(CommandHandler handler, ulong guidLow) { GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandObjnotfound, guidLow); return false; @@ -48,7 +48,7 @@ namespace Game.Chat if (!ownerGuid.IsEmpty()) { Unit owner = Global.ObjAccessor.GetUnit(player, ownerGuid); - if (!owner || !ownerGuid.IsPlayer()) + if (owner == null || !ownerGuid.IsPlayer()) { handler.SendSysMessage(CypherStrings.CommandDelobjrefercreature, ownerGuid.ToString(), obj.GetGUID().ToString()); return false; @@ -189,7 +189,7 @@ namespace Game.Chat static bool HandleGameObjectMoveCommand(CommandHandler handler, ulong guidLow, float[] xyz) { GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandObjnotfound, guidLow); return false; @@ -227,7 +227,7 @@ namespace Game.Chat obj.Delete(); obj = GameObject.CreateGameObjectFromDB(guidLow, map); - if (!obj) + if (obj == null) return false; handler.SendSysMessage(CypherStrings.CommandMoveobjmessage, obj.GetSpawnId(), obj.GetGoInfo().name, obj.GetGUID().ToString()); @@ -418,7 +418,7 @@ namespace Game.Chat handler.SendSysMessage(CypherStrings.GameobjectDetail, guidLow, objectInfo.name, guidLow, id, x, y, z, mapId, o, phaseId, phaseGroup); - if (target) + if (target != null) { int curRespawnDelay = (int)(target.GetRespawnTimeEx() - GameTime.GetGameTime()); if (curRespawnDelay < 0) @@ -436,7 +436,7 @@ namespace Game.Chat static bool HandleGameObjectTurnCommand(CommandHandler handler, ulong guidLow, float? oz, float? oy, float? ox) { GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandObjnotfound, guidLow); return false; @@ -458,7 +458,7 @@ namespace Game.Chat obj.Delete(); obj = GameObject.CreateGameObjectFromDB(guidLow, map); - if (!obj) + if (obj == null) return false; handler.SendSysMessage(CypherStrings.CommandTurnobjmessage, obj.GetSpawnId(), obj.GetGoInfo().name, obj.GetGUID().ToString(), obj.GetOrientation()); @@ -494,7 +494,7 @@ namespace Game.Chat Map map = player.GetMap(); GameObject obj = GameObject.CreateGameObject(objectInfo.entry, map, player, Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(player.GetOrientation(), 0.0f, 0.0f)), 255, GameObjectState.Ready); - if (!obj) + if (obj == null) return false; PhasingHandler.InheritPhaseShift(obj, player); @@ -508,7 +508,7 @@ namespace Game.Chat // this will generate a new guid if the object is in an instance obj = GameObject.CreateGameObjectFromDB(spawnId, map); - if (!obj) + if (obj == null) return false; // TODO: is it really necessary to add both the real and DB table guid here ? @@ -546,7 +546,7 @@ namespace Game.Chat return false; GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandObjnotfound, guidLow); return false; @@ -570,7 +570,7 @@ namespace Game.Chat return false; GameObject obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandObjnotfound, guidLow); return false; diff --git a/Source/Game/Chat/Commands/GroupCommands.cs b/Source/Game/Chat/Commands/GroupCommands.cs index 84ce84706..4b445d03c 100644 --- a/Source/Game/Chat/Commands/GroupCommands.cs +++ b/Source/Game/Chat/Commands/GroupCommands.cs @@ -23,7 +23,7 @@ namespace Game.Chat if (!handler.GetPlayerGroupAndGUIDByName(name, out Player player, out Group group, out _)) return false; - if (!group) + if (group == null) { handler.SendSysMessage(CypherStrings.GroupNotInGroup, player.GetName()); return false; @@ -39,7 +39,7 @@ namespace Game.Chat if (!handler.GetPlayerGroupAndGUIDByName(playerNameGroup, out Player playerSource, out Group groupSource, out _, true)) return false; - if (!groupSource) + if (groupSource == null) { handler.SendSysMessage(CypherStrings.GroupNotInGroup, playerSource.GetName()); return false; @@ -48,7 +48,7 @@ namespace Game.Chat if (!handler.GetPlayerGroupAndGUIDByName(playerName, out Player playerTarget, out Group groupTarget, out _, true)) return false; - if (groupTarget || playerTarget.GetGroup() == groupSource) + if (groupTarget != null || playerTarget.GetGroup() == groupSource) { handler.SendSysMessage(CypherStrings.GroupAlreadyInGroup, playerTarget.GetName()); return false; @@ -72,7 +72,7 @@ namespace Game.Chat if (!handler.GetPlayerGroupAndGUIDByName(name, out Player player, out Group group, out ObjectGuid guid)) return false; - if (!group) + if (group == null) { handler.SendSysMessage(CypherStrings.GroupNotInGroup, player.GetName()); return false; @@ -155,7 +155,7 @@ namespace Game.Chat } // If both fails, players simply has no party. Return false. - if (!groupTarget) + if (groupTarget == null) { handler.SendSysMessage(CypherStrings.GroupNotInGroup, target.GetName()); return false; @@ -194,15 +194,15 @@ namespace Game.Chat flags = "None"; // Check if iterator is online. If is... - Player p = Global.ObjAccessor.FindPlayer(slot.guid); + Player player = Global.ObjAccessor.FindPlayer(slot.guid); string phases = ""; - if (p && p.IsInWorld) + if (player != null && player.IsInWorld) { // ... than, it prints information like "is online", where he is, etc... onlineState = "online"; - phases = PhasingHandler.FormatPhases(p.GetPhaseShift()); + phases = PhasingHandler.FormatPhases(player.GetPhaseShift()); - AreaTableRecord area = CliDB.AreaTableStorage.LookupByKey(p.GetAreaId()); + AreaTableRecord area = CliDB.AreaTableStorage.LookupByKey(player.GetAreaId()); if (area != null) { AreaTableRecord zone = CliDB.AreaTableStorage.LookupByKey(area.ParentAreaID); @@ -226,7 +226,7 @@ namespace Game.Chat if (!handler.GetPlayerGroupAndGUIDByName(name, out Player player, out Group group, out ObjectGuid guid)) return false; - if (!group) + if (group == null) { handler.SendSysMessage(CypherStrings.GroupNotInGroup, player.GetName()); return false; @@ -273,7 +273,7 @@ namespace Game.Chat for (GroupReference it = groupTarget.GetFirstMember(); it != null; it = it.Next()) { Player target = it.GetSource(); - if (target) + if (target != null) { target.ResurrectPlayer(target.GetSession().HasPermission(RBACPermissions.ResurrectWithFullHps) ? 1.0f : 0.5f); target.SpawnCorpseBones(); @@ -302,7 +302,7 @@ namespace Game.Chat string nameLink = handler.GetNameLink(target); - if (!group) + if (group == null) { handler.SendSysMessage(CypherStrings.NotInGroup, nameLink); return false; @@ -319,7 +319,7 @@ namespace Game.Chat if (toInstance) { Player groupLeader = Global.ObjAccessor.GetPlayer(gmMap, group.GetLeaderGUID()); - if (!groupLeader || (groupLeader.GetMapId() != gmMap.GetId()) || (groupLeader.GetInstanceId() != gmMap.GetInstanceId())) + if (groupLeader == null || (groupLeader.GetMapId() != gmMap.GetId()) || (groupLeader.GetInstanceId() != gmMap.GetInstanceId())) { handler.SendSysMessage(CypherStrings.PartialGroupSummon); onlyLocalSummon = true; @@ -330,7 +330,7 @@ namespace Game.Chat { Player player = refe.GetSource(); - if (!player || player == gmPlayer || player.GetSession() == null) + if (player == null || player == gmPlayer || player.GetSession() == null) continue; // check online security @@ -409,7 +409,7 @@ namespace Game.Chat if (!handler.GetPlayerGroupAndGUIDByName(name, out Player player, out Group group, out ObjectGuid guid)) return false; - if (!group) + if (group == null) { handler.SendSysMessage(CypherStrings.NotInGroup, player.GetName()); return false; diff --git a/Source/Game/Chat/Commands/GuildCommands.cs b/Source/Game/Chat/Commands/GuildCommands.cs index cbc821069..965107b3c 100644 --- a/Source/Game/Chat/Commands/GuildCommands.cs +++ b/Source/Game/Chat/Commands/GuildCommands.cs @@ -31,7 +31,7 @@ namespace Game.Chat return false; } - if (Global.GuildMgr.GetGuildByName(guildName)) + if (Global.GuildMgr.GetGuildByName(guildName) != null) { handler.SendSysMessage(CypherStrings.GuildRenameAlreadyExists); return false; @@ -122,7 +122,7 @@ namespace Game.Chat return false; Guild targetGuild = Global.GuildMgr.GetGuildById(guildId); - if (!targetGuild) + if (targetGuild == null) return false; return targetGuild.ChangeMemberRank(null, player.GetGUID(), (GuildRankId)rank); @@ -144,13 +144,13 @@ namespace Game.Chat } Guild guild = Global.GuildMgr.GetGuildByName(oldGuildName); - if (!guild) + if (guild == null) { handler.SendSysMessage(CypherStrings.CommandCouldnotfind, oldGuildName); return false; } - if (Global.GuildMgr.GetGuildByName(newGuildName)) + if (Global.GuildMgr.GetGuildByName(newGuildName) != null) { handler.SendSysMessage(CypherStrings.GuildRenameAlreadyExists, newGuildName); return false; @@ -185,7 +185,7 @@ namespace Game.Chat guild = target.GetConnectedPlayer().GetGuild(); } - if (!guild) + if (guild == null) return false; // Display Guild Information diff --git a/Source/Game/Chat/Commands/HonorCommands.cs b/Source/Game/Chat/Commands/HonorCommands.cs index 226546354..6781d00b9 100644 --- a/Source/Game/Chat/Commands/HonorCommands.cs +++ b/Source/Game/Chat/Commands/HonorCommands.cs @@ -14,7 +14,7 @@ namespace Game.Chat.Commands static bool HandleHonorUpdateCommand(CommandHandler handler) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -35,7 +35,7 @@ namespace Game.Chat.Commands static bool HandleHonorAddCommand(CommandHandler handler, int amount) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -53,7 +53,7 @@ namespace Game.Chat.Commands static bool HandleHonorAddKillCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -61,7 +61,7 @@ namespace Game.Chat.Commands // check online security Player player = target.ToPlayer(); - if (player) + if (player != null) if (handler.HasLowerSecurity(player, ObjectGuid.Empty)) return false; diff --git a/Source/Game/Chat/Commands/LFGCommands.cs b/Source/Game/Chat/Commands/LFGCommands.cs index 8381e5390..b55282e6c 100644 --- a/Source/Game/Chat/Commands/LFGCommands.cs +++ b/Source/Game/Chat/Commands/LFGCommands.cs @@ -52,7 +52,7 @@ namespace Game.Chat groupTarget = Global.GroupMgr.GetGroupByDbStoreId(resultGroup.Read(0)); } - if (!groupTarget) + if (groupTarget == null) { handler.SendSysMessage(CypherStrings.LfgNotInGroup, player.GetName()); return false; @@ -63,9 +63,9 @@ namespace Game.Chat foreach (var slot in groupTarget.GetMemberSlots()) { - Player p = Global.ObjAccessor.FindPlayer(slot.guid); - if (p) - PrintPlayerInfo(handler, p); + Player groupPlayer = Global.ObjAccessor.FindPlayer(slot.guid); + if (groupPlayer != null) + PrintPlayerInfo(handler, groupPlayer); else handler.SendSysMessage("{0} is offline.", slot.name); } @@ -102,7 +102,7 @@ namespace Game.Chat static void PrintPlayerInfo(CommandHandler handler, Player player) { - if (!player) + if (player == null) return; ObjectGuid guid = player.GetGUID(); diff --git a/Source/Game/Chat/Commands/LearnCommands.cs b/Source/Game/Chat/Commands/LearnCommands.cs index 89cad6f92..fcac5f2c0 100644 --- a/Source/Game/Chat/Commands/LearnCommands.cs +++ b/Source/Game/Chat/Commands/LearnCommands.cs @@ -18,7 +18,7 @@ namespace Game.Chat.Commands static bool HandleLearnCommand(CommandHandler handler, uint spellId, [OptionalArg] string allRanksStr) { Player targetPlayer = handler.GetSelectedPlayerOrSelf(); - if (!targetPlayer) + if (targetPlayer == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -141,7 +141,7 @@ namespace Game.Chat.Commands // Example: .learn all_recipes enchanting Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -317,7 +317,7 @@ namespace Game.Chat.Commands static bool HandleUnLearnCommand(CommandHandler handler, uint spellId, [OptionalArg] string allRanksStr) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; diff --git a/Source/Game/Chat/Commands/ListCommands.cs b/Source/Game/Chat/Commands/ListCommands.cs index 69b166a99..01aaf964a 100644 --- a/Source/Game/Chat/Commands/ListCommands.cs +++ b/Source/Game/Chat/Commands/ListCommands.cs @@ -63,7 +63,7 @@ namespace Game.Chat.Commands thisMap = handler.GetSession().GetPlayer().GetMap(); // If map found, try to find active version of this creature - if (thisMap) + if (thisMap != null) { var creBounds = thisMap.GetCreatureBySpawnIdStore().LookupByKey(guid); foreach (var creature in creBounds) @@ -73,7 +73,7 @@ namespace Game.Chat.Commands if (!liveFound) { - if (handler.GetSession()) + if (handler.GetSession() != null) handler.SendSysMessage(CypherStrings.CreatureListChat, guid, guid, cInfo.Name, x, y, z, mapId, "", ""); else handler.SendSysMessage(CypherStrings.CreatureListConsole, guid, cInfo.Name, x, y, z, mapId, "", ""); @@ -403,7 +403,7 @@ namespace Game.Chat.Commands thisMap = handler.GetSession().GetPlayer().GetMap(); // If map found, try to find active version of this object - if (thisMap) + if (thisMap != null) { var goBounds = thisMap.GetGameObjectBySpawnIdStore().LookupByKey(guid); foreach (var go in goBounds) @@ -413,7 +413,7 @@ namespace Game.Chat.Commands if (!liveFound) { - if (handler.GetSession()) + if (handler.GetSession() != null) handler.SendSysMessage(CypherStrings.GoListChat, guid, entry, guid, gInfo.name, x, y, z, mapId, "", ""); else handler.SendSysMessage(CypherStrings.GoListConsole, guid, gInfo.name, x, y, z, mapId, "", ""); @@ -485,10 +485,10 @@ namespace Game.Chat.Commands static bool HandleListScenesCommand(CommandHandler handler) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) target = handler.GetSession().GetPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -572,7 +572,7 @@ namespace Game.Chat.Commands static bool ListAurasCommand(CommandHandler handler, uint? spellId, string namePart) { Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; diff --git a/Source/Game/Chat/Commands/LookupCommands.cs b/Source/Game/Chat/Commands/LookupCommands.cs index 618a906c6..90ea441e4 100644 --- a/Source/Game/Chat/Commands/LookupCommands.cs +++ b/Source/Game/Chat/Commands/LookupCommands.cs @@ -207,7 +207,7 @@ namespace Game.Chat foreach (var factionEntry in CliDB.FactionStorage.Values) { - FactionState factionState = target ? target.GetReputationMgr().GetState(factionEntry) : null; + FactionState factionState = target != null ? target.GetReputationMgr().GetState(factionEntry) : null; Locale locale = handler.GetSessionDbcLocale(); string name = factionEntry.Name[locale]; @@ -450,7 +450,7 @@ namespace Game.Chat string valStr = ""; string knownStr = ""; - if (target && target.HasSkill((SkillType)skillInfo.Id)) + if (target != null && target.HasSkill((SkillType)skillInfo.Id)) { knownStr = handler.GetCypherString(CypherStrings.Known); uint curValue = target.GetPureSkillValue((SkillType)skillInfo.Id); @@ -564,7 +564,7 @@ namespace Game.Chat Player target = handler.GetSelectedPlayer(); // title name have single string arg for player name - string targetName = target ? target.GetName() : "NAME"; + string targetName = target != null ? target.GetName() : "NAME"; uint counter = 0; // Counter for figure out that we found smth. // Search in CharTitles.dbc @@ -572,7 +572,7 @@ namespace Game.Chat { for (Gender gender = Gender.Male; gender <= Gender.Female; ++gender) { - if (target && target.GetGender() != gender) + if (target != null && target.GetGender() != gender) continue; Locale locale = handler.GetSessionDbcLocale(); @@ -605,9 +605,9 @@ namespace Game.Chat return true; } - string knownStr = target && target.HasTitle(titleInfo) ? handler.GetCypherString(CypherStrings.Known) : ""; + string knownStr = target != null && target.HasTitle(titleInfo) ? handler.GetCypherString(CypherStrings.Known) : ""; - string activeStr = target && target.m_playerData.PlayerTitle == titleInfo.MaskID + string activeStr = target != null && target.m_playerData.PlayerTitle == titleInfo.MaskID ? handler.GetCypherString(CypherStrings.Active) : ""; string titleNameStr = string.Format(name.ConvertFormatSyntax(), targetName); @@ -684,7 +684,7 @@ namespace Game.Chat return true; } - if (handler.GetSession()) + if (handler.GetSession() != null) handler.SendSysMessage(CypherStrings.ItemListChat, id, id, name); else handler.SendSysMessage(CypherStrings.ItemListConsole, id, name); @@ -739,7 +739,7 @@ namespace Game.Chat } // send item set in "id - [namedlink locale]" format - if (handler.GetSession()) + if (handler.GetSession() != null) handler.SendSysMessage(CypherStrings.ItemsetListChat, id, id, name, ""); else handler.SendSysMessage(CypherStrings.ItemsetListConsole, id, name, ""); @@ -774,7 +774,7 @@ namespace Game.Chat if (string.IsNullOrEmpty(name)) continue; - if (!name.Like(namePart) && handler.GetSession()) + if (!name.Like(namePart) && handler.GetSession() != null) { locale = 0; for (; locale < Locale.Total; ++locale) @@ -839,7 +839,7 @@ namespace Game.Chat var mapInfo = CliDB.MapStorage.LookupByKey(id); if (mapInfo != null) { - Locale locale = handler.GetSession() ? handler.GetSession().GetSessionDbcLocale() : Global.WorldMgr.GetDefaultDbcLocale(); + Locale locale = handler.GetSession() != null ? handler.GetSession().GetSessionDbcLocale() : Global.WorldMgr.GetDefaultDbcLocale(); string name = mapInfo.MapName[locale]; if (name.IsEmpty()) { @@ -891,7 +891,7 @@ namespace Game.Chat if (ip.IsEmpty()) { // NULL only if used from console - if (!target || target == handler.GetSession().GetPlayer()) + if (target == null || target == handler.GetSession().GetPlayer()) return false; ip = target.GetSession().GetRemoteAddress(); @@ -1004,7 +1004,7 @@ namespace Game.Chat string statusStr = ""; - if (target) + if (target != null) { switch (target.GetQuestStatus(qInfo.Id)) { @@ -1065,7 +1065,7 @@ namespace Game.Chat string statusStr = ""; - if (target) + if (target != null) { QuestStatus status = target.GetQuestStatus(qInfo.Id); @@ -1135,7 +1135,7 @@ namespace Game.Chat string statusStr = ""; - if (target) + if (target != null) { switch (target.GetQuestStatus(id)) { @@ -1153,7 +1153,7 @@ namespace Game.Chat } } - if (handler.GetSession()) + if (handler.GetSession() != null) { int maxLevel = 0; var questLevels = Global.DB2Mgr.GetContentTuningData(quest.ContentTuningId, handler.GetSession().GetPlayer().m_playerData.CtrOptions.GetValue().ContentTuningConditionMask); @@ -1229,14 +1229,14 @@ namespace Game.Chat return true; } - bool known = target && target.HasSpell(spellInfo.Id); + bool known = target != null && target.HasSpell(spellInfo.Id); var spellEffectInfo = spellInfo.GetEffects().Find(spelleffectInfo => spelleffectInfo.IsEffect(SpellEffectName.LearnSpell)); SpellInfo learnSpellInfo = spellEffectInfo != null ? Global.SpellMgr.GetSpellInfo(spellEffectInfo.TriggerSpell, spellInfo.Difficulty) : null; bool talent = spellInfo.HasAttribute(SpellCustomAttributes.IsTalent); bool passive = spellInfo.IsPassive(); - bool active = target && target.HasAura(spellInfo.Id); + bool active = target != null && target.HasAura(spellInfo.Id); // unit32 used to prevent interpreting public byte as char at output // find rank of learned spell for learning spell, or talent rank @@ -1297,14 +1297,14 @@ namespace Game.Chat return true; } - bool known = target && target.HasSpell(id); + bool known = target != null && target.HasSpell(id); var spellEffectInfo = spellInfo.GetEffects().Find(spelleffectInfo => spelleffectInfo.IsEffect(SpellEffectName.LearnSpell)); SpellInfo learnSpellInfo = Global.SpellMgr.GetSpellInfo(spellEffectInfo.TriggerSpell, Difficulty.None); bool talent = spellInfo.HasAttribute(SpellCustomAttributes.IsTalent); bool passive = spellInfo.IsPassive(); - bool active = target && target.HasAura(id); + bool active = target != null && target.HasAura(id); // unit32 used to prevent interpreting public byte as char at output // find rank of learned spell for learning spell, or talent rank diff --git a/Source/Game/Chat/Commands/MMapsCommands.cs b/Source/Game/Chat/Commands/MMapsCommands.cs index 025bcef74..a08037108 100644 --- a/Source/Game/Chat/Commands/MMapsCommands.cs +++ b/Source/Game/Chat/Commands/MMapsCommands.cs @@ -225,7 +225,7 @@ namespace Game.Chat var go_search = new UnitListSearcher(obj, creatureList, go_check); Cell.VisitGridObjects(obj, go_search, radius); - if (!creatureList.Empty()) + if (creatureList.Empty()) { handler.SendSysMessage("Found {0} Creatures.", creatureList.Count); diff --git a/Source/Game/Chat/Commands/MessageCommands.cs b/Source/Game/Chat/Commands/MessageCommands.cs index b06161387..87680170d 100644 --- a/Source/Game/Chat/Commands/MessageCommands.cs +++ b/Source/Game/Chat/Commands/MessageCommands.cs @@ -21,7 +21,7 @@ namespace Game.Chat string name = "Console"; WorldSession session = handler.GetSession(); - if (session) + if (session != null) name = session.GetPlayer().GetName(); Global.WorldMgr.SendWorldText(CypherStrings.AnnounceColor, name, message); @@ -36,7 +36,7 @@ namespace Game.Chat string name = "Console"; WorldSession session = handler.GetSession(); - if (session) + if (session != null) name = session.GetPlayer().GetName(); Global.WorldMgr.SendGMText(CypherStrings.AnnounceColor, name, message); diff --git a/Source/Game/Chat/Commands/MiscCommands.cs b/Source/Game/Chat/Commands/MiscCommands.cs index e2e08f309..d11c7c6af 100644 --- a/Source/Game/Chat/Commands/MiscCommands.cs +++ b/Source/Game/Chat/Commands/MiscCommands.cs @@ -37,7 +37,7 @@ namespace Game.Chat return false; } - if (target) + if (target != null) { // check online security if (handler.HasLowerSecurity(target, ObjectGuid.Empty)) @@ -70,7 +70,7 @@ namespace Game.Chat // we have to go to instance, and can go to player only if: // 1) we are in his group (either as leader or as member) // 2) we are not bound to any group and have GM mode on - if (_player.GetGroup()) + if (_player.GetGroup() != null) { // we are in group, we can go only if we are in the player group if (_player.GetGroup() != target.GetGroup()) @@ -153,7 +153,7 @@ namespace Game.Chat static bool HandleBindSightCommand(CommandHandler handler) { Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) return false; handler.GetSession().GetPlayer().CastSpell(unit, 6277, true); @@ -168,14 +168,14 @@ namespace Game.Chat if (!args.Empty()) { target = Global.ObjAccessor.FindPlayerByName(args.NextString()); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; } } - if (!target) + if (target == null) { if (!handler.ExtractPlayerTarget(args, out target)) return false; @@ -193,7 +193,7 @@ namespace Game.Chat static bool HandleComeToMeCommand(CommandHandler handler) { Creature caster = handler.GetSelectedCreature(); - if (!caster) + if (caster == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -216,14 +216,14 @@ namespace Game.Chat static bool HandleDamageCommand(CommandHandler handler, uint damage, SpellSchools? school, [OptionalArg]SpellInfo spellInfo) { Unit target = handler.GetSelectedUnit(); - if (!target || handler.GetSession().GetPlayer().GetTarget().IsEmpty()) + if (target == null || handler.GetSession().GetPlayer().GetTarget().IsEmpty()) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; } - Player player_ = target.ToPlayer(); - if (player_) - if (handler.HasLowerSecurity(player_, ObjectGuid.Empty, false)) + Player player = target.ToPlayer(); + if (player != null) + if (handler.HasLowerSecurity(player, ObjectGuid.Empty, false)) return false; if (!target.IsAlive()) @@ -324,14 +324,14 @@ namespace Game.Chat static bool HandleDieCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); - if (!target && handler.GetPlayer().GetTarget().IsEmpty()) + if (target == null && handler.GetPlayer().GetTarget().IsEmpty()) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; } Player player = target.ToPlayer(); - if (player) + if (player != null) if (handler.HasLowerSecurity(player, ObjectGuid.Empty, false)) return false; @@ -380,7 +380,7 @@ namespace Game.Chat case HighGuid.Player: { obj = Global.ObjAccessor.FindPlayer(ObjectGuid.Create(HighGuid.Player, guidLow)); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); } @@ -389,7 +389,7 @@ namespace Game.Chat case HighGuid.Creature: { obj = handler.GetCreatureFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandNocreaturefound); } @@ -398,7 +398,7 @@ namespace Game.Chat case HighGuid.GameObject: { obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandNogameobjectfound); } @@ -407,14 +407,14 @@ namespace Game.Chat default: return false; } - if (!obj) + if (obj == null) return false; } else { obj = handler.GetSelectedUnit(); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; @@ -486,7 +486,7 @@ namespace Game.Chat // Player and duration retrieval is over if (canApplyFreeze) { - if (!player) // can be null if some previous selection failed + if (player == null) // can be null if some previous selection failed { handler.SendSysMessage(CypherStrings.CommandFreezeWrong); return true; @@ -532,7 +532,7 @@ namespace Game.Chat case HighGuid.Player: { obj = Global.ObjAccessor.FindPlayer(ObjectGuid.Create(HighGuid.Player, guidLow)); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); } @@ -541,7 +541,7 @@ namespace Game.Chat case HighGuid.Creature: { obj = handler.GetCreatureFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandNocreaturefound); } @@ -550,7 +550,7 @@ namespace Game.Chat case HighGuid.GameObject: { obj = handler.GetObjectFromPlayerMapByDbGuid(guidLow); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.CommandNogameobjectfound); } @@ -559,14 +559,14 @@ namespace Game.Chat default: return false; } - if (!obj) + if (obj == null) return false; } else { obj = handler.GetSelectedUnit(); - if (!obj) + if (obj == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); return false; @@ -622,7 +622,7 @@ namespace Game.Chat obj.GetPositionX(), obj.GetPositionY(), obj.GetPositionZ(), obj.GetOrientation()); Transport transport = obj.GetTransport(); - if (transport) + if (transport != null) { handler.SendSysMessage(CypherStrings.TransportPosition, transport.GetGoInfo().MoTransport.SpawnMap, obj.GetTransOffsetX(), obj.GetTransOffsetY(), obj.GetTransOffsetZ(), obj.GetTransOffsetO(), transport.GetEntry(), transport.GetName()); @@ -671,7 +671,7 @@ namespace Game.Chat static bool HandleHideAreaCommand(CommandHandler handler, uint areaId) { Player playerTarget = handler.GetSelectedPlayer(); - if (!playerTarget) + if (playerTarget == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -821,7 +821,7 @@ namespace Game.Chat // Save the frozen player to update remaining time in case of future .listfreeze uses // before the frozen state expires Player frozen = Global.ObjAccessor.FindPlayerByName(player); - if (frozen) + if (frozen != null) frozen.SaveToDB(); // Notify the freeze duration if (remaintime == -1) // Permanent duration @@ -848,7 +848,7 @@ namespace Game.Chat static bool HandleMovegensCommand(CommandHandler handler) { Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); @@ -948,7 +948,7 @@ namespace Game.Chat uint accountId = target != null ? target.GetSession().GetAccountId() : Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(player.GetGUID()); // find only player from same account if any - if (!target) + if (target == null) { WorldSession session = Global.WorldMgr.FindSession(accountId); if (session != null) @@ -967,7 +967,7 @@ namespace Game.Chat else muteBy = handler.GetCypherString(CypherStrings.Console); - if (target) + if (target != null) { // Target is online, mute will be in effect right away. long mutedUntil = GameTime.GetGameTime() + muteTime * Time.Minute; @@ -995,7 +995,7 @@ namespace Game.Chat if (WorldConfig.GetBoolValue(WorldCfg.ShowMuteInWorld)) Global.WorldMgr.SendWorldText(CypherStrings.CommandMutemessageWorld, muteBy, nameLink, muteTime, muteReasonStr); - if (target) + if (target != null) { target.SendSysMessage(CypherStrings.YourChatDisabled, muteTime, muteBy, muteReasonStr); handler.SendSysMessage(CypherStrings.YouDisableChat, nameLink, muteTime, muteReasonStr); @@ -1201,7 +1201,7 @@ namespace Game.Chat // Mail data print is only defined if you have a mail - if (target) + if (target != null) { // check online security if (handler.HasLowerSecurity(target, ObjectGuid.Empty)) @@ -1266,7 +1266,7 @@ namespace Game.Chat // Only fetch these fields if commander has sufficient rights) if (handler.HasPermission(RBACPermissions.CommandsPinfoCheckPersonalData) && // RBAC Perm. 48, Role 39 - (!handler.GetSession() || handler.GetSession().GetSecurity() >= (AccountTypes)security)) + (handler.GetSession() == null || handler.GetSession().GetSecurity() >= (AccountTypes)security)) { eMail = result0.Read(2); regMail = result0.Read(3); @@ -1344,10 +1344,10 @@ namespace Game.Chat // Initiate output // Output I. LANG_PINFO_PLAYER - handler.SendSysMessage(CypherStrings.PinfoPlayer, target ? "" : handler.GetCypherString(CypherStrings.Offline), nameLink, targetGuid.ToString()); + handler.SendSysMessage(CypherStrings.PinfoPlayer, target != null ? "" : handler.GetCypherString(CypherStrings.Offline), nameLink, targetGuid.ToString()); // Output II. LANG_PINFO_GM_ACTIVE if character is gamemaster - if (target && target.IsGameMaster()) + if (target != null && target.IsGameMaster()) handler.SendSysMessage(CypherStrings.PinfoGmActive); // Output III. LANG_PINFO_BANNED if ban exists and is applied @@ -1387,7 +1387,7 @@ namespace Game.Chat handler.SendSysMessage(CypherStrings.PinfoChrAlive, alive); // Output XIII. phases - if (target) + if (target != null) PhasingHandler.PrintToChat(handler, target); // Output XIV. LANG_PINFO_CHR_MONEY @@ -1470,7 +1470,7 @@ namespace Game.Chat static bool HandlePossessCommand(CommandHandler handler) { Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) return false; handler.GetSession().GetPlayer().CastSpell(unit, 530, true); @@ -1559,7 +1559,7 @@ namespace Game.Chat // accept only explicitly selected target (not implicitly self targeting case) Creature target = !player.GetTarget().IsEmpty() ? handler.GetSelectedCreature() : null; - if (target) + if (target != null) { if (target.IsPet()) { @@ -1628,7 +1628,7 @@ namespace Game.Chat if (handler.GetSession().HasPermission(RBACPermissions.CommandsSaveWithoutDelay)) { Player target = handler.GetSelectedPlayer(); - if (target) + if (target != null) target.SaveToDB(); else player.SaveToDB(); @@ -1648,7 +1648,7 @@ namespace Game.Chat static bool HandleShowAreaCommand(CommandHandler handler, uint areaId) { Player playerTarget = handler.GetSelectedPlayer(); - if (!playerTarget) + if (playerTarget == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -1699,7 +1699,7 @@ namespace Game.Chat return false; } - if (target) + if (target != null) { string nameLink = handler.PlayerLink(targetName); // check online security @@ -1821,11 +1821,11 @@ namespace Game.Chat else // If no name was entered - use target { player = handler.GetSelectedPlayer(); - if (player) + if (player != null) name = player.GetName(); } - if (player) + if (player != null) { handler.SendSysMessage(CypherStrings.CommandUnfreeze, name); @@ -1874,10 +1874,10 @@ namespace Game.Chat if (!handler.ExtractPlayerTarget(args, out target, out targetGuid, out targetName)) return false; - uint accountId = target ? target.GetSession().GetAccountId() : Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(targetGuid); + uint accountId = target != null ? target.GetSession().GetAccountId() : Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(targetGuid); // find only player from same account if any - if (!target) + if (target == null) { WorldSession session = Global.WorldMgr.FindSession(accountId); if (session != null) @@ -1888,7 +1888,7 @@ namespace Game.Chat if (handler.HasLowerSecurity(target, targetGuid, true)) return false; - if (target) + if (target != null) { if (target.GetSession().CanSpeak()) { @@ -1906,7 +1906,7 @@ namespace Game.Chat stmt.AddValue(3, accountId); DB.Login.Execute(stmt); - if (target) + if (target != null) target.SendSysMessage(CypherStrings.YourChatEnabled); string nameLink = handler.PlayerLink(targetName); @@ -1920,7 +1920,7 @@ namespace Game.Chat static bool HandleUnPossessCommand(CommandHandler handler) { Unit unit = handler.GetSelectedUnit(); - if (!unit) + if (unit == null) unit = handler.GetSession().GetPlayer(); unit.RemoveCharmAuras(); @@ -1939,7 +1939,7 @@ namespace Game.Chat { // 7355: "Stuck" var player1 = handler.GetSession().GetPlayer(); - if (player1) + if (player1 != null) player1.CastSpell(player1, SPELL_UNSTUCK_ID, false); return true; } @@ -1957,7 +1957,7 @@ namespace Game.Chat if (!handler.ExtractPlayerTarget(args, out player, out targetGUID)) return false; - if (!player) + if (player == null) { PreparedStatement stmt = CharacterDatabase.GetPreparedStatement(CharStatements.SEL_CHAR_HOMEBIND); stmt.AddValue(0, targetGUID.GetCounter()); @@ -1978,7 +1978,7 @@ namespace Game.Chat return false; Player caster = handler.GetSession().GetPlayer(); - if (caster) + if (caster != null) { ObjectGuid castId = ObjectGuid.Create(HighGuid.Cast, SpellCastSource.Normal, player.GetMapId(), SPELL_UNSTUCK_ID, player.GetMap().GenerateLowGuid(HighGuid.Cast)); Spell.SendCastResult(caster, spellInfo, new Networking.Packets.SpellCastVisual(SPELL_UNSTUCK_VISUAL, 0), castId, SpellCastResult.CantDoThatRightNow); @@ -2105,7 +2105,7 @@ namespace Game.Chat Player player = handler.GetSession().GetPlayer(); Player playerTarget = handler.GetSelectedPlayer(); - if (!playerTarget) + if (playerTarget == null) playerTarget = player; ItemTemplate itemTemplate = Global.ObjectMgr.GetItemTemplate(itemId); @@ -2164,12 +2164,12 @@ namespace Game.Chat foreach (var posCount in dest) { Item item1 = player.GetItemByPos(posCount.pos); - if (item1) + if (item1 != null) item1.SetBinding(false); } } - if (count > 0 && item) + if (count > 0 && item != null) { player.SendNewItem(item, (uint)count, false, true); handler.SendSysMessage(CypherStrings.Additem, itemId, count, handler.GetNameLink(playerTarget)); @@ -2212,7 +2212,7 @@ namespace Game.Chat Player player = handler.GetSession().GetPlayer(); Player playerTarget = handler.GetSelectedPlayer(); - if (!playerTarget) + if (playerTarget == null) playerTarget = player; Log.outDebug(LogFilter.Server, Global.ObjectMgr.GetCypherString(CypherStrings.Additemset), itemSetId); @@ -2409,7 +2409,7 @@ namespace Game.Chat } } - if (count > 0 && item) + if (count > 0 && item != null) { player.SendNewItem(item, (uint)count, false, true); if (player != playerTarget) diff --git a/Source/Game/Chat/Commands/ModifyCommands.cs b/Source/Game/Chat/Commands/ModifyCommands.cs index 5e114c5d7..d22a94a4a 100644 --- a/Source/Game/Chat/Commands/ModifyCommands.cs +++ b/Source/Game/Chat/Commands/ModifyCommands.cs @@ -97,7 +97,7 @@ namespace Game.Chat static bool HandleModifyFactionCommand(CommandHandler handler, uint? factionid, uint? flag, ulong? npcflag, uint? dyflag) { Creature target = handler.GetSelectedCreature(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -157,7 +157,7 @@ namespace Game.Chat mark = 65535; Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -211,7 +211,7 @@ namespace Game.Chat } Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -235,7 +235,7 @@ namespace Game.Chat static bool HandleModifyMoneyCommand(CommandHandler handler, StringArguments args) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -298,7 +298,7 @@ namespace Game.Chat return false; Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -328,7 +328,7 @@ namespace Game.Chat drunklevel = 100; Player target = handler.GetSelectedPlayerOrSelf(); - if (target) + if (target != null) target.SetDrunkValue(drunklevel); return true; @@ -341,7 +341,7 @@ namespace Game.Chat return false; Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -470,7 +470,7 @@ namespace Game.Chat return false; Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -529,7 +529,7 @@ namespace Game.Chat return false; Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -617,7 +617,7 @@ namespace Game.Chat return false; Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); @@ -652,7 +652,7 @@ namespace Game.Chat } Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -686,7 +686,7 @@ namespace Game.Chat static bool HandleDeMorphCommand(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) target = handler.GetSession().GetPlayer(); // check online security @@ -784,7 +784,7 @@ namespace Game.Chat static void NotifyModification(CommandHandler handler, Unit target, CypherStrings resourceMessage, CypherStrings resourceReportMessage, params object[] args) { Player player = target.ToPlayer(); - if (player) + if (player != null) { handler.SendSysMessage(resourceMessage, new object[] { handler.GetNameLink(player) }.Combine(args)); if (handler.NeedReportToTarget(player)) @@ -806,7 +806,7 @@ namespace Game.Chat return false; } - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -826,14 +826,14 @@ namespace Game.Chat return false; } - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; } Player player = target.ToPlayer(); - if (player) + if (player != null) { // check online security if (handler.HasLowerSecurity(player, ObjectGuid.Empty)) diff --git a/Source/Game/Chat/Commands/NPCCommands.cs b/Source/Game/Chat/Commands/NPCCommands.cs index 3386437c1..e9710b764 100644 --- a/Source/Game/Chat/Commands/NPCCommands.cs +++ b/Source/Game/Chat/Commands/NPCCommands.cs @@ -50,13 +50,13 @@ namespace Game.Chat static bool HandleNpcEvadeCommand(CommandHandler handler, EvadeReason? why, string force) { Creature creatureTarget = handler.GetSelectedCreature(); - if (!creatureTarget || creatureTarget.IsPet()) + if (creatureTarget == null || creatureTarget.IsPet()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; } - if (!creatureTarget.IsAIEnabled()) + if (creatureTarget.IsAIEnabled()) { handler.SendSysMessage(CypherStrings.CreatureNotAiEnabled); return false; @@ -73,7 +73,7 @@ namespace Game.Chat static bool HandleNpcInfoCommand(CommandHandler handler) { Creature target = handler.GetSelectedCreature(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -260,7 +260,7 @@ namespace Game.Chat static bool HandleNpcPlayEmoteCommand(CommandHandler handler, uint emote) { Creature target = handler.GetSelectedCreature(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -278,7 +278,7 @@ namespace Game.Chat return false; Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -314,7 +314,7 @@ namespace Game.Chat } Loot loot = creatureTarget._loot; - if (!creatureTarget.IsDead() || loot == null || loot.IsLooted()) + if (creatureTarget.IsDead() || loot == null || loot.IsLooted()) { handler.SendSysMessage(CypherStrings.CommandNotDeadOrNoLoot, creatureTarget.GetName()); return false; @@ -392,7 +392,7 @@ namespace Game.Chat static bool HandleNpcTameCommand(CommandHandler handler) { Creature creatureTarget = handler.GetSelectedCreature(); - if (!creatureTarget || creatureTarget.IsPet()) + if (creatureTarget == null || creatureTarget.IsPet()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -416,7 +416,7 @@ namespace Game.Chat // Everything looks OK, create new pet Pet pet = player.CreateTamedPetFrom(creatureTarget); - if (!pet) + if (pet == null) { handler.SendSysMessage(CypherStrings.CreatureNonTameable, cInfo.Entry); return false; @@ -455,7 +455,7 @@ namespace Game.Chat static bool HandleNpcTextEmoteCommand(CommandHandler handler, Tail text) { Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -476,7 +476,7 @@ namespace Game.Chat } Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -498,7 +498,7 @@ namespace Game.Chat return false; Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -533,7 +533,7 @@ namespace Game.Chat var list = map[key]; Player player = Global.ObjAccessor.FindConnectedPlayer(key); - handler.SendSysMessage(CypherStrings.CommandNpcShowlootSublabel, player ? player.GetName() : $"Offline player (GUID {key})", list.Count); + handler.SendSysMessage(CypherStrings.CommandNpcShowlootSublabel, player != null ? player.GetName() : $"Offline player (GUID {key})", list.Count); foreach (var it in list) { @@ -557,7 +557,7 @@ namespace Game.Chat Map map = chr.GetMap(); Transport trans = chr.GetTransport(); - if (trans) + if (trans != null) { ulong guid = Global.ObjectMgr.GenerateCreatureSpawnId(); CreatureData data = Global.ObjectMgr.NewOrExistCreatureData(guid); @@ -577,7 +577,7 @@ namespace Game.Chat } Creature creature = Creature.CreateCreature(id, map, chr.GetPosition()); - if (!creature) + if (creature == null) return false; PhasingHandler.InheritPhaseShift(creature, chr); @@ -589,7 +589,7 @@ namespace Game.Chat // current "creature" variable is deleted and created fresh new, otherwise old values might trigger asserts or cause undefined behavior creature.CleanupsBeforeDelete(); creature = Creature.CreateCreatureFromDB(db_guid, map, true, true); - if (!creature) + if (creature == null) return false; Global.ObjectMgr.AddCreatureToGrid(Global.ObjectMgr.GetCreatureData(db_guid)); @@ -606,7 +606,7 @@ namespace Game.Chat } Creature vendor = handler.GetSelectedCreature(); - if (!vendor) + if (vendor == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -674,7 +674,7 @@ namespace Game.Chat static bool HandleNpcAddFormationCommand(CommandHandler handler, ulong leaderGUID) { Creature creature = handler.GetSelectedCreature(); - if (!creature || creature.GetSpawnId() == 0) + if (creature == null || creature.GetSpawnId() == 0) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -747,7 +747,7 @@ namespace Game.Chat else { Creature creature = handler.GetSelectedCreature(); - if (!creature || creature.IsPet() || creature.IsTotem()) + if (creature == null || creature.IsPet() || creature.IsTotem()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -777,7 +777,7 @@ namespace Game.Chat static bool HandleNpcDeleteVendorItemCommand(CommandHandler handler, uint itemId) { Creature vendor = handler.GetSelectedCreature(); - if (!vendor || !vendor.IsVendor()) + if (vendor == null || !vendor.IsVendor()) { handler.SendSysMessage(CypherStrings.CommandVendorselection); return false; @@ -807,7 +807,7 @@ namespace Game.Chat Player player = handler.GetSession().GetPlayer(); Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -826,7 +826,7 @@ namespace Game.Chat Player player = handler.GetPlayer(); Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -879,7 +879,7 @@ namespace Game.Chat static bool HandleNpcSetDataCommand(CommandHandler handler, uint data_1, uint data_2) { Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -898,7 +898,7 @@ namespace Game.Chat return false; Unit unit = handler.GetSelectedUnit(); - if (!unit || !unit.IsTypeId(TypeId.Unit)) + if (unit == null || !unit.IsTypeId(TypeId.Unit)) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -922,7 +922,7 @@ namespace Game.Chat } Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -953,7 +953,7 @@ namespace Game.Chat static bool HandleNpcSetFlagCommand(CommandHandler handler, NPCFlags npcFlags, NPCFlags2 npcFlags2) { Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -982,7 +982,7 @@ namespace Game.Chat } Creature creature = handler.GetSelectedCreature(); - if (!creature || creature.IsPet()) + if (creature == null || creature.IsPet()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -1000,7 +1000,7 @@ namespace Game.Chat static bool HandleNpcSetLinkCommand(CommandHandler handler, ulong linkguid) { Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -1026,7 +1026,7 @@ namespace Game.Chat static bool HandleNpcSetModelCommand(CommandHandler handler, uint displayId) { Creature creature = handler.GetSelectedCreature(); - if (!creature || creature.IsPet()) + if (creature == null || creature.IsPet()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -1063,7 +1063,7 @@ namespace Game.Chat if (!lowGuid.HasValue) // case .setmovetype $move_type (with selected creature) { creature = handler.GetSelectedCreature(); - if (!creature || creature.IsPet()) + if (creature == null || creature.IsPet()) return false; lowguid = creature.GetSpawnId(); @@ -1111,7 +1111,7 @@ namespace Game.Chat return false; } - if (creature) + if (creature != null) { // update movement type if (!doNotDelete) @@ -1149,7 +1149,7 @@ namespace Game.Chat } Creature creature = handler.GetSelectedCreature(); - if (!creature || creature.IsPet()) + if (creature == null || creature.IsPet()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -1172,7 +1172,7 @@ namespace Game.Chat int phaseGroupId = args.NextInt32(); Creature creature = handler.GetSelectedCreature(); - if (!creature || creature.IsPet()) + if (creature == null || creature.IsPet()) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -1203,7 +1203,7 @@ namespace Game.Chat Creature creature = handler.GetSelectedCreature(); ulong guidLow; - if (creature) + if (creature != null) guidLow = creature.GetSpawnId(); else return false; @@ -1232,7 +1232,7 @@ namespace Game.Chat static bool HandleNpcSetSpawnTimeCommand(CommandHandler handler, uint spawnTime) { Creature creature = handler.GetSelectedCreature(); - if (!creature) + if (creature == null) return false; PreparedStatement stmt = WorldDatabase.GetPreparedStatement(WorldStatements.UPD_CREATURE_SPAWN_TIME_SECS); diff --git a/Source/Game/Chat/Commands/PetCommands.cs b/Source/Game/Chat/Commands/PetCommands.cs index 8961928e2..606ea3da4 100644 --- a/Source/Game/Chat/Commands/PetCommands.cs +++ b/Source/Game/Chat/Commands/PetCommands.cs @@ -17,7 +17,7 @@ namespace Game.Chat Player player = handler.GetSession().GetPlayer(); Creature creatureTarget = handler.GetSelectedCreature(); - if (!creatureTarget || creatureTarget.IsPet() || creatureTarget.IsTypeId(TypeId.Player)) + if (creatureTarget == null || creatureTarget.IsPet() || creatureTarget.IsTypeId(TypeId.Player)) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -65,7 +65,7 @@ namespace Game.Chat static bool HandlePetLearnCommand(CommandHandler handler, SpellInfo spellInfo) { Pet pet = GetSelectedPlayerPetOrOwn(handler); - if (!pet) + if (pet == null) { handler.SendSysMessage(CypherStrings.SelectPlayerOrPet); return false; @@ -97,7 +97,7 @@ namespace Game.Chat static bool HandlePetUnlearnCommand(CommandHandler handler, SpellInfo spellInfo) { Pet pet = GetSelectedPlayerPetOrOwn(handler); - if (!pet) + if (pet == null) { handler.SendSysMessage(CypherStrings.SelectPlayerOrPet); return false; @@ -117,8 +117,8 @@ namespace Game.Chat static bool HandlePetLevelCommand(CommandHandler handler, int? level) { Pet pet = GetSelectedPlayerPetOrOwn(handler); - Player owner = pet ? pet.GetOwner() : null; - if (!pet || !owner) + Player owner = pet != null ? pet.GetOwner() : null; + if (pet == null || owner == null) { handler.SendSysMessage(CypherStrings.SelectPlayerOrPet); return false; @@ -146,7 +146,7 @@ namespace Game.Chat static Pet GetSelectedPlayerPetOrOwn(CommandHandler handler) { Unit target = handler.GetSelectedUnit(); - if (target) + if (target != null) { if (target.IsTypeId(TypeId.Player)) return target.ToPlayer().GetPet(); @@ -156,7 +156,7 @@ namespace Game.Chat } Player player = handler.GetSession().GetPlayer(); - return player ? player.GetPet() : null; + return player != null ? player.GetPet() : null; } } } diff --git a/Source/Game/Chat/Commands/QuestCommands.cs b/Source/Game/Chat/Commands/QuestCommands.cs index a5e5c0635..977320376 100644 --- a/Source/Game/Chat/Commands/QuestCommands.cs +++ b/Source/Game/Chat/Commands/QuestCommands.cs @@ -16,7 +16,7 @@ namespace Game.Chat static bool HandleQuestAdd(CommandHandler handler, Quest quest) { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -52,7 +52,7 @@ namespace Game.Chat static bool HandleQuestComplete(CommandHandler handler, Quest quest) { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -76,7 +76,7 @@ namespace Game.Chat static bool HandleQuestRemove(CommandHandler handler, Quest quest) { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -125,7 +125,7 @@ namespace Game.Chat static bool HandleQuestReward(CommandHandler handler, Quest quest) { Player player = handler.GetSelectedPlayer(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -149,7 +149,7 @@ namespace Game.Chat static bool HandleQuestObjectiveComplete(CommandHandler handler, uint objectiveId) { Player player = handler.GetSelectedPlayerOrSelf(); - if (!player) + if (player == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; diff --git a/Source/Game/Chat/Commands/ResetCommands.cs b/Source/Game/Chat/Commands/ResetCommands.cs index 0536b7b7a..ae1b76c43 100644 --- a/Source/Game/Chat/Commands/ResetCommands.cs +++ b/Source/Game/Chat/Commands/ResetCommands.cs @@ -105,7 +105,7 @@ namespace Game.Chat // reset level for pet Pet pet = target.GetPet(); - if (pet) + if (pet != null) pet.SynchronizeLevelWithOwner(); Global.ScriptMgr.OnPlayerLevelChanged(target, oldLevel); @@ -185,7 +185,7 @@ namespace Game.Chat /* TODO: 6.x remove/update pet talents Pet* pet = target.GetPet(); Pet.resetTalentsForAllPetsOf(target, pet); - if (pet) + if (pet != null) target.SendTalentsInfoData(true); */ return true; diff --git a/Source/Game/Chat/Commands/SceneCommands.cs b/Source/Game/Chat/Commands/SceneCommands.cs index 64bcc7cff..c8c7b52f0 100644 --- a/Source/Game/Chat/Commands/SceneCommands.cs +++ b/Source/Game/Chat/Commands/SceneCommands.cs @@ -15,7 +15,7 @@ namespace Game.Chat static bool HandleCancelSceneCommand(CommandHandler handler, uint sceneScriptPackageId) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -32,7 +32,7 @@ namespace Game.Chat static bool HandleDebugSceneCommand(CommandHandler handler) { Player player = handler.GetSession().GetPlayer(); - if (player) + if (player != null) { player.GetSceneMgr().ToggleDebugSceneMode(); handler.SendSysMessage(player.GetSceneMgr().IsInDebugSceneMode() ? CypherStrings.CommandSceneDebugOn : CypherStrings.CommandSceneDebugOff); @@ -45,7 +45,7 @@ namespace Game.Chat static bool HandlePlaySceneCommand(CommandHandler handler, uint sceneId) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; @@ -62,7 +62,7 @@ namespace Game.Chat static bool HandlePlayScenePackageCommand(CommandHandler handler, uint sceneScriptPackageId, SceneFlags? flags) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; diff --git a/Source/Game/Chat/Commands/SendCommands.cs b/Source/Game/Chat/Commands/SendCommands.cs index 8faef0cc6..4cde95204 100644 --- a/Source/Game/Chat/Commands/SendCommands.cs +++ b/Source/Game/Chat/Commands/SendCommands.cs @@ -27,7 +27,7 @@ namespace Game.Chat.Commands return false; // from console show not existed sender - MailSender sender = new(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm); + MailSender sender = new(MailMessageType.Normal, handler.GetSession() != null ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm); // @todo Fix poor design SQLTransaction trans = new(); @@ -96,7 +96,7 @@ namespace Game.Chat.Commands } // from console show not existed sender - MailSender sender = new(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm); + MailSender sender = new(MailMessageType.Normal, handler.GetSession() != null ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm); // fill mail MailDraft draft = new(subject, text); @@ -105,8 +105,8 @@ namespace Game.Chat.Commands foreach (var pair in items) { - Item item = Item.CreateItem(pair.Key, pair.Value, ItemContext.None, handler.GetSession() ? handler.GetSession().GetPlayer() : null); - if (item) + Item item = Item.CreateItem(pair.Key, pair.Value, ItemContext.None, handler.GetSession() != null ? handler.GetSession().GetPlayer() : null); + if (item != null) { item.SaveToDB(trans); // save for prevent lost at next mail load, if send fail then item will deleted draft.AddItem(item); @@ -125,7 +125,7 @@ namespace Game.Chat.Commands static bool HandleSendMoneyCommand(CommandHandler handler, PlayerIdentifier receiver, QuotedString subject, QuotedString text, long money) { // from console show not existed sender - MailSender sender = new(MailMessageType.Normal, handler.GetSession() ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm); + MailSender sender = new(MailMessageType.Normal, handler.GetSession() != null ? handler.GetSession().GetPlayer().GetGUID().GetCounter() : 0, MailStationery.Gm); SQLTransaction trans = new(); diff --git a/Source/Game/Chat/Commands/ServerCommands.cs b/Source/Game/Chat/Commands/ServerCommands.cs index b2982b136..55f9b9fc4 100644 --- a/Source/Game/Chat/Commands/ServerCommands.cs +++ b/Source/Game/Chat/Commands/ServerCommands.cs @@ -134,10 +134,10 @@ namespace Game.Chat static bool IsOnlyUser(WorldSession mySession) { // check if there is any session connected from a different address - string myAddr = mySession ? mySession.GetRemoteAddress() : ""; + string myAddr = mySession != null ? mySession.GetRemoteAddress() : ""; var sessions = Global.WorldMgr.GetAllSessions(); foreach (var session in sessions) - if (session && myAddr != session.GetRemoteAddress()) + if (session != null && myAddr != session.GetRemoteAddress()) return false; return true; } diff --git a/Source/Game/Chat/Commands/SpellCommands.cs b/Source/Game/Chat/Commands/SpellCommands.cs index 4a4f80db0..0a83860cb 100644 --- a/Source/Game/Chat/Commands/SpellCommands.cs +++ b/Source/Game/Chat/Commands/SpellCommands.cs @@ -16,14 +16,14 @@ namespace Game.Chat static bool HandleCooldownCommand(CommandHandler handler, uint? spellIdArg) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.PlayerNotFound); return false; } Player owner = target.GetCharmerOrOwnerPlayerOrPlayerItself(); - if (!owner) + if (owner == null) { owner = handler.GetSession().GetPlayer(); target = owner; @@ -56,7 +56,7 @@ namespace Game.Chat static bool HandleAuraCommand(CommandHandler handler, uint spellId) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); @@ -80,7 +80,7 @@ namespace Game.Chat static bool HandleUnAuraCommand(CommandHandler handler, uint spellId = 0) { Unit target = handler.GetSelectedUnit(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCharOrCreature); @@ -107,7 +107,7 @@ namespace Game.Chat static bool HandleSetSkillCommand(CommandHandler handler, uint skillId, uint level, uint? maxSkillArg) { Player target = handler.GetSelectedPlayerOrSelf(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; diff --git a/Source/Game/Chat/Commands/TeleCommands.cs b/Source/Game/Chat/Commands/TeleCommands.cs index f6e47fedb..24474aa5b 100644 --- a/Source/Game/Chat/Commands/TeleCommands.cs +++ b/Source/Game/Chat/Commands/TeleCommands.cs @@ -108,7 +108,7 @@ namespace Game.Chat } Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -128,7 +128,7 @@ namespace Game.Chat string nameLink = handler.GetNameLink(target); Group grp = target.GetGroup(); - if (!grp) + if (grp == null) { handler.SendSysMessage(CypherStrings.NotInGroup, nameLink); return false; @@ -137,7 +137,7 @@ namespace Game.Chat for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); - if (!player || !player.GetSession()) + if (player == null || player.GetSession() == null) continue; // check online security @@ -234,7 +234,7 @@ namespace Game.Chat if (where is string && where.Equals("$home")) // References target's homebind { - if (target) + if (target != null) target.TeleportTo(target.GetHomebind()); else { diff --git a/Source/Game/Chat/Commands/TicketCommands.cs b/Source/Game/Chat/Commands/TicketCommands.cs index 0ee1fa119..90a52a2ab 100644 --- a/Source/Game/Chat/Commands/TicketCommands.cs +++ b/Source/Game/Chat/Commands/TicketCommands.cs @@ -257,7 +257,7 @@ namespace Game.Chat.Commands // If assigned to different player other than current, leave //! Console can override though Player player = handler.GetSession() != null ? handler.GetSession().GetPlayer() : null; - if (player && ticket.IsAssignedNotTo(player.GetGUID())) + if (player != null && ticket.IsAssignedNotTo(player.GetGUID())) { handler.SendSysMessage(CypherStrings.CommandTicketalreadyassigned, ticket.GetId()); return true; @@ -284,21 +284,21 @@ namespace Game.Chat.Commands // Ticket should be assigned to the player who tries to close it. // Console can override though Player player = handler.GetSession() != null ? handler.GetSession().GetPlayer() : null; - if (player && ticket.IsAssignedNotTo(player.GetGUID())) + if (player != null && ticket.IsAssignedNotTo(player.GetGUID())) { handler.SendSysMessage(CypherStrings.CommandTicketcannotclose, ticket.GetId()); return true; } ObjectGuid closedByGuid = ObjectGuid.Empty; - if (player) + if (player != null) closedByGuid = player.GetGUID(); else closedByGuid.SetRawValue(0, ulong.MaxValue); Global.SupportMgr.CloseTicket(ticket.GetId(), closedByGuid); - string msg = ticket.FormatViewMessageString(handler, player ? player.GetName() : "Console", null, null, null); + string msg = ticket.FormatViewMessageString(handler, player != null ? player.GetName() : "Console", null, null, null); handler.SendGlobalGMSysMessage(msg); return true; @@ -325,7 +325,7 @@ namespace Game.Chat.Commands // Cannot comment ticket assigned to someone else //! Console excluded Player player = handler.GetSession() != null ? handler.GetSession().GetPlayer() : null; - if (player && ticket.IsAssignedNotTo(player.GetGUID())) + if (player != null && ticket.IsAssignedNotTo(player.GetGUID())) { handler.SendSysMessage(CypherStrings.CommandTicketalreadyassigned, ticket.GetId()); return true; @@ -336,7 +336,7 @@ namespace Game.Chat.Commands Global.SupportMgr.UpdateLastChange(); string msg = ticket.FormatViewMessageString(handler, null, ticket.GetAssignedToName(), null, null); - msg += string.Format(handler.GetCypherString(CypherStrings.CommandTicketlistaddcomment), player ? player.GetName() : "Console", comment); + msg += string.Format(handler.GetCypherString(CypherStrings.CommandTicketlistaddcomment), player != null ? player.GetName() : "Console", comment); handler.SendGlobalGMSysMessage(msg); return true; @@ -405,7 +405,7 @@ namespace Game.Chat.Commands // Get security level of player, whom this ticket is assigned to AccountTypes security; Player assignedPlayer = ticket.GetAssignedPlayer(); - if (assignedPlayer && assignedPlayer.IsInWorld) + if (assignedPlayer != null && assignedPlayer.IsInWorld) security = assignedPlayer.GetSession().GetSecurity(); else { diff --git a/Source/Game/Chat/Commands/TitleCommands.cs b/Source/Game/Chat/Commands/TitleCommands.cs index 12cf34042..a85bb8ed9 100644 --- a/Source/Game/Chat/Commands/TitleCommands.cs +++ b/Source/Game/Chat/Commands/TitleCommands.cs @@ -17,7 +17,7 @@ namespace Game.Chat.Commands static bool HandleTitlesCurrentCommand(CommandHandler handler, uint titleId) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -48,7 +48,7 @@ namespace Game.Chat.Commands static bool HandleTitlesAddCommand(CommandHandler handler, uint titleId) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -79,7 +79,7 @@ namespace Game.Chat.Commands static bool HandleTitlesRemoveCommand(CommandHandler handler, uint titleId) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; @@ -120,7 +120,7 @@ namespace Game.Chat.Commands static bool HandleTitlesSetMaskCommand(CommandHandler handler, ulong mask) { Player target = handler.GetSelectedPlayer(); - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.NoCharSelected); return false; diff --git a/Source/Game/Chat/Commands/WPCommands.cs b/Source/Game/Chat/Commands/WPCommands.cs index 41bce7675..165cd861c 100644 --- a/Source/Game/Chat/Commands/WPCommands.cs +++ b/Source/Game/Chat/Commands/WPCommands.cs @@ -25,7 +25,7 @@ namespace Game.Chat.Commands if (!optionalPathId.HasValue) { - if (target) + if (target != null) pathId = target.GetWaypointPath(); else { @@ -321,7 +321,7 @@ namespace Game.Chat.Commands uint pathId = optionalPathId.Value; - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -397,7 +397,7 @@ namespace Game.Chat.Commands Creature target = handler.GetSelectedCreature(); // User did select a visual waypoint? - if (!target || target.GetEntry() != 1) + if (target == null || target.GetEntry() != 1) { handler.SendSysMessage("|cffff33ffERROR: You must select a waypoint.|r"); return false; @@ -487,7 +487,7 @@ namespace Game.Chat.Commands // What to do: // Move the visual spawnpoint // Respawn the owner of the waypoints - if (!Creature.DeleteFromDB(target.GetSpawnId())) + if (Creature.DeleteFromDB(target.GetSpawnId())) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1); return false; @@ -495,7 +495,7 @@ namespace Game.Chat.Commands // re-create Creature creature = Creature.CreateCreature(1, map, chr.GetPosition()); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1); return false; @@ -512,7 +512,7 @@ namespace Game.Chat.Commands // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells(); creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1); return false; @@ -575,7 +575,7 @@ namespace Game.Chat.Commands // No PathID provided // . Player must have selected a creature - if (!target) + if (target == null) { handler.SendSysMessage(CypherStrings.SelectCreature); return false; @@ -588,7 +588,7 @@ namespace Game.Chat.Commands // PathID provided // Warn if player also selected a creature // . Creature selection is ignored <- - if (target) + if (target != null) handler.SendSysMessage(CypherStrings.WaypointCreatselected); pathId = optionalPathId.Value; @@ -598,7 +598,7 @@ namespace Game.Chat.Commands if (subCommand == "info") { // Check if the user did specify a visual waypoint - if (!target || target.GetEntry() != 1) + if (target == null || target.GetEntry() != 1) { handler.SendSysMessage(CypherStrings.WaypointVpSelect); return false; @@ -661,7 +661,7 @@ namespace Game.Chat.Commands { ulong wpguid = result2.Read(0); - if (!Creature.DeleteFromDB(wpguid)) + if (Creature.DeleteFromDB(wpguid)) { handler.SendSysMessage(CypherStrings.WaypointNotremoved, wpguid); hasError = true; @@ -692,7 +692,7 @@ namespace Game.Chat.Commands Map map = chr.GetMap(); Creature creature = Creature.CreateCreature(id, map, new Position(x, y, z, o)); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, id); return false; @@ -709,13 +709,13 @@ namespace Game.Chat.Commands // To call _LoadGoods(); _LoadQuests(); CreateTrainerSpells(); creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, id); return false; } - if (target) + if (target != null) { creature.SetDisplayId(target.GetDisplayId()); creature.SetObjectScale(0.5f); @@ -758,7 +758,7 @@ namespace Game.Chat.Commands Map map = chr.GetMap(); Creature creature = Creature.CreateCreature(1, map, new Position(x, y, z, 0)); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1); return false; @@ -774,13 +774,13 @@ namespace Game.Chat.Commands creature.Dispose(); creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointVpNotcreated, 1); return false; } - if (target) + if (target != null) { creature.SetDisplayId(target.GetDisplayId()); creature.SetObjectScale(0.5f); @@ -813,7 +813,7 @@ namespace Game.Chat.Commands Position pos = new(x, y, z, o); Creature creature = Creature.CreateCreature(1, map, pos); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointNotcreated, 1); return false; @@ -829,13 +829,13 @@ namespace Game.Chat.Commands creature.Dispose(); creature = Creature.CreateCreatureFromDB(dbGuid, map, true, true); - if (!creature) + if (creature == null) { handler.SendSysMessage(CypherStrings.WaypointNotcreated, 1); return false; } - if (target) + if (target != null) { creature.SetDisplayId(target.GetDisplayId()); creature.SetObjectScale(0.5f); @@ -860,7 +860,7 @@ namespace Game.Chat.Commands { ulong lowguid = result.Read(0); - if (!Creature.DeleteFromDB(lowguid)) + if (Creature.DeleteFromDB(lowguid)) { handler.SendSysMessage(CypherStrings.WaypointNotremoved, lowguid); hasError = true; @@ -892,7 +892,7 @@ namespace Game.Chat.Commands static bool HandleWpUnLoadCommand(CommandHandler handler) { Creature target = handler.GetSelectedCreature(); - if (!target) + if (target == null) { handler.SendSysMessage("|cff33ffffYou must select a target.|r"); return true; diff --git a/Source/Game/Combat/CombatManager.cs b/Source/Game/Combat/CombatManager.cs index ccec312d2..14697be8b 100644 --- a/Source/Game/Combat/CombatManager.cs +++ b/Source/Game/Combat/CombatManager.cs @@ -51,7 +51,7 @@ namespace Game.Combat Player playerA = a.GetCharmerOrOwnerPlayerOrPlayerItself(); Player playerB = b.GetCharmerOrOwnerPlayerOrPlayerItself(); // ...neither of the two units must be (owned by) a player with .gm on - if ((playerA && playerA.IsGameMaster()) || (playerB && playerB.IsGameMaster())) + if ((playerA != null && playerA.IsGameMaster()) || (playerB != null && playerB.IsGameMaster())) return false; return true; } diff --git a/Source/Game/Combat/ThreatManager.cs b/Source/Game/Combat/ThreatManager.cs index 3481ddd5d..7478f134a 100644 --- a/Source/Game/Combat/ThreatManager.cs +++ b/Source/Game/Combat/ThreatManager.cs @@ -38,7 +38,7 @@ namespace Game.Combat { Creature cWho = who.ToCreature(); // only creatures can have threat list - if (!cWho) + if (cWho == null) return false; // pets, totems and triggers cannot have threat list @@ -263,7 +263,7 @@ namespace Game.Combat else redirTarget = Global.ObjAccessor.GetUnit(_owner, pair.Item1); - if (redirTarget) + if (redirTarget != null) { float amountRedirected = MathFunctions.CalculatePct(origAmount, pair.Item2); AddThreat(redirTarget, amountRedirected, spell, true, true); @@ -397,7 +397,7 @@ namespace Game.Combat public void FixateTarget(Unit target) { - if (target) + if (target != null) { var it = _myThreatListEntries.LookupByKey(target.GetGUID()); if (it != null) diff --git a/Source/Game/Conditions/Condition.cs b/Source/Game/Conditions/Condition.cs index ef8995388..1e81e7f42 100644 --- a/Source/Game/Conditions/Condition.cs +++ b/Source/Game/Conditions/Condition.cs @@ -315,12 +315,12 @@ namespace Game.Conditions case ConditionTypes.CreatureType: { Creature creature = obj.ToCreature(); - if (creature) + if (creature != null) condMeets = (uint)creature.GetCreatureTemplate().CreatureType == ConditionValue1; break; } case ConditionTypes.InWater: - if (unit) + if (unit != null) condMeets = unit.IsInWater(); break; case ConditionTypes.TerrainSwap: @@ -328,7 +328,7 @@ namespace Game.Conditions break; case ConditionTypes.StandState: { - if (unit) + if (unit != null) { if (ConditionValue1 == 0) condMeets = (unit.GetStandState() == (UnitStandStateType)ConditionValue2); @@ -341,35 +341,35 @@ namespace Game.Conditions } case ConditionTypes.DailyQuestDone: { - if (player) + if (player != null) condMeets = player.IsDailyQuestDone(ConditionValue1); break; } case ConditionTypes.Charmed: { - if (unit) + if (unit != null) condMeets = unit.IsCharmed(); break; } case ConditionTypes.PetType: { - if (player) + if (player != null) { Pet pet = player.GetPet(); - if (pet) + if (pet != null) condMeets = (((1 << (int)pet.GetPetType()) & ConditionValue1) != 0); } break; } case ConditionTypes.Taxi: { - if (player) + if (player != null) condMeets = player.IsInFlight(); break; } case ConditionTypes.Queststate: { - if (player) + if (player != null) { if ( (Convert.ToBoolean(ConditionValue2 & (1 << (int)QuestStatus.None)) && (player.GetQuestStatus(ConditionValue1) == QuestStatus.None)) || @@ -384,7 +384,7 @@ namespace Game.Conditions } case ConditionTypes.ObjectiveProgress: { - if (player) + if (player != null) { QuestObjective questObj = Global.ObjectMgr.GetQuestObjective(ConditionValue1); if (questObj == null) diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs index 15f7fca0e..d8cd89bc4 100644 --- a/Source/Game/Conditions/ConditionManager.cs +++ b/Source/Game/Conditions/ConditionManager.cs @@ -2165,7 +2165,7 @@ namespace Game if (condition.WeaponSubclassMask != 0) { Item mainHand = player.GetItemByPos(InventorySlots.Bag0, EquipmentSlot.MainHand); - if (!mainHand || !Convert.ToBoolean((1 << (int)mainHand.GetTemplate().GetSubClass()) & condition.WeaponSubclassMask)) + if (mainHand == null || !Convert.ToBoolean((1 << (int)mainHand.GetTemplate().GetSubClass()) & condition.WeaponSubclassMask)) return false; } @@ -2175,23 +2175,23 @@ namespace Game switch (condition.PartyStatus) { case 1: - if (group) + if (group != null) return false; break; case 2: - if (!group) + if (group == null) return false; break; case 3: - if (!group || group.IsRaidGroup()) + if (group == null || group.IsRaidGroup()) return false; break; case 4: - if (!group || !group.IsRaidGroup()) + if (group == null || !group.IsRaidGroup()) return false; break; case 5: - if (group && group.IsRaidGroup()) + if (group != null && group.IsRaidGroup()) return false; break; default: @@ -2558,19 +2558,19 @@ namespace Game case UnitConditionVariable.IsMyPet: return (otherUnit != null && unit.GetCharmerOrOwnerGUID() == otherUnit.GetGUID()) ? 1 : 0; case UnitConditionVariable.IsMaster: - return (otherUnit && otherUnit.GetCharmerOrOwnerGUID() == unit.GetGUID()) ? 1 : 0; + return (otherUnit != null && otherUnit.GetCharmerOrOwnerGUID() == unit.GetGUID()) ? 1 : 0; case UnitConditionVariable.IsTarget: - return (otherUnit && otherUnit.GetTarget() == unit.GetGUID()) ? 1 : 0; + return (otherUnit != null && otherUnit.GetTarget() == unit.GetGUID()) ? 1 : 0; case UnitConditionVariable.CanAssist: - return (otherUnit && unit.IsValidAssistTarget(otherUnit)) ? 1 : 0; + return (otherUnit != null && unit.IsValidAssistTarget(otherUnit)) ? 1 : 0; case UnitConditionVariable.CanAttack: - return (otherUnit && unit.IsValidAttackTarget(otherUnit)) ? 1 : 0; + return (otherUnit != null && unit.IsValidAttackTarget(otherUnit)) ? 1 : 0; case UnitConditionVariable.HasPet: return (!unit.GetCharmedGUID().IsEmpty() || !unit.GetMinionGUID().IsEmpty()) ? 1 : 0; case UnitConditionVariable.HasWeapon: Player player = unit.ToPlayer(); if (player != null) - return (player.GetWeaponForAttack(WeaponAttackType.BaseAttack) || player.GetWeaponForAttack(WeaponAttackType.OffAttack)) ? 1 : 0; + return (player.GetWeaponForAttack(WeaponAttackType.BaseAttack) != null || player.GetWeaponForAttack(WeaponAttackType.OffAttack) != null) ? 1 : 0; return (unit.GetVirtualItemId(0) != 0 || unit.GetVirtualItemId(1) != 0) ? 1 : 0; case UnitConditionVariable.HealthPct: return (int)unit.GetHealthPct(); @@ -2631,9 +2631,9 @@ namespace Game case UnitConditionVariable.IsAttackingMe: return (otherUnit != null && unit.GetTarget() == otherUnit.GetGUID()) ? 1:0; case UnitConditionVariable.Range: - return otherUnit ? (int)unit.GetExactDist(otherUnit) : 0; + return otherUnit != null ? (int)unit.GetExactDist(otherUnit) : 0; case UnitConditionVariable.InMeleeRange: - if (otherUnit) + if (otherUnit != null) { float distance = Math.Max(unit.GetCombatReach() + otherUnit.GetCombatReach() + 1.3333334f, 5.0f); if (unit.HasUnitFlag(UnitFlags.PlayerControlled) || otherUnit.HasUnitFlag(UnitFlags.PlayerControlled)) @@ -2740,7 +2740,7 @@ namespace Game case UnitConditionVariable.HasAura: return unit.HasAura((uint)value) ? value : 0; case UnitConditionVariable.IsEnemy: - return (otherUnit && unit.GetReactionTo(otherUnit) <= ReputationRank.Hostile) ? 1 : 0; + return (otherUnit != null && unit.GetReactionTo(otherUnit) <= ReputationRank.Hostile) ? 1 : 0; case UnitConditionVariable.IsSpecMelee: return unit.IsPlayer() && unit.ToPlayer().GetPrimarySpecializationEntry() != null && unit.ToPlayer().GetPrimarySpecializationEntry().GetFlags().HasFlag(ChrSpecializationFlag.Melee) ? 1 : 0; case UnitConditionVariable.IsSpecTank: @@ -2760,11 +2760,11 @@ namespace Game case UnitConditionVariable.Label: break; case UnitConditionVariable.IsMySummon: - return (otherUnit && (otherUnit.GetCharmerGUID() == unit.GetGUID() || otherUnit.GetCreatorGUID() == unit.GetGUID())) ? 1 : 0; + return (otherUnit != null && (otherUnit.GetCharmerGUID() == unit.GetGUID() || otherUnit.GetCreatorGUID() == unit.GetGUID())) ? 1 : 0; case UnitConditionVariable.IsSummoner: - return (otherUnit && (unit.GetCharmerGUID() == otherUnit.GetGUID() || unit.GetCreatorGUID() == otherUnit.GetGUID())) ? 1 : 0; + return (otherUnit != null && (unit.GetCharmerGUID() == otherUnit.GetGUID() || unit.GetCreatorGUID() == otherUnit.GetGUID())) ? 1 : 0; case UnitConditionVariable.IsMyTarget: - return (otherUnit && unit.GetTarget() == otherUnit.GetGUID()) ? 1 : 0; + return (otherUnit != null && unit.GetTarget() == otherUnit.GetGUID()) ? 1 : 0; case UnitConditionVariable.Sex: return (int)unit.GetGender(); case UnitConditionVariable.LevelWithinContentTuning: diff --git a/Source/Game/DataStorage/WhoListStorage.cs b/Source/Game/DataStorage/WhoListStorage.cs index 1ac8fe810..aca3c299c 100644 --- a/Source/Game/DataStorage/WhoListStorage.cs +++ b/Source/Game/DataStorage/WhoListStorage.cs @@ -68,7 +68,7 @@ namespace Game.DataStorage Guild guild = player.GetGuild(); ObjectGuid guildGuid = ObjectGuid.Empty; - if (guild) + if (guild != null) guildGuid = guild.GetGUID(); _whoListStorage.Add(new WhoListPlayerInfo(player.GetGUID(), player.GetTeam(), player.GetSession().GetSecurity(), player.GetLevel(), diff --git a/Source/Game/DungeonFinding/LFGManager.cs b/Source/Game/DungeonFinding/LFGManager.cs index 72f14e76f..ecf5d44af 100644 --- a/Source/Game/DungeonFinding/LFGManager.cs +++ b/Source/Game/DungeonFinding/LFGManager.cs @@ -343,7 +343,7 @@ namespace Game.DungeonFinding public void JoinLfg(Player player, LfgRoles roles, List dungeons) { - if (!player || player.GetSession() == null || dungeons.Empty()) + if (player == null || player.GetSession() == null || dungeons.Empty()) return; // Sanitize input roles @@ -356,11 +356,11 @@ namespace Game.DungeonFinding Group grp = player.GetGroup(); ObjectGuid guid = player.GetGUID(); - ObjectGuid gguid = grp ? grp.GetGUID() : guid; + ObjectGuid gguid = grp != null ? grp.GetGUID() : guid; LfgJoinResultData joinData = new(); List players = new(); uint rDungeonId = 0; - bool isContinue = grp && grp.IsLFGGroup() && GetState(gguid) != LfgState.FinishedDungeon; + bool isContinue = grp != null && grp.IsLFGGroup() && GetState(gguid) != LfgState.FinishedDungeon; // Do not allow to change dungeon in the middle of a current dungeon if (isContinue) @@ -390,7 +390,7 @@ namespace Game.DungeonFinding joinData.result = LfgJoinResult.NoSlots; else if (player.HasAura(9454)) // check Freeze debuff joinData.result = LfgJoinResult.NoSlots; - else if (grp) + else if (grp != null) { if (grp.GetMembersCount() > MapConst.MaxGroupSize) joinData.result = LfgJoinResult.TooManyMembers; @@ -399,24 +399,24 @@ namespace Game.DungeonFinding byte memberCount = 0; for (GroupReference refe = grp.GetFirstMember(); refe != null && joinData.result == LfgJoinResult.Ok; refe = refe.Next()) { - Player plrg = refe.GetSource(); - if (plrg) + Player groupPlayer = refe.GetSource(); + if (groupPlayer != null) { - if (!plrg.GetSession().HasPermission(RBACPermissions.JoinDungeonFinder)) + if (!groupPlayer.GetSession().HasPermission(RBACPermissions.JoinDungeonFinder)) joinData.result = LfgJoinResult.NoLfgObject; - if (plrg.HasAura(SharedConst.LFGSpellDungeonDeserter)) + if (groupPlayer.HasAura(SharedConst.LFGSpellDungeonDeserter)) joinData.result = LfgJoinResult.DeserterParty; - else if (!isContinue && plrg.HasAura(SharedConst.LFGSpellDungeonCooldown)) + else if (!isContinue && groupPlayer.HasAura(SharedConst.LFGSpellDungeonCooldown)) joinData.result = LfgJoinResult.RandomCooldownParty; - else if (plrg.InBattleground() || plrg.InArena() || plrg.InBattlegroundQueue()) + else if (groupPlayer.InBattleground() || groupPlayer.InArena() || groupPlayer.InBattlegroundQueue()) joinData.result = LfgJoinResult.CantUseDungeons; - else if (plrg.HasAura(9454)) // check Freeze debuff + else if (groupPlayer.HasAura(9454)) // check Freeze debuff { joinData.result = LfgJoinResult.NoSlots; - joinData.playersMissingRequirement.Add(plrg.GetName()); + joinData.playersMissingRequirement.Add(groupPlayer.GetName()); } ++memberCount; - players.Add(plrg.GetGUID()); + players.Add(groupPlayer.GetGUID()); } } @@ -480,7 +480,7 @@ namespace Game.DungeonFinding // Can't join. Send result if (joinData.result != LfgJoinResult.Ok) { - Log.outDebug(LogFilter.Lfg, "Join: [{0}] joining with {1} members. result: {2}", guid, grp ? grp.GetMembersCount() : 1, joinData.result); + Log.outDebug(LogFilter.Lfg, "Join: [{0}] joining with {1} members. result: {2}", guid, grp != null ? grp.GetMembersCount() : 1, joinData.result); if (!dungeons.Empty()) // Only should show lockmap when have no dungeons available joinData.lockmap.Clear(); player.GetSession().SendLfgJoinResult(joinData); @@ -500,7 +500,7 @@ namespace Game.DungeonFinding ticket.Time = GameTime.GetGameTime(); string debugNames = ""; - if (grp) // Begin rolecheck + if (grp != null) // Begin rolecheck { // Create new rolecheck LfgRoleCheck roleCheck = new(); @@ -524,7 +524,7 @@ namespace Game.DungeonFinding for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next()) { Player plrg = refe.GetSource(); - if (plrg) + if (plrg != null) { ObjectGuid pguid = plrg.GetGUID(); plrg.GetSession().SendLfgUpdateStatus(updateData, true); @@ -567,7 +567,7 @@ namespace Game.DungeonFinding debugNames += player.GetName(); } StringBuilder o = new(); - o.AppendFormat("Join: [{0}] joined ({1}{2}) Members: {3}. Dungeons ({4}): ", guid, (grp ? "group" : "player"), debugNames, dungeons.Count, ConcatenateDungeons(dungeons)); + o.AppendFormat("Join: [{0}] joined ({1}{2}) Members: {3}. Dungeons ({4}): ", guid, (grp != null ? "group" : "player"), debugNames, dungeons.Count, ConcatenateDungeons(dungeons)); Log.outDebug(LogFilter.Lfg, o.ToString()); } @@ -780,7 +780,7 @@ namespace Game.DungeonFinding { LFGDungeonData dungeon = GetLFGDungeon(dungeonId); Cypher.Assert(dungeon != null); - Cypher.Assert(player); + Cypher.Assert(player != null); MapDb2Entries entries = new(dungeon.map, dungeon.difficulty); InstanceLock playerBind = Global.InstanceLockMgr.FindActiveInstanceLock(guid, entries); if (playerBind != null) @@ -926,14 +926,14 @@ namespace Game.DungeonFinding foreach (var pguid in players) { Player player = Global.ObjAccessor.FindConnectedPlayer(pguid); - if (!player) + if (player == null) continue; Group group = player.GetGroup(); - if (group && group != grp) + if (group != null && group != grp) group.RemoveMember(player.GetGUID()); - if (!grp) + if (grp == null) { grp = new Group(); grp.ConvertToLFG(); @@ -969,7 +969,7 @@ namespace Game.DungeonFinding foreach (var it in playersToTeleport) { Player player = Global.ObjAccessor.FindPlayer(it); - if (player) + if (player != null) TeleportPlayer(player, false); } @@ -1248,7 +1248,7 @@ namespace Game.DungeonFinding if (agreeNum == SharedConst.LFGKickVotesNeeded) // Vote passed - Kick player { Group group = Global.GroupMgr.GetGroupByGUID(gguid); - if (group) + if (group != null) Player.RemoveFromGroup(group, boot.victim, RemoveMethod.KickLFG); DecreaseKicksLeft(gguid); } @@ -1260,7 +1260,7 @@ namespace Game.DungeonFinding LFGDungeonData dungeon = null; Group group = player.GetGroup(); - if (group && group.IsLFGGroup()) + if (group != null && group.IsLFGGroup()) dungeon = GetLFGDungeon(GetDungeon(group.GetGUID())); if (dungeon == null) @@ -1286,7 +1286,7 @@ namespace Game.DungeonFinding error = LfgTeleportResult.Falling; else if (player.IsMirrorTimerActive(MirrorTimerType.Fatigue)) error = LfgTeleportResult.Exhaustion; - else if (player.GetVehicle()) + else if (player.GetVehicle() != null) error = LfgTeleportResult.OnTransport; else if (!player.GetCharmedGUID().IsEmpty()) error = LfgTeleportResult.ImmuneToSummons; @@ -1306,7 +1306,7 @@ namespace Game.DungeonFinding for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player plrg = refe.GetSource(); - if (plrg && plrg != player && plrg.GetMapId() == dungeon.map) + if (plrg != null && plrg != player && plrg.GetMapId() == dungeon.map) { mapid = plrg.GetMapId(); x = plrg.GetPositionX(); @@ -1580,7 +1580,7 @@ namespace Game.DungeonFinding { Dictionary lockDic = new(); Player player = Global.ObjAccessor.FindConnectedPlayer(guid); - if (!player) + if (player == null) { Log.outWarn(LogFilter.Lfg, "{0} not ingame while retrieving his LockedDungeons.", guid.ToString()); return lockDic; @@ -1855,49 +1855,49 @@ namespace Game.DungeonFinding public void SendLfgRoleChosen(ObjectGuid guid, ObjectGuid pguid, LfgRoles roles) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgRoleChosen(pguid, roles); } public void SendLfgRoleCheckUpdate(ObjectGuid guid, LfgRoleCheck roleCheck) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgRoleCheckUpdate(roleCheck); } public void SendLfgUpdateStatus(ObjectGuid guid, LfgUpdateData data, bool party) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgUpdateStatus(data, party); } public void SendLfgJoinResult(ObjectGuid guid, LfgJoinResultData data) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgJoinResult(data); } public void SendLfgBootProposalUpdate(ObjectGuid guid, LfgPlayerBoot boot) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgBootProposalUpdate(boot); } public void SendLfgUpdateProposal(ObjectGuid guid, LfgProposal proposal) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgProposalUpdate(proposal); } public void SendLfgQueueStatus(ObjectGuid guid, LfgQueueStatusData data) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.GetSession().SendLfgQueueStatus(data); } diff --git a/Source/Game/DungeonFinding/LFGScripts.cs b/Source/Game/DungeonFinding/LFGScripts.cs index 4957a24d3..fd4c8436f 100644 --- a/Source/Game/DungeonFinding/LFGScripts.cs +++ b/Source/Game/DungeonFinding/LFGScripts.cs @@ -20,7 +20,7 @@ namespace Game.DungeonFinding if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser)) return; - if (!player.GetGroup()) + if (player.GetGroup() == null) Global.LFGMgr.LeaveLfg(player.GetGUID()); else if (player.GetSession().PlayerDisconnected()) Global.LFGMgr.LeaveLfg(player.GetGUID(), true); @@ -36,7 +36,7 @@ namespace Game.DungeonFinding ObjectGuid gguid = Global.LFGMgr.GetGroup(guid); Group group = player.GetGroup(); - if (group) + if (group != null) { ObjectGuid gguid2 = group.GetGUID(); if (gguid != gguid2) @@ -61,7 +61,7 @@ namespace Game.DungeonFinding // if for some reason the LFG system recognises the player as being in a LFG dungeon, // but the player was loaded without a valid group, we'll teleport to homebind to prevent // crashes or other undefined behaviour - if (!group) + if (group == null) { Global.LFGMgr.LeaveLfg(player.GetGUID()); player.RemoveAurasDueToSpell(SharedConst.LFGSpellLuckOfTheDraw); @@ -86,7 +86,7 @@ namespace Game.DungeonFinding else { Group group = player.GetGroup(); - if (group && group.GetMembersCount() == 1) + if (group != null && group.GetMembersCount() == 1) { Global.LFGMgr.LeaveLfg(group.GetGUID()); group.Disband(); @@ -170,7 +170,7 @@ namespace Game.DungeonFinding byte players = Global.LFGMgr.RemovePlayerFromGroup(gguid, guid); Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (method == RemoveMethod.Leave && state == LfgState.Dungeon && players >= SharedConst.LFGKickVotesNeeded) @@ -188,7 +188,7 @@ namespace Game.DungeonFinding if (isLFG && state != LfgState.FinishedDungeon) // Need more players to finish the dungeon { Player leader = Global.ObjAccessor.FindPlayer(Global.LFGMgr.GetLeader(gguid)); - if (leader) + if (leader != null) leader.GetSession().SendLfgOfferContinue(Global.LFGMgr.GetDungeon(gguid, false)); } } diff --git a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs index b717e41dc..8360e7a83 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs @@ -60,7 +60,7 @@ namespace Game.Entities _isRemoved = true; Unit caster = GetCaster(); - if (caster) + if (caster != null) caster._UnregisterAreaTrigger(this); _ai.OnRemove(); @@ -78,7 +78,7 @@ namespace Game.Entities bool Create(uint areaTriggerCreatePropertiesId, Unit caster, Unit target, SpellInfo spellInfo, Position pos, int duration, SpellCastVisualField spellVisual, Spell spell, AuraEffect aurEff) { - _targetGuid = target ? target.GetGUID() : ObjectGuid.Empty; + _targetGuid = target != null ? target.GetGUID() : ObjectGuid.Empty; _aurEff = aurEff; SetMap(caster.GetMap()); @@ -138,7 +138,7 @@ namespace Game.Entities PhasingHandler.InheritPhaseShift(this, caster); - if (target && GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) + if (target != null && GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) { m_movementInfo.transport.guid = target.GetGUID(); } @@ -153,7 +153,7 @@ namespace Game.Entities if (GetCreateProperties().OrbitInfo != null) { AreaTriggerOrbitInfo orbit = GetCreateProperties().OrbitInfo; - if (target && GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) + if (target != null && GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) orbit.PathTarget = target.GetGUID(); else orbit.Center = new(pos.posX, pos.posY, pos.posZ); @@ -297,7 +297,7 @@ namespace Game.Entities else if (GetTemplate() != null && GetTemplate().HasFlag(AreaTriggerFlags.HasAttached)) { Unit target = GetTarget(); - if (target) + if (target != null) GetMap().AreaTriggerRelocation(this, target.GetPositionX(), target.GetPositionY(), target.GetPositionZ(), target.GetOrientation()); } else @@ -607,7 +607,7 @@ namespace Game.Entities foreach (Unit unit in enteringUnits) { Player player = unit.ToPlayer(); - if (player) + if (player != null) { if (player.IsDebugAreaTriggers) player.SendSysMessage(CypherStrings.DebugAreatriggerEntered, GetEntry()); @@ -623,10 +623,10 @@ namespace Game.Entities foreach (ObjectGuid exitUnitGuid in exitUnits) { Unit leavingUnit = Global.ObjAccessor.GetUnit(this, exitUnitGuid); - if (leavingUnit) + if (leavingUnit != null) { Player player = leavingUnit.ToPlayer(); - if (player) + if (player != null) { if (player.IsDebugAreaTriggers) player.SendSysMessage(CypherStrings.DebugAreatriggerLeft, GetEntry()); @@ -673,7 +673,7 @@ namespace Game.Entities public override uint GetFaction() { Unit caster = GetCaster(); - if (caster) + if (caster != null) return caster.GetFaction(); return 0; @@ -958,7 +958,7 @@ namespace Game.Entities if (_orbitInfo.PathTarget.HasValue) { WorldObject center = Global.ObjAccessor.GetWorldObject(this, _orbitInfo.PathTarget.Value); - if (center) + if (center != null) return center; } @@ -1188,10 +1188,10 @@ namespace Game.Entities void DebugVisualizePosition() { Unit caster = GetCaster(); - if (caster) + if (caster != null) { Player player = caster.ToPlayer(); - if (player) + if (player != null) if (player.IsDebugAreaTriggers) player.SummonCreature(1, this, TempSummonType.TimedDespawn, TimeSpan.FromMilliseconds(GetTimeToTarget())); } diff --git a/Source/Game/Entities/Conversation.cs b/Source/Game/Entities/Conversation.cs index 512b96dc5..01447e2b8 100644 --- a/Source/Game/Entities/Conversation.cs +++ b/Source/Game/Entities/Conversation.cs @@ -428,7 +428,7 @@ namespace Game.Entities break; } - if (bestFit) + if (bestFit != null) _conversation.AddActor(_actor.Id, _actor.Index, bestFit.GetGUID()); } diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index 889597f81..379167692 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -682,7 +682,7 @@ namespace Game.Entities public void DoFleeToGetAssistance() { - if (!GetVictim()) + if (GetVictim() == null) return; if (HasAuraType(AuraType.PreventsFleeing)) @@ -699,7 +699,7 @@ namespace Game.Entities SetNoSearchAssistance(true); - if (!creature) + if (creature == null) SetControlled(true, UnitState.Fleeing); else GetMotionMaster().MoveSeekAssistance(creature.GetPositionX(), creature.GetPositionY(), creature.GetPositionZ()); @@ -757,7 +757,7 @@ namespace Game.Entities lowGuid = map.GenerateLowGuid(HighGuid.Creature); Creature creature = new(); - if (!creature.Create(lowGuid, map, entry, pos, null, vehId)) + if (creature.Create(lowGuid, map, entry, pos, null, vehId)) return null; return creature; @@ -766,7 +766,7 @@ namespace Game.Entities public static Creature CreateCreatureFromDB(ulong spawnId, Map map, bool addToMap = true, bool allowDuplicate = false) { Creature creature = new(); - if (!creature.LoadFromDB(spawnId, map, addToMap, allowDuplicate)) + if (creature.LoadFromDB(spawnId, map, addToMap, allowDuplicate)) return null; return creature; @@ -882,21 +882,21 @@ namespace Game.Entities { // We're a player pet, probably target = GetAttackerForHelper(); - if (!target && IsSummon()) + if (target == null && IsSummon()) { Unit owner = ToTempSummon().GetOwner(); if (owner != null) { if (owner.IsInCombat()) target = owner.GetAttackerForHelper(); - if (!target) + if (target == null) { foreach (var itr in owner.m_Controlled) { if (itr.IsInCombat()) { target = itr.GetAttackerForHelper(); - if (target) + if (target != null) break; } } @@ -907,7 +907,7 @@ namespace Game.Entities else return null; - if (target && _IsTargetAcceptable(target) && CanCreatureAttack(target)) + if (target != null && _IsTargetAcceptable(target) && CanCreatureAttack(target)) { if (!HasSpellFocus()) SetInFront(target); @@ -915,7 +915,7 @@ namespace Game.Entities } /// @todo a vehicle may eat some mob, so mob should not evade - if (GetVehicle()) + if (GetVehicle() != null) return null; var iAuras = GetAuraEffectsByType(AuraType.ModInvisibility); @@ -1619,7 +1619,7 @@ namespace Game.Entities if (GetSparringHealthPct() == 0) return false; - if (!attacker) + if (attacker == null) return false; if (!attacker.IsCreature()) @@ -2786,7 +2786,7 @@ namespace Game.Entities public override uint GetLevelForTarget(WorldObject target) { Unit unitTarget = target.ToUnit(); - if (unitTarget) + if (unitTarget != null) { if (IsWorldBoss()) { @@ -3161,7 +3161,7 @@ namespace Game.Entities SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Target), newTarget); // If we are not allowed to turn during cast but have a focus target, face the target - if (!turnDisabled && noTurnDuringCast && target) + if (!turnDisabled && noTurnDuringCast && target != null) SetFacingToObject(target, false); if (!noTurnDuringCast) @@ -3222,7 +3222,7 @@ namespace Game.Entities if (!_spellFocusInfo.Target.IsEmpty()) { WorldObject objTarget = Global.ObjAccessor.GetWorldObject(this, _spellFocusInfo.Target); - if (objTarget) + if (objTarget != null) SetFacingToObject(objTarget, false); } else diff --git a/Source/Game/Entities/Creature/Gossip.cs b/Source/Game/Entities/Creature/Gossip.cs index e17a3cb0c..efaf611c6 100644 --- a/Source/Game/Entities/Creature/Gossip.cs +++ b/Source/Game/Entities/Creature/Gossip.cs @@ -545,7 +545,7 @@ namespace Game.Misc // Is there a better way? what about game objects? Creature creature = ObjectAccessor.GetCreature(_session.GetPlayer(), npcGUID); - if (creature) + if (creature != null) { packet.QuestGiverCreatureID = creature.GetEntry(); offer.QuestGiverCreatureID = creature.GetCreatureTemplate().Entry; @@ -612,7 +612,7 @@ namespace Game.Misc // Is there a better way? what about game objects? Creature creature = ObjectAccessor.GetCreature(_session.GetPlayer(), npcGUID); - if (creature) + if (creature != null) packet.QuestGiverCreatureID = creature.GetCreatureTemplate().Entry; packet.QuestID = quest.Id; diff --git a/Source/Game/Entities/DynamicObject.cs b/Source/Game/Entities/DynamicObject.cs index 71cca1ee0..fee725fc5 100644 --- a/Source/Game/Entities/DynamicObject.cs +++ b/Source/Game/Entities/DynamicObject.cs @@ -25,7 +25,7 @@ namespace Game.Entities { // make sure all references were properly removed Cypher.Assert(_aura == null); - Cypher.Assert(!_caster); + Cypher.Assert(_caster == null); Cypher.Assert(!_isViewpoint); _removedAura = null; diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 8a42acad2..a5197bd39 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -84,7 +84,7 @@ namespace Game.Entities return; Unit owner = Global.ObjAccessor.GetUnit(this, ownerGUID); - if (owner) + if (owner != null) { owner.RemoveGameObject(this, false); Cypher.Assert(GetOwnerGUID().IsEmpty()); @@ -114,7 +114,7 @@ namespace Game.Entities if (m_model != null) { Transport trans = ToTransport(); - if (trans) + if (trans != null) trans.SetDelayedAddModelToMap(); else GetMap().InsertGameObjectModel(m_model); @@ -175,7 +175,7 @@ namespace Game.Entities bool Create(uint entry, Map map, Position pos, Quaternion rotation, uint animProgress, GameObjectState goState, uint artKit, bool dynamic, ulong spawnid) { - Cypher.Assert(map); + Cypher.Assert(map != null); SetMap(map); Relocate(pos); @@ -439,7 +439,7 @@ namespace Game.Entities m_perPlayerState.Remove(guid); - if (seer) + if (seer != null) { if (despawned) { @@ -475,7 +475,7 @@ namespace Game.Entities Unit owner = GetOwner(); if (goInfo.Trap.charges == 2) m_cooldownTime = GameTime.GetGameTimeMS() + 10 * Time.InMilliseconds; // Hardcoded tooltip value - else if (owner) + else if (owner != null) { if (owner.IsInCombat()) m_cooldownTime = GameTime.GetGameTimeMS() + goInfo.Trap.startDelay * Time.InMilliseconds; @@ -632,7 +632,7 @@ namespace Game.Entities target = searcher.GetTarget(); } - if (target) + if (target != null) SetLootState(LootState.Activated, target); } else if (goInfo.type == GameObjectTypes.CapturePoint) @@ -738,7 +738,7 @@ namespace Game.Entities CastSpell(null, goInfo.Trap.spell); SetLootState(LootState.JustDeactivated); } - else if (target) + else if (target != null) { // Some traps do not have a spell but should be triggered CastSpellExtraArgs args = new(); @@ -765,7 +765,7 @@ namespace Game.Entities { // If nearby linked trap exists, despawn it GameObject linkedTrap = GetLinkedTrap(); - if (linkedTrap) + if (linkedTrap != null) linkedTrap.DespawnOrUnsummon(); //if Gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed @@ -1384,7 +1384,7 @@ namespace Game.Entities || LootStorage.Gameobject.HaveQuestLootForPlayer(GetGoInfo().Chest.chestPushLoot, target)) { Battleground bg = target.GetBattleground(); - if (bg) + if (bg != null) return bg.CanActivateGO((int)GetEntry(), (uint)bg.GetPlayerTeam(target.GetGUID())); return true; } @@ -1419,7 +1419,7 @@ namespace Game.Entities return; GameObject trapGO = GetLinkedTrap(); - if (trapGO) + if (trapGO != null) trapGO.CastSpell(target, trapSpell.Id); } @@ -1460,7 +1460,7 @@ namespace Game.Entities public void ActivateObject(GameObjectActions action, int param, WorldObject spellCaster = null, uint spellId = 0, int effectIndex = -1) { - Unit unitCaster = spellCaster ? spellCaster.ToUnit() : null; + Unit unitCaster = spellCaster != null ? spellCaster.ToUnit() : null; switch (action) { @@ -1474,7 +1474,7 @@ namespace Game.Entities SendCustomAnim((uint)(action - GameObjectActions.AnimateCustom0)); break; case GameObjectActions.Disturb: // What's the difference with Open? - if (unitCaster) + if (unitCaster != null) Use(unitCaster); break; case GameObjectActions.Unlock: @@ -1484,11 +1484,11 @@ namespace Game.Entities SetFlag(GameObjectFlags.Locked); break; case GameObjectActions.Open: - if (unitCaster) + if (unitCaster != null) Use(unitCaster); break; case GameObjectActions.OpenAndUnlock: - if (unitCaster) + if (unitCaster != null) UseDoorOrButton(0, false, unitCaster); RemoveFlag(GameObjectFlags.Locked); break; @@ -1499,7 +1499,7 @@ namespace Game.Entities // No use cases, implementation unknown break; case GameObjectActions.Destroy: - if (unitCaster) + if (unitCaster != null) UseDoorOrButton(0, true, unitCaster); break; case GameObjectActions.Rebuild: @@ -1561,7 +1561,7 @@ namespace Game.Entities SetAnimKitId((ushort)param, false); break; case GameObjectActions.OpenAndPlayAnimKit: - if (unitCaster) + if (unitCaster != null) UseDoorOrButton(0, false, unitCaster); SetAnimKitId((ushort)param, false); break; @@ -1576,7 +1576,7 @@ namespace Game.Entities SetAnimKitId(0, false); break; case GameObjectActions.OpenAndStopAnimKit: - if (unitCaster) + if (unitCaster != null) UseDoorOrButton(0, false, unitCaster); SetAnimKitId(0, false); break; @@ -1684,7 +1684,7 @@ namespace Game.Entities case GameObjectTypes.Chest: //3 { Player player = user.ToPlayer(); - if (!player) + if (player == null) return; Battleground bg = player.GetBattleground(); @@ -1922,12 +1922,12 @@ namespace Game.Entities } Group group = player.GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (member) + if (member != null) if (member.IsAtGroupRewardDistance(this)) member.KillCreditGO(info.entry, GetGUID()); } @@ -2044,14 +2044,14 @@ namespace Game.Entities // If fishing skill is high enough, or if fishing on a pool, send correct loot. // Fishing pools have no skill requirement as of patch 3.3.0 (undocumented change). - if (chance >= roll || fishingPool) + if (chance >= roll || fishingPool != null) { // @todo I do not understand this hack. Need some explanation. // prevent removing GO at spell cancel RemoveFromOwner(); SetOwnerGUID(player.GetGUID()); - if (fishingPool) + if (fishingPool != null) { fishingPool.Use(player); SetLootState(LootState.JustDeactivated); @@ -2248,7 +2248,7 @@ namespace Game.Entities { // in Battlegroundcheck Battleground bg = player.GetBattleground(); - if (!bg) + if (bg == null) return; if (player.GetVehicle() != null) @@ -2296,7 +2296,7 @@ namespace Game.Entities { // in Battlegroundcheck Battleground bg = player.GetBattleground(); - if (!bg) + if (bg == null) return; if (player.GetVehicle() != null) @@ -2452,7 +2452,7 @@ namespace Game.Entities Aura artifactAura = player.GetAura(PlayerConst.ArtifactsAllWeaponsGeneralWeaponEquippedPassive); Item item = artifactAura != null ? player.GetItemByGuid(artifactAura.GetCastItemGUID()) : null; - if (!item) + if (item == null) { player.SendPacket(new DisplayGameError(GameError.MustEquipArtifact)); return; @@ -2467,7 +2467,7 @@ namespace Game.Entities case 2: // Heart Forge { Item item = player.GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.Everywhere); - if (!item) + if (item == null) return; GameObjectInteraction openHeartForge = new(); @@ -2484,7 +2484,7 @@ namespace Game.Entities case GameObjectTypes.UILink: { Player player = user.ToPlayer(); - if (!player) + if (player == null) return; GameObjectInteraction gameObjectUILink = new(); @@ -2587,7 +2587,7 @@ namespace Game.Entities } Player player1 = user.ToPlayer(); - if (player1) + if (player1 != null) Global.OutdoorPvPMgr.HandleCustomSpell(player1, spellId, this); if (spellCaster != null) @@ -2794,7 +2794,7 @@ namespace Game.Entities public SpellInfo GetSpellForLock(Player player) { - if (!player) + if (player == null) return null; uint lockId = GetGoInfo().GetLockId(); @@ -2937,7 +2937,7 @@ namespace Game.Entities GetAI().Destroyed(attackerOrHealer, m_goInfo.DestructibleBuilding.DestroyedEvent); Player player = attackerOrHealer != null ? attackerOrHealer.GetCharmerOrOwnerPlayerOrPlayerItself() : null; - if (player) + if (player != null) { Battleground bg = player.GetBattleground(); if (bg != null) @@ -2990,7 +2990,7 @@ namespace Game.Entities public void SetLootState(LootState state, Unit unit = null) { m_lootState = state; - m_lootStateUnitGUID = unit ? unit.GetGUID() : ObjectGuid.Empty; + m_lootStateUnitGUID = unit != null ? unit.GetGUID() : ObjectGuid.Empty; GetAI().OnLootStateChanged((uint)state, unit); // Start restock timer if the chest is partially looted or not looted at all @@ -3437,7 +3437,7 @@ namespace Game.Entities battleground = bg; } - if (!battleground) + if (battleground == null) return; // Cancel current timer @@ -4414,7 +4414,7 @@ namespace Game.Entities FlagState oldState = _state; _state = newState; - if (player && newState == FlagState.Taken) + if (player != null && newState == FlagState.Taken) _carrierGUID = player.GetGUID(); else _carrierGUID = ObjectGuid.Empty; diff --git a/Source/Game/Entities/Item/Bag.cs b/Source/Game/Entities/Item/Bag.cs index 0dbf47a39..2addc13b3 100644 --- a/Source/Game/Entities/Item/Bag.cs +++ b/Source/Game/Entities/Item/Bag.cs @@ -24,7 +24,7 @@ namespace Game.Entities for (byte i = 0; i < ItemConst.MaxBagSize; ++i) { Item item = m_bagslot[i]; - if (item) + if (item != null) { if (item.IsInWorld) { @@ -72,7 +72,7 @@ namespace Game.Entities SetEntry(itemid); SetObjectScale(1.0f); - if (owner) + if (owner != null) { SetOwnerGUID(owner.GetGUID()); SetContainedIn(owner.GetGUID()); diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs index 05d210bc2..e36d64a64 100644 --- a/Source/Game/Entities/Item/Item.cs +++ b/Source/Game/Entities/Item/Item.cs @@ -38,7 +38,7 @@ namespace Game.Entities SetEntry(itemId); SetObjectScale(1.0f); - if (owner) + if (owner != null) { SetOwnerGUID(owner.GetGUID()); SetContainedIn(owner.GetGUID()); @@ -74,7 +74,7 @@ namespace Game.Entities PlayerConditionRecord playerCondition = CliDB.PlayerConditionStorage.LookupByKey(artifactAppearance.UnlockPlayerConditionID); if (playerCondition != null) - if (!owner || !ConditionManager.IsPlayerMeetingCondition(owner, playerCondition)) + if (owner == null || !ConditionManager.IsPlayerMeetingCondition(owner, playerCondition)) continue; SetModifier(ItemModifier.ArtifactAppearanceId, artifactAppearance.Id); @@ -624,7 +624,7 @@ namespace Game.Entities public void CheckArtifactRelicSlotUnlock(Player owner) { - if (!owner) + if (owner == null) return; byte artifactId = GetTemplate().GetArtifactID(); @@ -718,7 +718,7 @@ namespace Game.Entities if (uState == ItemUpdateState.New && state == ItemUpdateState.Removed) { // pretend the item never existed - if (forplayer) + if (forplayer != null) { RemoveItemFromUpdateQueueOf(this, forplayer); forplayer.DeleteRefundReference(GetGUID()); @@ -731,7 +731,7 @@ namespace Game.Entities if (uState != ItemUpdateState.New) uState = state; - if (forplayer) + if (forplayer != null) AddItemToUpdateQueueOf(this, forplayer); } else @@ -825,7 +825,7 @@ namespace Game.Entities SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.StackCount), value); Player player = GetOwner(); - if (player) + if (player != null) { TradeData tradeData = player.GetTradeData(); if (tradeData != null) @@ -1351,7 +1351,7 @@ namespace Game.Entities public override bool AddToObjectUpdate() { Player owner = GetOwner(); - if (owner) + if (owner != null) { owner.GetMap().AddUpdateObject(this); return true; @@ -1363,7 +1363,7 @@ namespace Game.Entities public override void RemoveFromObjectUpdate() { Player owner = GetOwner(); - if (owner) + if (owner != null) owner.GetMap().RemoveUpdateObject(this); } @@ -1509,7 +1509,7 @@ namespace Game.Entities Player owner = GetOwner(); for (byte i = 0; i < ItemConst.MaxStats; ++i) { - if ((owner ? GetItemStatValue(i, owner) : proto.GetStatPercentEditor(i)) != 0) + if ((owner != null ? GetItemStatValue(i, owner) : proto.GetStatPercentEditor(i)) != 0) return true; } @@ -2331,7 +2331,7 @@ namespace Game.Entities public void GiveArtifactXp(ulong amount, Item sourceItem, ArtifactCategory artifactCategoryId) { Player owner = GetOwner(); - if (!owner) + if (owner == null) return; if (artifactCategoryId != 0) diff --git a/Source/Game/Entities/Item/ItemBonusManager.cs b/Source/Game/Entities/Item/ItemBonusManager.cs index 6653d4daf..e52bbd141 100644 --- a/Source/Game/Entities/Item/ItemBonusManager.cs +++ b/Source/Game/Entities/Item/ItemBonusManager.cs @@ -80,7 +80,7 @@ namespace Game.Entities continue; bool meetsPlayerCondition = false; - if (player) + if (player != null) { var playerCondition = CliDB.PlayerConditionStorage.LookupByKey(itemContextPickerEntry.PlayerConditionID); if (playerCondition != null) diff --git a/Source/Game/Entities/Object/WorldObject.cs b/Source/Game/Entities/Object/WorldObject.cs index 2812ed72e..012577b58 100644 --- a/Source/Game/Entities/Object/WorldObject.cs +++ b/Source/Game/Entities/Object/WorldObject.cs @@ -46,7 +46,7 @@ namespace Game.Entities public virtual void Dispose() { // this may happen because there are many !create/delete - if (IsWorldObject() && _currMap) + if (IsWorldObject() && _currMap != null) { if (IsTypeId(TypeId.Corpse)) { @@ -124,7 +124,7 @@ namespace Game.Entities public virtual void BuildCreateUpdateBlockForPlayer(UpdateData data, Player target) { - if (!target) + if (target == null) return; UpdateType updateType = _isNewObject ? UpdateType.CreateObject2 : UpdateType.CreateObject; @@ -148,10 +148,10 @@ namespace Game.Entities flags.SmoothPhasing = true; Unit unit = ToUnit(); - if (unit) + if (unit != null) { flags.PlayHoverAnim = unit.IsPlayingHoverAnim(); - if (unit.GetVictim()) + if (unit.GetVictim() != null) flags.CombatVictim = true; } @@ -223,7 +223,7 @@ namespace Game.Entities public void SendOutOfRangeForPlayer(Player target) { - Cypher.Assert(target); + Cypher.Assert(target != null); UpdateData updateData = new(target.GetMapId()); BuildOutOfRangeUpdateBlock(updateData); @@ -235,7 +235,7 @@ namespace Game.Entities { List PauseTimes = null; GameObject go = ToGameObject(); - if (go) + if (go != null) PauseTimes = go.GetPauseTimes(); data.WriteBit(flags.NoBirthAnim); @@ -1205,11 +1205,11 @@ namespace Game.Entities } Unit target = obj.ToUnit(); - if (target) + if (target != null) { // Don't allow to detect vehicle accessories if you can't see vehicle Unit vehicle = target.GetVehicleBase(); - if (vehicle) + if (vehicle != null) if (!thisPlayer.HaveAtClient(vehicle)) return false; } @@ -1352,7 +1352,7 @@ namespace Game.Entities return true; // Only check back for units, it does not make sense for gameobjects - if (unit && !HasInArc(MathF.PI, obj)) + if (unit != null && !HasInArc(MathF.PI, obj)) return false; // Traps should detect stealth always @@ -1393,7 +1393,7 @@ namespace Game.Entities float visibilityRange = detectionValue * 0.3f + combatReach; // If this unit is an NPC then player detect range doesn't apply - if (unit && unit.IsTypeId(TypeId.Player) && visibilityRange > SharedConst.MaxPlayerStealthDetectRange) + if (unit != null && unit.IsTypeId(TypeId.Player) && visibilityRange > SharedConst.MaxPlayerStealthDetectRange) visibilityRange = SharedConst.MaxPlayerStealthDetectRange; // When checking for alert state, look 8% further, and then 1.5 yards more than that. @@ -1402,7 +1402,7 @@ namespace Game.Entities // If checking for alert, and creature's visibility range is greater than aggro distance, No alert Unit tunit = obj.ToUnit(); - if (checkAlert && unit && unit.ToCreature() && visibilityRange >= unit.ToCreature().GetAttackDistance(tunit) + unit.ToCreature().m_CombatDistance) + if (checkAlert && unit != null && unit.ToCreature() != null && visibilityRange >= unit.ToCreature().GetAttackDistance(tunit) + unit.ToCreature().m_CombatDistance) return false; if (distance > visibilityRange) @@ -1597,7 +1597,7 @@ namespace Game.Entities Map map = GetMap(); GameObject go = GameObject.CreateGameObject(entry, map, pos, rotation, 255, GameObjectState.Ready); - if (!go) + if (go == null) return null; PhasingHandler.InheritPhaseShift(go, this); @@ -1649,7 +1649,7 @@ namespace Game.Entities foreach (var tempSummonData in data) { TempSummon summon = SummonCreature(tempSummonData.entry, tempSummonData.pos, tempSummonData.type, tempSummonData.time); - if (summon) + if (summon != null) list.Add(summon); } } @@ -1827,7 +1827,7 @@ namespace Game.Entities if (spellInfo.RangeEntry.RangeMax[0] == spellInfo.RangeEntry.RangeMax[1]) return spellInfo.GetMaxRange(); - if (!target) + if (target == null) return spellInfo.GetMaxRange(true); return spellInfo.GetMaxRange(!IsHostileTo(target)); @@ -1841,7 +1841,7 @@ namespace Game.Entities if (spellInfo.RangeEntry.RangeMin[0] == spellInfo.RangeEntry.RangeMin[1]) return spellInfo.GetMinRange(); - if (!target) + if (target == null) return spellInfo.GetMinRange(true); return spellInfo.GetMinRange(!IsHostileTo(target)); @@ -1922,7 +1922,7 @@ namespace Game.Entities // cut duration only of negative effects Unit unitTarget = target.ToUnit(); - if (!unitTarget) + if (unitTarget == null) return duration; if (!positive) @@ -1986,7 +1986,7 @@ namespace Game.Entities modOwner.ApplySpellMod(spellInfo, SpellModOp.ChangeCastTime, ref castTime, spell); Unit unitCaster = ToUnit(); - if (!unitCaster) + if (unitCaster == null) return; if (unitCaster.IsPlayer() && unitCaster.ToPlayer().GetCommandStatus(PlayerCommandStates.Casttime)) @@ -2013,7 +2013,7 @@ namespace Game.Entities modOwner.ApplySpellMod(spellInfo, SpellModOp.ChangeCastTime, ref duration, spell); Unit unitCaster = ToUnit(); - if (!unitCaster) + if (unitCaster == null) return; if (!(spellInfo.HasAttribute(SpellAttr0.IsAbility) || spellInfo.HasAttribute(SpellAttr0.IsTradeskill) || spellInfo.HasAttribute(SpellAttr3.IgnoreCasterModifiers)) && @@ -2227,7 +2227,7 @@ namespace Game.Entities bool isAttackableBySummoner(Unit me, ObjectGuid targetGuid) { - if (!me) + if (me == null) return false; TempSummon tempSummon = me.ToTempSummon(); @@ -2252,7 +2252,7 @@ namespace Game.Entities Player targetPlayerOwner = target.GetAffectingPlayer(); // check forced reputation to support SPELL_AURA_FORCE_REACTION - if (selfPlayerOwner) + if (selfPlayerOwner != null) { var targetFactionTemplateEntry = target.GetFactionTemplateEntry(); if (targetFactionTemplateEntry != null) @@ -2262,7 +2262,7 @@ namespace Game.Entities return repRank; } } - else if (targetPlayerOwner) + else if (targetPlayerOwner != null) { var selfFactionTemplateEntry = GetFactionTemplateEntry(); if (selfFactionTemplateEntry != null) @@ -2275,11 +2275,11 @@ namespace Game.Entities Unit unit = ToUnit() ?? selfPlayerOwner; Unit targetUnit = target.ToUnit() ?? targetPlayerOwner; - if (unit && unit.HasUnitFlag(UnitFlags.PlayerControlled)) + if (unit != null && unit.HasUnitFlag(UnitFlags.PlayerControlled)) { - if (targetUnit && targetUnit.HasUnitFlag(UnitFlags.PlayerControlled)) + if (targetUnit != null && targetUnit.HasUnitFlag(UnitFlags.PlayerControlled)) { - if (selfPlayerOwner && targetPlayerOwner) + if (selfPlayerOwner != null && targetPlayerOwner != null) { // always friendly to other unit controlled by player, or to the player himself if (selfPlayerOwner == targetPlayerOwner) @@ -2300,7 +2300,7 @@ namespace Game.Entities if (unit.IsFFAPvP() && targetUnit.IsFFAPvP()) return ReputationRank.Hostile; - if (selfPlayerOwner) + if (selfPlayerOwner != null) { var targetFactionTemplateEntry = targetUnit.GetFactionTemplateEntry(); if (targetFactionTemplateEntry != null) @@ -2605,7 +2605,7 @@ namespace Game.Entities } // CvC case - can attack each other only when one of them is hostile - if (unit && !unit.HasUnitFlag(UnitFlags.PlayerControlled) && unitTarget != null && !unitTarget.HasUnitFlag(UnitFlags.PlayerControlled)) + if (unit != null && !unit.HasUnitFlag(UnitFlags.PlayerControlled) && unitTarget != null && !unitTarget.HasUnitFlag(UnitFlags.PlayerControlled)) return IsHostileTo(unitTarget) || unitTarget.IsHostileTo(this); // Traps without owner or with NPC owner versus Creature case - can attack to creature only when one of them is hostile @@ -2613,7 +2613,7 @@ namespace Game.Entities { Unit goOwner = go.GetOwner(); if (goOwner == null || !goOwner.HasUnitFlag(UnitFlags.PlayerControlled)) - if (unitTarget && !unitTarget.HasUnitFlag(UnitFlags.PlayerControlled)) + if (unitTarget != null && !unitTarget.HasUnitFlag(UnitFlags.PlayerControlled)) return IsHostileTo(unitTarget) || unitTarget.IsHostileTo(this); } @@ -2630,10 +2630,10 @@ namespace Game.Entities return false; // Not all neutral creatures can be attacked (even some unfriendly faction does not react aggresive to you, like Sporaggar) - if ((playerAffectingAttacker && !playerAffectingTarget) || (!playerAffectingAttacker && playerAffectingTarget)) + if ((playerAffectingAttacker != null && playerAffectingTarget == null) || (playerAffectingAttacker == null && playerAffectingTarget != null)) { - Player player = playerAffectingAttacker ? playerAffectingAttacker : playerAffectingTarget; - Unit creature = playerAffectingAttacker ? unitTarget : unit; + Player player = playerAffectingAttacker != null ? playerAffectingAttacker : playerAffectingTarget; + Unit creature = playerAffectingAttacker != null ? unitTarget : unit; if (creature != null) { if (creature.IsContestedGuard() && player.HasPlayerFlag(PlayerFlags.ContestedPVP)) @@ -2658,7 +2658,7 @@ namespace Game.Entities } } - if (playerAffectingAttacker && playerAffectingTarget) + if (playerAffectingAttacker != null && playerAffectingTarget != null) if (playerAffectingAttacker.duel != null && playerAffectingAttacker.duel.Opponent == playerAffectingTarget && playerAffectingAttacker.duel.State == DuelState.InProgress) return true; @@ -2668,7 +2668,7 @@ namespace Game.Entities return false; // additional checks - only PvP case - if (playerAffectingAttacker && playerAffectingTarget) + if (playerAffectingAttacker != null && playerAffectingTarget != null) { if (playerAffectingTarget.IsPvP() || (bySpell != null && bySpell.HasAttribute(SpellAttr5.IgnoreAreaEffectPvpCheck))) return true; @@ -2686,7 +2686,7 @@ namespace Game.Entities // function based on function Unit::CanAssist from 13850 client public bool IsValidAssistTarget(WorldObject target, SpellInfo bySpell = null, bool spellCheck = true) { - Cypher.Assert(target); + Cypher.Assert(target != null); // some negative spells can be casted at friendly target bool isNegativeSpell = bySpell != null && !bySpell.IsPositive(); @@ -2697,7 +2697,7 @@ namespace Game.Entities // can't assist unattackable units Unit unitTarget = target.ToUnit(); - if (unitTarget && unitTarget.HasUnitState(UnitState.Unattackable)) + if (unitTarget != null && unitTarget.HasUnitState(UnitState.Unattackable)) return false; // can't assist GMs @@ -2706,7 +2706,7 @@ namespace Game.Entities // can't assist own vehicle or passenger Unit unit = ToUnit(); - if (unit && unitTarget && unit.GetVehicle()) + if (unit != null && unitTarget != null && unit.GetVehicle() != null) { if (unit.IsOnVehicle(unitTarget)) return false; @@ -2720,7 +2720,7 @@ namespace Game.Entities return false; // can't assist dead - if ((bySpell == null || !bySpell.IsAllowingDeadTarget()) && unitTarget && !unitTarget.IsAlive()) + if ((bySpell == null || !bySpell.IsAllowingDeadTarget()) && unitTarget != null && !unitTarget.IsAlive()) return false; // can't assist untargetable @@ -2750,7 +2750,7 @@ namespace Game.Entities } // can't assist non-friendly targets - if (GetReactionTo(target) < ReputationRank.Neutral && target.GetReactionTo(this) < ReputationRank.Neutral && (!ToCreature() || !ToCreature().HasFlag(CreatureStaticFlags4.TreatAsRaidUnitForHelpfulSpells))) + if (GetReactionTo(target) < ReputationRank.Neutral && target.GetReactionTo(this) < ReputationRank.Neutral && (!IsCreature() || !ToCreature().HasFlag(CreatureStaticFlags4.TreatAsRaidUnitForHelpfulSpells))) return false; // PvP case @@ -2934,7 +2934,7 @@ namespace Game.Entities public void PlayDirectSound(uint soundId, Player target = null, uint broadcastTextId = 0) { PlaySound sound = new(GetGUID(), soundId, broadcastTextId); - if (target) + if (target != null) target.SendPacket(sound); else SendMessageToSet(sound, true); @@ -2942,7 +2942,7 @@ namespace Game.Entities public void PlayDirectMusic(uint musicId, Player target = null) { - if (target) + if (target != null) target.SendPacket(new PlayMusic(musicId)); else SendMessageToSet(new PlayMusic(musicId), true); @@ -2957,7 +2957,7 @@ namespace Game.Entities pkt.Position = GetPosition(); pkt.BroadcastTextID = broadcastTextId; - if (target) + if (target != null) target.SendPacket(pkt); else SendMessageToSet(pkt, true); @@ -3232,7 +3232,7 @@ namespace Game.Entities public bool IsWithinDistInMap(WorldObject obj, float dist2compare, bool is3D = true, bool incOwnRadius = true, bool incTargetRadius = true) { - return obj && IsInMap(obj) && InSamePhase(obj) && _IsWithinDist(obj, dist2compare, is3D, incOwnRadius, incTargetRadius); + return obj != null && IsInMap(obj) && InSamePhase(obj) && _IsWithinDist(obj, dist2compare, is3D, incOwnRadius, incTargetRadius); } public bool IsWithinLOS(float ox, float oy, float oz, LineOfSightChecks checks = LineOfSightChecks.All, ModelIgnoreFlags ignoreFlags = ModelIgnoreFlags.Nothing) @@ -3348,7 +3348,7 @@ namespace Game.Entities public bool IsInBetween(WorldObject obj1, WorldObject obj2, float size = 0) { - return obj1 && obj2 && IsInBetween(obj1.GetPosition(), obj2.GetPosition(), size); + return obj1 != null && obj2 != null && IsInBetween(obj1.GetPosition(), obj2.GetPosition(), size); } public bool IsInBetween(Position pos1, Position pos2, float size) @@ -3480,7 +3480,7 @@ namespace Game.Entities { float effectiveReach = GetCombatReach(); - if (searcher) + if (searcher != null) { effectiveReach += searcher.GetCombatReach(); @@ -3796,11 +3796,6 @@ namespace Game.Entities public FlaggedArray32 m_serverSideVisibility = new(2); public FlaggedArray32 m_serverSideVisibilityDetect = new(2); #endregion - - public static implicit operator bool(WorldObject obj) - { - return obj != null; - } } public class MovementInfo diff --git a/Source/Game/Entities/Pet.cs b/Source/Game/Entities/Pet.cs index 5ca047d06..45ae18317 100644 --- a/Source/Game/Entities/Pet.cs +++ b/Source/Game/Entities/Pet.cs @@ -709,7 +709,7 @@ namespace Game.Entities public bool CreateBaseAtCreature(Creature creature) { - Cypher.Assert(creature); + Cypher.Assert(creature != null); if (!CreateBaseAtTamed(creature.GetCreatureTemplate(), creature.GetMap())) return false; @@ -1251,7 +1251,7 @@ namespace Game.Entities { // need update action bar for last removed rank Unit owner = GetOwner(); - if (owner) + if (owner != null) if (owner.IsTypeId(TypeId.Player)) owner.ToPlayer().PetSpellInitialize(); } @@ -1356,7 +1356,7 @@ namespace Game.Entities public bool Create(ulong guidlow, Map map, uint entry, uint petNumber) { - Cypher.Assert(map); + Cypher.Assert(map != null); SetMap(map); // TODO: counter should be constructed as (summon_count << 32) | petNumber @@ -1458,7 +1458,7 @@ namespace Game.Entities public void SynchronizeLevelWithOwner() { Unit owner = GetOwner(); - if (!owner || !owner.IsTypeId(TypeId.Player)) + if (owner == null || !owner.IsTypeId(TypeId.Player)) return; switch (GetPetType()) @@ -1534,7 +1534,7 @@ namespace Game.Entities public GroupUpdatePetFlags GetGroupUpdateFlag() { return m_groupUpdateMask; } public void SetGroupUpdateFlag(GroupUpdatePetFlags flag) { - if (GetOwner().GetGroup()) + if (GetOwner().GetGroup() != null) { m_groupUpdateMask |= flag; GetOwner().SetGroupUpdateFlag(GroupUpdateFlags.Pet); @@ -1543,7 +1543,7 @@ namespace Game.Entities public void ResetGroupUpdateFlag() { m_groupUpdateMask = GroupUpdatePetFlags.None; - if (GetOwner().GetGroup()) + if (GetOwner().GetGroup() != null) GetOwner().RemoveGroupUpdateFlag(GroupUpdateFlags.Pet); } diff --git a/Source/Game/Entities/Player/CinematicManager.cs b/Source/Game/Entities/Player/CinematicManager.cs index 4219e24a9..3104e8cb0 100644 --- a/Source/Game/Entities/Player/CinematicManager.cs +++ b/Source/Game/Entities/Player/CinematicManager.cs @@ -68,7 +68,7 @@ namespace Game.Entities player.GetMap().LoadGridForActiveObject(pos.GetPositionX(), pos.GetPositionY(), player); m_CinematicObject = player.SummonCreature(1, pos.posX, pos.posY, pos.posZ, 0.0f, TempSummonType.TimedDespawn, TimeSpan.FromMinutes(5)); - if (m_CinematicObject) + if (m_CinematicObject != null) { m_CinematicObject.SetActive(true); player.SetViewpoint(m_CinematicObject, true); @@ -89,10 +89,10 @@ namespace Game.Entities m_cinematicCamera = null; m_activeCinematic = null; m_activeCinematicCameraIndex = -1; - if (m_CinematicObject) + if (m_CinematicObject != null) { WorldObject vpObject = player.GetViewpoint(); - if (vpObject) + if (vpObject != null) if (vpObject == m_CinematicObject) player.SetViewpoint(m_CinematicObject, false); @@ -170,7 +170,7 @@ namespace Game.Entities // Advance (at speed) to this position. The remote sight object is used // to send update information to player in cinematic - if (m_CinematicObject && interPosition.IsPositionValid()) + if (m_CinematicObject != null && interPosition.IsPositionValid()) m_CinematicObject.MonsterMoveWithSpeed(interPosition.posX, interPosition.posY, interPosition.posZ, 500.0f, false, true); // If we never received an end packet 10 seconds after the final timestamp then force an end diff --git a/Source/Game/Entities/Player/CollectionManager.cs b/Source/Game/Entities/Player/CollectionManager.cs index b1955a409..ebcb769ad 100644 --- a/Source/Game/Entities/Player/CollectionManager.cs +++ b/Source/Game/Entities/Player/CollectionManager.cs @@ -237,7 +237,7 @@ namespace Game.Entities public void UpgradeHeirloom(uint itemId, uint castItem) { Player player = _owner.GetPlayer(); - if (!player) + if (player == null) return; HeirloomRecord heirloom = Global.DB2Mgr.GetHeirloomByItemId(itemId); @@ -275,7 +275,7 @@ namespace Game.Entities public void CheckHeirloomUpgrades(Item item) { Player player = _owner.GetPlayer(); - if (!player) + if (player == null) return; // Check already owned heirloom for upgrade kits @@ -292,7 +292,7 @@ namespace Game.Entities HeirloomRecord heirloomDiff; while ((heirloomDiff = Global.DB2Mgr.GetHeirloomByItemId(heirloomItemId)) != null) { - if (player.GetItemByEntry(heirloomDiff.ItemID)) + if (player.GetItemByEntry(heirloomDiff.ItemID) != null) newItemId = heirloomDiff.ItemID; HeirloomRecord heirloomSub = Global.DB2Mgr.GetHeirloomByItemId(heirloomDiff.StaticUpgradedItemID); @@ -372,7 +372,7 @@ namespace Game.Entities public bool AddMount(uint spellId, MountStatusFlags flags, bool factionMount = false, bool learned = false) { Player player = _owner.GetPlayer(); - if (!player) + if (player == null) return false; MountRecord mount = Global.DB2Mgr.GetMount(spellId); @@ -420,7 +420,7 @@ namespace Game.Entities void SendSingleMountUpdate(uint spellId, MountStatusFlags mountStatusFlags) { Player player = _owner.GetPlayer(); - if (!player) + if (player == null) return; AccountMountUpdate mountUpdate = new(); @@ -592,7 +592,7 @@ namespace Game.Entities if (itemTemplate == null) return false; - if (!_owner.GetPlayer()) + if (_owner.GetPlayer() == null) return false; if (_owner.GetPlayer().CanUseItem(itemTemplate) != InventoryResult.Ok) diff --git a/Source/Game/Entities/Player/KillRewarder.cs b/Source/Game/Entities/Player/KillRewarder.cs index 9faf4ecc6..4c9324e4d 100644 --- a/Source/Game/Entities/Player/KillRewarder.cs +++ b/Source/Game/Entities/Player/KillRewarder.cs @@ -129,14 +129,14 @@ namespace Game.Entities // 2.4. _maxNotGrayMember - maximum level of alive group member within reward distance, // for whom victim is not gray; uint grayLevel = Formulas.GetGrayLevel(lvl); - if (_victim.GetLevelForTarget(member) > grayLevel && (!_maxNotGrayMember || _maxNotGrayMember.GetLevel() < lvl)) + if (_victim.GetLevelForTarget(member) > grayLevel && (_maxNotGrayMember == null || _maxNotGrayMember.GetLevel() < lvl)) _maxNotGrayMember = member; } } } // 2.5. _isFullXP - flag identifying that for all group members victim is not gray, // so 100% XP will be rewarded (50% otherwise). - _isFullXP = _maxNotGrayMember && (_maxLevel == _maxNotGrayMember.GetLevel()); + _isFullXP = _maxNotGrayMember != null && (_maxLevel == _maxNotGrayMember.GetLevel()); } else _count = 1; @@ -185,7 +185,7 @@ namespace Game.Entities // 4.2.3. Give XP to player. player.GiveXP(xp, _victim, _groupRate); Pet pet = player.GetPet(); - if (pet) + if (pet != null) // 4.2.4. If player has pet, reward pet with XP (100% for single player, 50% for group case). pet.GivePetXP(player.GetGroup() != null ? xp / 2 : xp); } @@ -264,7 +264,7 @@ namespace Game.Entities for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (member) + if (member != null) { // Killer may not be at reward distance, check directly if (killer == member || member.IsAtGroupRewardDistance(_victim)) diff --git a/Source/Game/Entities/Player/Player.Achievement.cs b/Source/Game/Entities/Player/Player.Achievement.cs index a3b386656..632486de9 100644 --- a/Source/Game/Entities/Player/Player.Achievement.cs +++ b/Source/Game/Entities/Player/Player.Achievement.cs @@ -67,7 +67,7 @@ namespace Game.Entities scenario.UpdateCriteria(type, miscValue1, miscValue2, miscValue3, refe, this); Guild guild = Global.GuildMgr.GetGuildById(GetGuildId()); - if (guild) + if (guild != null) guild.UpdateCriteria(type, miscValue1, miscValue2, miscValue3, refe, this); } diff --git a/Source/Game/Entities/Player/Player.Combat.cs b/Source/Game/Entities/Player/Player.Combat.cs index f46292adf..8f4dbc32f 100644 --- a/Source/Game/Entities/Player/Player.Combat.cs +++ b/Source/Game/Entities/Player/Player.Combat.cs @@ -38,19 +38,19 @@ namespace Game.Entities // prepare data for near group iteration Group group = GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); - if (!player) + if (player == null) continue; if (!player.IsAtGroupRewardDistance(pRewardSource)) continue; // member (alive or dead) or his corpse at req. distance // quest objectives updated only for alive group member or dead but with not released body - if (player.IsAlive() || !player.GetCorpse()) + if (player.IsAlive() || player.GetCorpse() == null) player.KilledMonsterCredit(creature_id, creature_guid); } } @@ -247,7 +247,7 @@ namespace Game.Entities bool IsTwoHandUsed() { Item mainItem = GetItemByPos(InventorySlots.Bag0, EquipmentSlot.MainHand); - if (!mainItem) + if (mainItem == null) return false; ItemTemplate itemTemplate = mainItem.GetTemplate(); @@ -259,14 +259,14 @@ namespace Game.Entities bool IsUsingTwoHandedWeaponInOneHand() { Item offItem = GetItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand); - if (offItem && offItem.GetTemplate().GetInventoryType() == InventoryType.Weapon2Hand) + if (offItem != null && offItem.GetTemplate().GetInventoryType() == InventoryType.Weapon2Hand) return true; Item mainItem = GetItemByPos(InventorySlots.Bag0, EquipmentSlot.MainHand); - if (!mainItem || mainItem.GetTemplate().GetInventoryType() == InventoryType.Weapon2Hand) + if (mainItem == null || mainItem.GetTemplate().GetInventoryType() == InventoryType.Weapon2Hand) return false; - if (!offItem) + if (offItem == null) return false; return true; @@ -390,7 +390,7 @@ namespace Game.Entities ObjectGuid duelFlagGUID = m_playerData.DuelArbiter; GameObject obj = GetMap().GetGameObject(duelFlagGUID); - if (!obj) + if (obj == null) return; if (duel.OutOfBoundsTime == 0) @@ -494,7 +494,7 @@ namespace Game.Entities //Remove Duel Flag object GameObject obj = GetMap().GetGameObject(m_playerData.DuelArbiter); - if (obj) + if (obj != null) duel.Initiator.RemoveGameObject(obj, true); //remove auras diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs index c7a365fd4..a6f30d379 100644 --- a/Source/Game/Entities/Player/Player.DB.cs +++ b/Source/Game/Entities/Player/Player.DB.cs @@ -77,7 +77,7 @@ namespace Game.Entities if (item.HasItemFlag(ItemFieldFlags.Child)) { Item parent = GetItemByGuid(item.GetCreator()); - if (parent) + if (parent != null) { parent.SetChildItem(item.GetGUID()); item.CopyArtifactDataFromParent(parent); @@ -1468,7 +1468,7 @@ namespace Game.Entities if (!result.IsEmpty()) { Group group = Global.GroupMgr.GetGroupByDbStoreId(result.Read(0)); - if (group) + if (group != null) { if (group.IsLeader(GetGUID())) SetPlayerFlag(PlayerFlags.GroupLeader); @@ -1485,7 +1485,7 @@ namespace Game.Entities } } - if (!GetGroup() || !GetGroup().IsLeader(GetGUID())) + if (GetGroup() == null || !GetGroup().IsLeader(GetGUID())) RemovePlayerFlag(PlayerFlags.GroupLeader); } void _LoadInstanceTimeRestrictions(SQLResult result) @@ -1777,7 +1777,7 @@ namespace Game.Entities case ItemUpdateState.Changed: stmt = CharacterDatabase.GetPreparedStatement(CharStatements.REP_INVENTORY_ITEM); stmt.AddValue(0, GetGUID().GetCounter()); - stmt.AddValue(1, container ? container.GetGUID().GetCounter() : 0); + stmt.AddValue(1, container != null ? container.GetGUID().GetCounter() : 0); stmt.AddValue(2, item.GetSlot()); stmt.AddValue(3, item.GetGUID().GetCounter()); trans.Append(stmt); @@ -3090,7 +3090,7 @@ namespace Game.Entities mapId = transportOnMap.GetExpectedMapId(); instanceId = 0; transportMap = Global.MapMgr.CreateMap(mapId, this); - if (transportMap) + if (transportMap != null) transport = transportMap.GetTransport(transGUID); } else @@ -3098,7 +3098,7 @@ namespace Game.Entities } } - if (transport) + if (transport != null) { float x = trans_x; float y = trans_y; @@ -3201,13 +3201,13 @@ namespace Game.Entities // NOW player must have valid map // load the player's map here if it's not already loaded - if (!map) + if (map == null) map = Global.MapMgr.CreateMap(mapId, this); AreaTriggerStruct areaTrigger = null; bool check = false; - if (!map) + if (map == null) { areaTrigger = Global.ObjectMgr.GetGoBackTrigger(mapId); check = true; @@ -3241,11 +3241,11 @@ namespace Game.Entities } } - if (!map) + if (map == null) { RelocateToHomebind(); map = Global.MapMgr.CreateMap(mapId, this); - if (!map) + if (map == null) { Log.outError(LogFilter.Player, "Player {0} {1} Map: {2}, {3}. Invalid default map coordinates or instance couldn't be created.", GetName(), guid.ToString(), mapId, GetPosition()); return false; @@ -3960,7 +3960,7 @@ namespace Game.Entities // save pet (hunter pet level and experience and all type pets health/mana). Pet pet = GetPet(); - if (pet) + if (pet != null) pet.SavePetToDB(PetSaveMode.AsCurrent); } void DeleteSpellFromAllPlayers(uint spellId) @@ -4060,7 +4060,7 @@ namespace Game.Entities if (guildId != 0) { Guild guild = Global.GuildMgr.GetGuildById(guildId); - if (guild) + if (guild != null) guild.DeleteMember(trans, playerGuid, false, false, true); } @@ -4075,7 +4075,7 @@ namespace Game.Entities if (!resultGroup.IsEmpty()) { Group group = Global.GroupMgr.GetGroupByDbStoreId(resultGroup.Read(0)); - if (group) + if (group != null) RemoveFromGroup(group, playerGuid); } @@ -4215,7 +4215,7 @@ namespace Game.Entities do { Player playerFriend = Global.ObjAccessor.FindPlayer(ObjectGuid.Create(HighGuid.Player, resultFriends.Read(0))); - if (playerFriend) + if (playerFriend != null) { playerFriend.GetSocial().RemoveFromSocialList(playerGuid, SocialFlag.All); Global.SocialMgr.SendFriendStatus(playerFriend, FriendsResult.Removed, playerGuid); diff --git a/Source/Game/Entities/Player/Player.Groups.cs b/Source/Game/Entities/Player/Player.Groups.cs index dabccbffc..19e671c71 100644 --- a/Source/Game/Entities/Player/Player.Groups.cs +++ b/Source/Game/Entities/Player/Player.Groups.cs @@ -13,7 +13,7 @@ namespace Game.Entities Player GetNextRandomRaidMember(float radius) { Group group = GetGroup(); - if (!group) + if (group == null) return null; List nearMembers = new(); @@ -23,7 +23,7 @@ namespace Game.Entities Player Target = refe.GetSource(); // IsHostileTo check duel and controlled by enemy - if (Target && Target != this && IsWithinDistInMap(Target, radius) && + if (Target != null && Target != this && IsWithinDistInMap(Target, radius) && !Target.HasInvisibilityAura() && !IsHostileTo(Target)) nearMembers.Add(Target); } @@ -38,7 +38,7 @@ namespace Game.Entities public PartyResult CanUninviteFromGroup(ObjectGuid guidMember, byte? partyIndex) { Group grp = GetGroup(partyIndex); - if (!grp) + if (grp == null) return PartyResult.NotInGroup; if (grp.IsLFGGroup()) @@ -63,7 +63,7 @@ namespace Game.Entities // @todo Should also be sent when anyone has recently left combat, with an aprox ~5 seconds timer. for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next()) - if (refe.GetSource() && refe.GetSource().IsInMap(this) && refe.GetSource().IsInCombat()) + if (refe.GetSource() != null && refe.GetSource().IsInMap(this) && refe.GetSource().IsInCombat()) return PartyResult.PartyLfgBootInCombat; /* Missing support for these types @@ -117,7 +117,7 @@ namespace Game.Entities //remove existing reference m_group.Unlink(); Group group = GetOriginalGroup(); - if (group) + if (group != null) { m_group.Link(group, this); m_group.SetSubGroup(GetOriginalSubGroup()); @@ -127,7 +127,7 @@ namespace Game.Entities public void SetOriginalGroup(Group group, byte subgroup = 0) { - if (!group) + if (group == null) m_originalGroup.Unlink(); else { @@ -162,7 +162,7 @@ namespace Game.Entities return group; Group originalGroup = GetOriginalGroup(); - if (originalGroup && originalGroup.GetGroupCategory() == category) + if (originalGroup != null && originalGroup.GetGroupCategory() == category) return originalGroup; return null; @@ -170,7 +170,7 @@ namespace Game.Entities public void SetGroup(Group group, byte subgroup = 0) { - if (!group) + if (group == null) m_group.Unlink(); else { @@ -207,11 +207,11 @@ namespace Game.Entities public bool IsAtGroupRewardDistance(WorldObject pRewardSource) { - if (!pRewardSource || !IsInMap(pRewardSource)) + if (pRewardSource == null || !IsInMap(pRewardSource)) return false; WorldObject player = GetCorpse(); - if (!player || IsAlive()) + if (player == null || IsAlive()) player = this; if (player.GetMap().IsDungeon()) @@ -259,7 +259,7 @@ namespace Game.Entities } public bool IsInSameGroupWith(Player p) { - return p == this || (GetGroup() && + return p == this || (GetGroup() != null && GetGroup() == p.GetGroup() && GetGroup().SameSubGroup(this, p)); } @@ -271,7 +271,7 @@ namespace Game.Entities public void UninviteFromGroup() { Group group = GetGroupInvite(); - if (!group) + if (group == null) return; group.RemoveInvite(this); @@ -291,7 +291,7 @@ namespace Game.Entities public void RemoveFromGroup(RemoveMethod method = RemoveMethod.Default) { RemoveFromGroup(GetGroup(), GetGUID(), method); } public static void RemoveFromGroup(Group group, ObjectGuid guid, RemoveMethod method = RemoveMethod.Default, ObjectGuid kicker = default, string reason = null) { - if (!group) + if (group == null) return; group.RemoveMember(guid, method, kicker, reason); @@ -302,13 +302,13 @@ namespace Game.Entities if (m_groupUpdateMask == GroupUpdateFlags.None) return; Group group = GetGroup(); - if (group) + if (group != null) group.UpdatePlayerOutOfRange(this); m_groupUpdateMask = GroupUpdateFlags.None; Pet pet = GetPet(); - if (pet) + if (pet != null) pet.ResetGroupUpdateFlag(); } } diff --git a/Source/Game/Entities/Player/Player.Items.cs b/Source/Game/Entities/Player/Player.Items.cs index de1ad5be3..279251cfe 100644 --- a/Source/Game/Entities/Player/Player.Items.cs +++ b/Source/Game/Entities/Player/Player.Items.cs @@ -222,7 +222,7 @@ namespace Game.Entities foreach (var guid in m_itemSoulboundTradeable.ToList()) { Item item = GetItemByGuid(guid); - if (!item || item.GetOwnerGUID() != GetGUID() || item.CheckSoulboundTradeExpire()) + if (item == null || item.GetOwnerGUID() != GetGUID() || item.CheckSoulboundTradeExpire()) m_itemSoulboundTradeable.Remove(guid); } } @@ -637,7 +637,7 @@ namespace Game.Entities // search free slot in bag for place to if (bag == InventorySlots.Bag0) // inventory { - if (pItem && pItem.HasItemFlag(ItemFieldFlags.Child)) + if (pItem != null && pItem.HasItemFlag(ItemFieldFlags.Child)) { res = CanStoreItem_InInventorySlots(InventorySlots.ChildEquipmentStart, InventorySlots.ChildEquipmentEnd, dest, pProto, ref count, false, pItem, bag, slot); if (res != InventoryResult.Ok) @@ -791,7 +791,7 @@ namespace Game.Entities if (pItem != null && pItem.IsNotEmptyBag()) return InventoryResult.BagInBag; - if (pItem && pItem.HasItemFlag(ItemFieldFlags.Child)) + if (pItem != null && pItem.HasItemFlag(ItemFieldFlags.Child)) { res = CanStoreItem_InInventorySlots(InventorySlots.ChildEquipmentStart, InventorySlots.ChildEquipmentEnd, dest, pProto, ref count, false, pItem, bag, slot); if (res != InventoryResult.Ok) @@ -813,7 +813,7 @@ namespace Game.Entities // search free slot byte searchSlotStart = InventorySlots.ItemStart; // new bags can be directly equipped - if (!pItem && pProto.GetClass() == ItemClass.Container && (ItemSubClassContainer)pProto.GetSubClass() == ItemSubClassContainer.Container && + if (pItem == null && pProto.GetClass() == ItemClass.Container && (ItemSubClassContainer)pProto.GetSubClass() == ItemSubClassContainer.Container && (pProto.GetBonding() == ItemBondingType.None || pProto.GetBonding() == ItemBondingType.OnAcquire)) searchSlotStart = InventorySlots.BagStart; @@ -874,7 +874,7 @@ namespace Game.Entities { // build items in stock backpack item2 = GetItemByPos(InventorySlots.Bag0, i); - if (item2 && !item2.IsInTrade()) + if (item2 != null && !item2.IsInTrade()) { inventoryCounts[i - InventorySlots.ItemStart] = item2.GetCount(); inventoryPointers[i - InventorySlots.ItemStart] = item2; @@ -884,7 +884,7 @@ namespace Game.Entities for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; i++) { Bag pBag = GetBagByPos(i); - if (pBag) + if (pBag != null) { bagCounts[i - InventorySlots.BagStart] = new uint[ItemConst.MaxBagSize]; bagPointers[i - InventorySlots.BagStart] = new Item[ItemConst.MaxBagSize]; @@ -892,7 +892,7 @@ namespace Game.Entities { // build item counts in equippable bags item2 = GetItemByPos(i, j); - if (item2 && !item2.IsInTrade()) + if (item2 != null && !item2.IsInTrade()) { bagCounts[i - InventorySlots.BagStart][j] = item2.GetCount(); bagPointers[i - InventorySlots.BagStart][j] = item2; @@ -908,7 +908,7 @@ namespace Game.Entities Item item = items[k]; // no item - if (!item) + if (item == null) continue; uint remaining_count = item.GetCount(); @@ -942,7 +942,7 @@ namespace Game.Entities for (byte t = InventorySlots.ItemStart; t < inventoryEnd; ++t) { item2 = inventoryPointers[t - InventorySlots.ItemStart]; - if (item2 && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && inventoryCounts[t - InventorySlots.ItemStart] < pProto.GetMaxStackSize()) + if (item2 != null && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && inventoryCounts[t - InventorySlots.ItemStart] < pProto.GetMaxStackSize()) { inventoryCounts[t - InventorySlots.ItemStart] += remaining_count; remaining_count = inventoryCounts[t - InventorySlots.ItemStart] < pProto.GetMaxStackSize() ? 0 : inventoryCounts[t - InventorySlots.ItemStart] - pProto.GetMaxStackSize(); @@ -960,7 +960,7 @@ namespace Game.Entities for (byte t = InventorySlots.BagStart; !b_found && t < InventorySlots.BagEnd; ++t) { Bag bag = GetBagByPos(t); - if (bag) + if (bag != null) { if (!Item.ItemCanGoIntoBag(item.GetTemplate(), bag.GetTemplate())) continue; @@ -968,7 +968,7 @@ namespace Game.Entities for (byte j = 0; j < bag.GetBagSize(); j++) { item2 = bagPointers[t - InventorySlots.BagStart][j]; - if (item2 && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && bagCounts[t - InventorySlots.BagStart][j] < pProto.GetMaxStackSize()) + if (item2 != null && item2.CanBeMergedPartlyWith(pProto) == InventoryResult.Ok && bagCounts[t - InventorySlots.BagStart][j] < pProto.GetMaxStackSize()) { // add count to stack so that later items in the list do not double-book bagCounts[t - InventorySlots.BagStart][j] += remaining_count; @@ -994,7 +994,7 @@ namespace Game.Entities for (byte t = InventorySlots.BagStart; !b_found && t < InventorySlots.BagEnd; ++t) { Bag bag = GetBagByPos(t); - if (bag) + if (bag != null) { pBagProto = bag.GetTemplate(); @@ -1042,7 +1042,7 @@ namespace Game.Entities for (byte t = InventorySlots.BagStart; !b_found && t < InventorySlots.BagEnd; ++t) { Bag bag = GetBagByPos(t); - if (bag) + if (bag != null) { pBagProto = bag.GetTemplate(); @@ -1292,7 +1292,7 @@ namespace Game.Entities List childDest = new(); CanStoreItem_InInventorySlots(InventorySlots.ChildEquipmentStart, InventorySlots.ChildEquipmentEnd, childDest, childTemplate, ref count, false, null, ItemConst.NullBag, ItemConst.NullSlot); Item childItem = StoreNewItem(childDest, childTemplate.GetId(), update, 0, null, context, null, addToCollection); - if (childItem) + if (childItem != null) { childItem.SetCreator(item.GetGUID()); childItem.SetItemFlag(ItemFieldFlags.Child); @@ -1644,13 +1644,13 @@ namespace Game.Entities if (itemChildEquipment != null) { Item childItem = GetChildItemByGuid(parentItem.GetChildItem()); - if (childItem) + if (childItem != null) { ushort childDest = (ushort)((InventorySlots.Bag0 << 8) | itemChildEquipment.ChildItemEquipSlot); if (childItem.GetPos() != childDest) { Item dstItem = GetItemByPos(childDest); - if (!dstItem) // empty slot, simple case + if (dstItem == null) // empty slot, simple case { RemoveItem(childItem.GetBagSlot(), childItem.GetSlot(), true); EquipItem(childDest, childItem, true); @@ -1722,7 +1722,7 @@ namespace Game.Entities if (Global.DB2Mgr.GetItemChildEquipment(parentItem.GetEntry()) != null) { Item childItem = GetChildItemByGuid(parentItem.GetChildItem()); - if (childItem) + if (childItem != null) { if (IsChildEquipmentPos(childItem.GetPos())) return; @@ -1770,10 +1770,10 @@ namespace Game.Entities if (msg != InventoryResult.Ok) { - if (item1) + if (item1 != null) failure.Item[0] = item1.GetGUID(); - if (item2) + if (item2 != null) failure.Item[1] = item2.GetGUID(); failure.ContainerBSlot = 0; // bag equip slot, used with EQUIP_ERR_EVENT_AUTOEQUIP_BIND_CONFIRM and EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG2 @@ -1783,7 +1783,7 @@ namespace Game.Entities case InventoryResult.CantEquipLevelI: case InventoryResult.PurchaseLevelTooLow: { - failure.Level = (item1 ? item1.GetRequiredLevel() : 0); + failure.Level = (item1 != null ? item1.GetRequiredLevel() : 0); break; } case InventoryResult.EventAutoequipBindConfirm: // no idea about this one... @@ -1797,7 +1797,7 @@ namespace Game.Entities case InventoryResult.ItemMaxLimitCategorySocketedExceededIs: case InventoryResult.ItemMaxLimitCategoryEquippedExceededIs: { - ItemTemplate proto = item1 ? item1.GetTemplate() : Global.ObjectMgr.GetItemTemplate(itemId); + ItemTemplate proto = item1 != null ? item1.GetTemplate() : Global.ObjectMgr.GetItemTemplate(itemId); failure.LimitCategory = (int)(proto != null ? proto.GetItemLimitCategory() : 0u); break; } @@ -1924,7 +1924,7 @@ namespace Game.Entities byte dstslot = (byte)(dst & 255); Item pSrcItem = GetItemByPos(srcbag, srcslot); - if (!pSrcItem) + if (pSrcItem == null) { SendEquipError(InventoryResult.ItemNotFound, pSrcItem); return; @@ -1962,7 +1962,7 @@ namespace Game.Entities Log.outDebug(LogFilter.Player, "STORAGE: SplitItem bag = {0}, slot = {1}, item = {2}, count = {3}", dstbag, dstslot, pSrcItem.GetEntry(), count); Item pNewItem = pSrcItem.CloneItem(count, this); - if (!pNewItem) + if (pNewItem == null) { SendEquipError(InventoryResult.ItemNotFound, pSrcItem); return; @@ -2044,7 +2044,7 @@ namespace Game.Entities if (pSrcItem.HasItemFlag(ItemFieldFlags.Child)) { Item parentItem = GetItemByGuid(pSrcItem.m_itemData.Creator); - if (parentItem) + if (parentItem != null) { if (IsEquipmentPos(src)) { @@ -2055,10 +2055,10 @@ namespace Game.Entities } } } - else if (pDstItem && pDstItem.HasItemFlag(ItemFieldFlags.Child)) + else if (pDstItem != null && pDstItem.HasItemFlag(ItemFieldFlags.Child)) { Item parentItem = GetItemByGuid(pDstItem.m_itemData.Creator); - if (parentItem) + if (parentItem != null) { if (IsEquipmentPos(dst)) { @@ -2522,7 +2522,7 @@ namespace Game.Entities packet.IsEncounterLoot = true; } - if (broadcast && GetGroup() && !item.GetTemplate().HasFlag(ItemFlags3.DontReportLootLogToParty)) + if (broadcast && GetGroup() != null && !item.GetTemplate().HasFlag(ItemFlags3.DontReportLootLogToParty)) GetGroup().BroadcastPacket(packet, true); else SendPacket(packet); @@ -2576,7 +2576,7 @@ namespace Game.Entities Item pItem = GetItemByPos(InventorySlots.Bag0, slot); - if (!pItem || pItem.GetSocketColor(0) == 0) //if item has no sockets or no item is equipped go to next item + if (pItem == null || pItem.GetSocketColor(0) == 0) //if item has no sockets or no item is equipped go to next item continue; //cycle all (gem)enchants @@ -2675,7 +2675,7 @@ namespace Game.Entities public Item GetUseableItemByPos(byte bag, byte slot) { Item item = GetItemByPos(bag, slot); - if (!item) + if (item == null) return null; if (!CanUseAttackType(GetAttackBySlot(slot, item.GetTemplate().GetInventoryType()))) @@ -2743,7 +2743,7 @@ namespace Game.Entities uint currentCount = 0; return !ForEachItem(location, pItem => { - if (pItem && pItem.GetEntry() == item && !pItem.IsInTrade()) + if (pItem != null && pItem.GetEntry() == item && !pItem.IsInTrade()) { currentCount += pItem.GetCount(); if (currentCount >= count) @@ -2879,7 +2879,7 @@ namespace Game.Entities for (byte i = InventorySlots.ItemStart; i < inventoryEnd; i++) { Item pItem = GetItemByPos(InventorySlots.Bag0, i); - if (pItem) + if (pItem != null) { if (pItem.IsConjuredConsumable()) DestroyItem(InventorySlots.Bag0, i, update); @@ -2890,12 +2890,12 @@ namespace Game.Entities for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; i++) { Bag pBag = GetBagByPos(i); - if (pBag) + if (pBag != null) { for (byte j = 0; j < pBag.GetBagSize(); j++) { Item pItem = pBag.GetItemByPos(j); - if (pItem) + if (pItem != null) if (pItem.IsConjuredConsumable()) DestroyItem(i, j, update); } @@ -2906,7 +2906,7 @@ namespace Game.Entities for (byte i = EquipmentSlot.Start; i < InventorySlots.BagEnd; i++) { Item pItem = GetItemByPos(InventorySlots.Bag0, i); - if (pItem) + if (pItem != null) if (pItem.IsConjuredConsumable()) DestroyItem(InventorySlots.Bag0, i, update); } @@ -2920,7 +2920,7 @@ namespace Game.Entities for (byte i = InventorySlots.ItemStart; i < inventoryEnd; i++) { Item pItem = GetItemByPos(InventorySlots.Bag0, i); - if (pItem) + if (pItem != null) if (pItem.IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem(InventorySlots.Bag0, i, update); } @@ -2929,12 +2929,12 @@ namespace Game.Entities for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; i++) { Bag pBag = GetBagByPos(i); - if (pBag) + if (pBag != null) { for (byte j = 0; j < pBag.GetBagSize(); j++) { Item pItem = pBag.GetItemByPos(j); - if (pItem) + if (pItem != null) if (pItem.IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem(i, j, update); } @@ -2945,7 +2945,7 @@ namespace Game.Entities for (byte i = EquipmentSlot.Start; i < InventorySlots.BagEnd; i++) { Item pItem = GetItemByPos(InventorySlots.Bag0, i); - if (pItem) + if (pItem != null) if (pItem.IsLimitedToAnotherMapOrZone(GetMapId(), new_zone)) DestroyItem(InventorySlots.Bag0, i, update); } @@ -2955,7 +2955,7 @@ namespace Game.Entities { if (restrictOnlyLfg) { - if (!GetGroup() || !GetGroup().IsLFGGroup()) + if (GetGroup() == null || !GetGroup().IsLFGGroup()) return InventoryResult.Ok; // not in LFG group // check if looted object is inside the lfg dungeon @@ -3008,7 +3008,7 @@ namespace Game.Entities for (byte i = InventorySlots.BuyBackStart + 1; i < InventorySlots.BuyBackEnd; ++i) { // found empty - if (!m_items[i]) + if (m_items[i] == null) { oldest_slot = i; break; @@ -3066,7 +3066,7 @@ namespace Game.Entities } Creature creature = GetNPCIfCanInteractWith(vendorGuid, NPCFlags.Vendor, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, "WORLD: BuyCurrencyFromVendorSlot - {0} not found or you can't interact with him.", vendorGuid.ToString()); SendBuyError(BuyResult.DistanceTooFar, null, currency); @@ -3233,7 +3233,7 @@ namespace Game.Entities return false; Creature creature = GetNPCIfCanInteractWith(vendorguid, NPCFlags.Vendor, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, "WORLD: BuyItemFromVendor - {0} not found or you can't interact with him.", vendorguid.ToString()); SendBuyError(BuyResult.DistanceTooFar, null, item); @@ -3456,7 +3456,7 @@ namespace Game.Entities SQLTransaction trans = new(); Item item = Item.CreateItem(itemEntry, count, context, null); - if (item) + if (item != null) { item.SaveToDB(trans); draft.AddItem(item); @@ -3481,7 +3481,7 @@ namespace Game.Entities if (slot >= InventorySlots.BuyBackStart && slot < InventorySlots.BuyBackEnd) { Item pItem = m_items[slot]; - if (pItem) + if (pItem != null) { pItem.RemoveFromWorld(); if (del) @@ -3503,7 +3503,7 @@ namespace Game.Entities SetBuybackTimestamp(eslot, 0); // if current backslot is filled set to now free slot - if (m_items[m_currentBuybackSlot]) + if (m_items[m_currentBuybackSlot] != null) m_currentBuybackSlot = slot; } } @@ -3518,19 +3518,19 @@ namespace Game.Entities for (byte i = EquipmentSlot.Start; i < inventoryEnd; ++i) { Item item = GetUseableItemByPos(InventorySlots.Bag0, i); - if (item && Global.DB2Mgr.IsTotemCategoryCompatibleWith(item.GetTemplate().GetTotemCategory(), TotemCategory)) + if (item != null && Global.DB2Mgr.IsTotemCategoryCompatibleWith(item.GetTemplate().GetTotemCategory(), TotemCategory)) return true; } for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; ++i) { Bag bag = GetBagByPos(i); - if (bag) + if (bag != null) { for (byte j = 0; j < bag.GetBagSize(); ++j) { Item item = GetUseableItemByPos(i, j); - if (item && Global.DB2Mgr.IsTotemCategoryCompatibleWith(item.GetTemplate().GetTotemCategory(), TotemCategory)) + if (item != null && Global.DB2Mgr.IsTotemCategoryCompatibleWith(item.GetTemplate().GetTotemCategory(), TotemCategory)) return true; } } @@ -3539,7 +3539,7 @@ namespace Game.Entities for (byte i = InventorySlots.ChildEquipmentStart; i < InventorySlots.ChildEquipmentEnd; ++i) { Item item = GetUseableItemByPos(InventorySlots.Bag0, i); - if (item && Global.DB2Mgr.IsTotemCategoryCompatibleWith(item.GetTemplate().GetTotemCategory(), TotemCategory)) + if (item != null && Global.DB2Mgr.IsTotemCategoryCompatibleWith(item.GetTemplate().GetTotemCategory(), TotemCategory)) return true; } @@ -4050,7 +4050,7 @@ namespace Game.Entities { for (byte i = 0; i < InventorySlots.BagEnd; ++i) { - if (m_items[i]) + if (m_items[i] != null) { if (!m_items[i].IsAzeriteItem() || m_items[i].IsBroken() || !CanUseAttackType(Player.GetAttackBySlot(i, m_items[i].GetTemplate().GetInventoryType()))) continue; @@ -4064,7 +4064,7 @@ namespace Game.Entities { for (byte i = 0; i < InventorySlots.BagEnd; ++i) { - if (m_items[i]) + if (m_items[i] != null) { if (!m_items[i].IsAzeriteEmpoweredItem() || m_items[i].IsBroken() || !CanUseAttackType(Player.GetAttackBySlot(i, m_items[i].GetTemplate().GetInventoryType()))) continue; @@ -4170,7 +4170,7 @@ namespace Game.Entities uint need_space; - if (pSrcItem) + if (pSrcItem != null) { if (pSrcItem.IsNotEmptyBag() && !IsBagPos((ushort)((ushort)bag << 8 | slot))) return InventoryResult.DestroyNonemptyBag; @@ -4522,7 +4522,7 @@ namespace Game.Entities ++freeSlotCount; for (byte i = ProfessionSlots.Start; i < ProfessionSlots.End; ++i) - if (!GetItemByPos(InventorySlots.Bag0, i)) + if (GetItemByPos(InventorySlots.Bag0, i) == null) ++freeSlotCount; } @@ -4650,7 +4650,7 @@ namespace Game.Entities if (pBag == null || pBag == pSrcItem) return InventoryResult.WrongBagType; - if (pSrcItem) + if (pSrcItem != null) { if (pSrcItem.IsNotEmptyBag()) return InventoryResult.DestroyNonemptyBag; @@ -4990,7 +4990,7 @@ namespace Game.Entities if (IsInCombat()) return InventoryResult.NotInCombat; Battleground bg = GetBattleground(); - if (bg) + if (bg != null) if (bg.IsArena() && bg.GetStatus() == BattlegroundStatus.InProgress) return InventoryResult.NotDuringArenaMatch; } @@ -5151,7 +5151,7 @@ namespace Game.Entities public InventoryResult CanEquipChildItem(Item parentItem) { Item childItem = GetChildItemByGuid(parentItem.GetChildItem()); - if (!childItem) + if (childItem == null) return InventoryResult.Ok; ItemChildEquipmentRecord childEquipement = Global.DB2Mgr.GetItemChildEquipment(parentItem.GetEntry()); @@ -5159,7 +5159,7 @@ namespace Game.Entities return InventoryResult.Ok; Item dstItem = GetItemByPos(InventorySlots.Bag0, childEquipement.ChildItemEquipSlot); - if (!dstItem) + if (dstItem == null) return InventoryResult.Ok; ushort childDest = (ushort)((InventorySlots.Bag0 << 8) | childEquipement.ChildItemEquipSlot); @@ -5278,7 +5278,7 @@ namespace Game.Entities if (IsInCombat()) return InventoryResult.NotInCombat; Battleground bg = GetBattleground(); - if (bg) + if (bg != null) if (bg.IsArena() && bg.GetStatus() == BattlegroundStatus.InProgress) return InventoryResult.NotDuringArenaMatch; } @@ -5403,9 +5403,9 @@ namespace Game.Entities else { AzeriteEmpoweredItem azeriteEmpoweredItem = item.ToAzeriteEmpoweredItem(); - if (azeriteEmpoweredItem) + if (azeriteEmpoweredItem != null) { - if (!apply || GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.Equipment)) + if (!apply || GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.Equipment) != null) { for (int i = 0; i < SharedConst.MaxAzeriteEmpoweredTier; ++i) { @@ -5884,7 +5884,7 @@ namespace Game.Entities for (byte i = InventorySlots.BankBagStart; i < InventorySlots.BankBagEnd; i++) { Item item = GetItemByPos(InventorySlots.Bag0, i); - if (item) + if (item != null) { if (item.GetEntry() == itemEntry && !item.IsInTrade()) { @@ -5914,7 +5914,7 @@ namespace Game.Entities for (byte i = InventorySlots.ReagentStart; i < InventorySlots.ReagentEnd; ++i) { Item item = GetItemByPos(InventorySlots.Bag0, i); - if (item) + if (item != null) { if (item.GetEntry() == itemEntry && !item.IsInTrade()) { @@ -5943,7 +5943,7 @@ namespace Game.Entities for (byte i = InventorySlots.ChildEquipmentStart; i < InventorySlots.ChildEquipmentEnd; ++i) { Item item = GetItemByPos(InventorySlots.Bag0, i); - if (item) + if (item != null) { if (item.GetEntry() == itemEntry && !item.IsInTrade()) { @@ -6017,7 +6017,7 @@ namespace Game.Entities for (byte slot = (byte)(InventorySlots.ItemStart + slots); slot < InventorySlots.ItemEnd; ++slot) { Item unstorableItem = GetItemByPos(InventorySlots.Bag0, slot); - if (unstorableItem) + if (unstorableItem != null) unstorableItems.Add(unstorableItem); } @@ -6110,7 +6110,7 @@ namespace Game.Entities if (newitem.GetQuality() > ItemQuality.Epic || (newitem.GetQuality() == ItemQuality.Epic && newitem.GetItemLevel(this) >= GuildConst.MinNewsItemLevel)) { Guild guild = GetGuild(); - if (guild) + if (guild != null) guild.AddGuildNews(GuildNews.ItemLooted, GetGUID(), 0, item.itemid); } } @@ -6162,7 +6162,7 @@ namespace Game.Entities // We have to convert player corpse to bones, not to be able to resurrect there // SpawnCorpseBones isn't handy, 'cos it saves player while he in BG Corpse bones = GetMap().ConvertCorpseToBones(GetGUID(), true); - if (!bones) + if (bones == null) return; // Now we must make bones lootable, and send player loot diff --git a/Source/Game/Entities/Player/Player.Map.cs b/Source/Game/Entities/Player/Player.Map.cs index 74b45a4a3..d29dc89f4 100644 --- a/Source/Game/Entities/Player/Player.Map.cs +++ b/Source/Game/Entities/Player/Player.Map.cs @@ -156,12 +156,12 @@ namespace Game.Entities } // group update - if (GetGroup()) + if (GetGroup() != null) { SetGroupUpdateFlag(GroupUpdateFlags.Full); Pet pet = GetPet(); - if (pet) + if (pet != null) pet.SetGroupUpdateFlag(GroupUpdatePetFlags.Full); } @@ -213,7 +213,7 @@ namespace Game.Entities Global.BattleFieldMgr.HandlePlayerEnterZone(this, newZone); SendInitWorldStates(newZone, newArea); // only if really enters to new zone, not just area change, works strange... Guild guild = GetGuild(); - if (guild) + if (guild != null) guild.UpdateMemberData(this, GuildMemberData.ZoneId, newZone); } } @@ -437,7 +437,7 @@ namespace Game.Entities if (group == null || group.IsRaidGroup()) return false; - if (group) + if (group != null) { // check if player's group is bound to this instance if (group != instance.GetOwningGroup()) @@ -495,7 +495,7 @@ namespace Game.Entities { Group group = GetGroup(); Difficulty difficulty = group != null ? group.GetDifficultyID(mapEntry) : GetDifficultyID(mapEntry); - ObjectGuid instanceOwnerGuid = group ? group.GetRecentInstanceOwner(targetMapId) : GetGUID(); + ObjectGuid instanceOwnerGuid = group != null ? group.GetRecentInstanceOwner(targetMapId) : GetGUID(); InstanceLock instanceLock = Global.InstanceLockMgr.FindActiveInstanceLock(instanceOwnerGuid, new MapDb2Entries(mapEntry, Global.DB2Mgr.GetDownscaledMapDifficultyData(targetMapId, ref difficulty))); if (instanceLock != null) @@ -532,7 +532,7 @@ namespace Game.Entities { Map map = Global.MapMgr.FindMap(mapId, instanceId); bool forgetInstance = false; - if (map) + if (map != null) { InstanceMap instance = map.ToInstanceMap(); if (instance != null) diff --git a/Source/Game/Entities/Player/Player.PvP.cs b/Source/Game/Entities/Player/Player.PvP.cs index 5615eba00..00947b6ed 100644 --- a/Source/Game/Entities/Player/Player.PvP.cs +++ b/Source/Game/Entities/Player/Player.PvP.cs @@ -50,7 +50,7 @@ namespace Game.Entities // do not reward honor in arenas, but enable onkill spellproc if (InArena()) { - if (!victim || victim == this || !victim.IsTypeId(TypeId.Player)) + if (victim == null || victim == this || !victim.IsTypeId(TypeId.Player)) return false; if (GetBGTeam() == victim.ToPlayer().GetBGTeam()) @@ -70,7 +70,7 @@ namespace Game.Entities UpdateHonorFields(); // do not reward honor in arenas, but return true to enable onkill spellproc - if (InBattleground() && GetBattleground() && GetBattleground().IsArena()) + if (InBattleground() && GetBattleground() != null && GetBattleground().IsArena()) return true; // Promote to float for calculations @@ -78,12 +78,12 @@ namespace Game.Entities if (honor_f <= 0) { - if (!victim || victim == this || victim.HasAuraType(AuraType.NoPvpCredit)) + if (victim == null || victim == this || victim.HasAuraType(AuraType.NoPvpCredit)) return false; victim_guid = victim.GetGUID(); Player plrVictim = victim.ToPlayer(); - if (plrVictim) + if (plrVictim != null) { if (GetEffectiveTeam() == plrVictim.GetEffectiveTeam() && !Global.WorldMgr.IsFFAPvPRealm()) return false; @@ -179,7 +179,7 @@ namespace Game.Entities if (WorldConfig.GetBoolValue(WorldCfg.PvpTokenEnable) && pvptoken) { - if (!victim || victim == this || victim.HasAuraType(AuraType.NoPvpCredit)) + if (victim == null || victim == this || victim.HasAuraType(AuraType.NoPvpCredit)) return true; if (victim.IsTypeId(TypeId.Player)) @@ -511,7 +511,7 @@ namespace Game.Entities public bool CanUseBattlegroundObject(GameObject gameobject) { // It is possible to call this method with a null pointer, only skipping faction check. - if (gameobject) + if (gameobject != null) { FactionTemplateRecord playerFaction = GetFactionTemplateEntry(); FactionTemplateRecord faction = CliDB.FactionTemplateStorage.LookupByKey(gameobject.GetFaction()); @@ -592,7 +592,7 @@ namespace Game.Entities public void LeaveBattleground(bool teleportToEntryPoint = true) { Battleground bg = GetBattleground(); - if (bg) + if (bg != null) { bg.RemovePlayerAtLeave(GetGUID(), teleportToEntryPoint, true); @@ -648,7 +648,7 @@ namespace Game.Entities reportAfkResult.Offender = GetGUID(); Battleground bg = GetBattleground(); // Battleground also must be in progress! - if (!bg || bg != reporter.GetBattleground() || GetEffectiveTeam() != reporter.GetEffectiveTeam() || bg.GetStatus() != BattlegroundStatus.InProgress) + if (bg == null || bg != reporter.GetBattleground() || GetEffectiveTeam() != reporter.GetEffectiveTeam() || bg.GetStatus() != BattlegroundStatus.InProgress) { reporter.SendPacket(reportAfkResult); return; diff --git a/Source/Game/Entities/Player/Player.Quest.cs b/Source/Game/Entities/Player/Player.Quest.cs index 3c89ffbbf..c3bb61c6c 100644 --- a/Source/Game/Entities/Player/Player.Quest.cs +++ b/Source/Game/Entities/Player/Player.Quest.cs @@ -707,7 +707,7 @@ namespace Game.Entities if (CanCompleteQuest(quest.Id)) CompleteQuest(quest.Id); - if (!questGiver) + if (questGiver == null) return; switch (questGiver.GetTypeId()) @@ -1190,10 +1190,10 @@ namespace Game.Entities SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(displaySpell.SpellId, GetMap().GetDifficultyID()); Unit caster = this; - if (questGiver && questGiver.IsTypeMask(TypeMask.Unit) && !quest.HasFlag(QuestFlags.PlayerCastComplete) && !spellInfo.HasTargetType(Targets.UnitCaster)) + if (questGiver != null && questGiver.IsTypeMask(TypeMask.Unit) && !quest.HasFlag(QuestFlags.PlayerCastComplete) && !spellInfo.HasTargetType(Targets.UnitCaster)) { Unit unit = questGiver.ToUnit(); - if (unit) + if (unit != null) caster = unit; } @@ -2326,14 +2326,14 @@ namespace Game.Entities public void GroupEventHappens(uint questId, WorldObject pEventObject) { var group = GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); // for any leave or dead (with not released body) group member at appropriate distance - if (player && player.IsAtGroupRewardDistance(pEventObject) && !player.GetCorpse()) + if (player != null && player.IsAtGroupRewardDistance(pEventObject) && player.GetCorpse() == null) player.AreaExploredOrEventHappens(questId); } } @@ -2450,7 +2450,7 @@ namespace Game.Entities Quest quest = Global.ObjectMgr.GetQuestTemplate(questId); if (!QuestObjective.CanAlwaysBeProgressedInRaid(objectiveType)) - if (GetGroup() && GetGroup().IsRaidGroup() && !quest.IsAllowedInRaid(GetMap().GetDifficultyID())) + if (GetGroup() != null && GetGroup().IsRaidGroup() && !quest.IsAllowedInRaid(GetMap().GetDifficultyID())) continue; ushort logSlot = objectiveStatusData.QuestStatusPair.Status.Slot; @@ -2595,7 +2595,7 @@ namespace Game.Entities continue; // hide quest if player is in raid-group and quest is no raid quest - if (GetGroup() && GetGroup().IsRaidGroup() && !qInfo.IsAllowedInRaid(GetMap().GetDifficultyID())) + if (GetGroup() != null && GetGroup().IsRaidGroup() && !qInfo.IsAllowedInRaid(GetMap().GetDifficultyID())) if (!InBattleground()) //there are two ways.. we can make every bg-quest a raidquest, or add this code here.. i don't know if this can be exploited by other quests, but i think all other quests depend on a specific area.. but keep this in mind, if something strange happens later continue; @@ -2611,7 +2611,7 @@ namespace Game.Entities Quest qInfo = Global.ObjectMgr.GetQuestTemplate(questStatus.Key); // hide quest if player is in raid-group and quest is no raid quest - if (GetGroup() && GetGroup().IsRaidGroup() && !qInfo.IsAllowedInRaid(GetMap().GetDifficultyID())) + if (GetGroup() != null && GetGroup().IsRaidGroup() && !qInfo.IsAllowedInRaid(GetMap().GetDifficultyID())) if (!InBattleground()) continue; @@ -2855,7 +2855,7 @@ namespace Game.Entities packet.SkillLineIDReward = quest.RewardSkillId; packet.NumSkillUpsReward = quest.RewardSkillPoints; - if (questGiver) + if (questGiver != null) { if (questGiver.IsGossip()) packet.LaunchGossip = quest.HasFlag(QuestFlags.LaunchGossipComplete); @@ -2910,7 +2910,7 @@ namespace Game.Entities public void SendQuestConfirmAccept(Quest quest, Player receiver) { - if (!receiver) + if (receiver == null) return; QuestConfirmAcceptResponse packet = new(); @@ -2998,7 +2998,7 @@ namespace Game.Entities { // need also pet quests case support Creature questgiver = ObjectAccessor.GetCreatureOrPetOrVehicle(this, itr); - if (!questgiver || questgiver.IsHostileTo(this)) + if (questgiver == null || questgiver.IsHostileTo(this)) continue; if (!questgiver.HasNpcFlag(NPCFlags.QuestGiver)) @@ -3009,7 +3009,7 @@ namespace Game.Entities else if (itr.IsGameObject()) { GameObject questgiver = GetMap().GetGameObject(itr); - if (!questgiver || questgiver.GetGoType() != GameObjectTypes.QuestGiver) + if (questgiver == null || questgiver.GetGoType() != GameObjectTypes.QuestGiver) continue; response.QuestGiver.Add(new QuestGiverInfo(questgiver.GetGUID(), GetQuestDialogStatus(questgiver))); @@ -3048,7 +3048,7 @@ namespace Game.Entities continue; // hide quest if player is in raid-group and quest is no raid quest - if (GetGroup() && GetGroup().IsRaidGroup() && !qInfo.IsAllowedInRaid(GetMap().GetDifficultyID())) + if (GetGroup() != null && GetGroup().IsRaidGroup() && !qInfo.IsAllowedInRaid(GetMap().GetDifficultyID())) if (!InBattleground()) //there are two ways.. we can make every bg-quest a raidquest, or add this code here.. i don't know if this can be exploited by other quests, but i think all other quests depend on a specific area.. but keep this in mind, if something strange happens later continue; @@ -3201,7 +3201,7 @@ namespace Game.Entities { case DisplayToastType.NewItem: { - if (!item) + if (item == null) return; displayToast.BonusRoll = isBonusRoll; diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs index f931823a8..4c26e53f1 100644 --- a/Source/Game/Entities/Player/Player.Spells.cs +++ b/Source/Game/Entities/Player/Player.Spells.cs @@ -211,7 +211,7 @@ namespace Game.Entities { Pet pet = GetPet(); - if (!pet) + if (pet == null) return; Log.outDebug(LogFilter.Pet, "Pet Spells Groups"); @@ -250,7 +250,7 @@ namespace Game.Entities public bool CanSeeSpellClickOn(Creature creature) { - if (!creature.HasNpcFlag(NPCFlags.SpellClick)) + if (creature.HasNpcFlag(NPCFlags.SpellClick)) return false; var clickBounds = Global.ObjectMgr.GetSpellClickInfoMapBounds(creature.GetEntry()); @@ -871,7 +871,7 @@ namespace Game.Entities public void StopCastingBindSight() { WorldObject target = GetViewpoint(); - if (target) + if (target != null) { if (target.IsTypeMask(TypeMask.Unit)) { @@ -950,7 +950,7 @@ namespace Game.Entities var enchantDuration = m_enchantDuration[i]; if (enchantDuration.slot == slot) { - if (enchantDuration.item && enchantDuration.item.GetEnchantmentId(slot) != 0) + if (enchantDuration.item != null && enchantDuration.item.GetEnchantmentId(slot) != 0) { // Poisons and DK runes are enchants which are allowed on arenas if (Global.SpellMgr.IsArenaAllowedEnchancment(enchantDuration.item.GetEnchantmentId(slot))) @@ -973,7 +973,7 @@ namespace Game.Entities for (byte i = InventorySlots.ItemStart; i < inventoryEnd; ++i) { Item pItem = GetItemByPos(InventorySlots.Bag0, i); - if (pItem && !Global.SpellMgr.IsArenaAllowedEnchancment(pItem.GetEnchantmentId(slot))) + if (pItem != null && !Global.SpellMgr.IsArenaAllowedEnchancment(pItem.GetEnchantmentId(slot))) pItem.ClearEnchantment(slot); } @@ -981,12 +981,12 @@ namespace Game.Entities for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; ++i) { Bag pBag = GetBagByPos(i); - if (pBag) + if (pBag != null) { for (byte j = 0; j < pBag.GetBagSize(); j++) { Item pItem = pBag.GetItemByPos(j); - if (pItem && !Global.SpellMgr.IsArenaAllowedEnchancment(pItem.GetEnchantmentId(slot))) + if (pItem != null && !Global.SpellMgr.IsArenaAllowedEnchancment(pItem.GetEnchantmentId(slot))) pItem.ClearEnchantment(slot); } } @@ -1755,12 +1755,12 @@ namespace Game.Entities case ItemClass.Weapon: { Item item = GetUseableItemByPos(InventorySlots.Bag0, EquipmentSlot.MainHand); - if (item) + if (item != null) if (item != ignoreItem && item.IsFitToSpellRequirements(spellInfo)) return true; item = GetUseableItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand); - if (item) + if (item != null) if (item != ignoreItem && item.IsFitToSpellRequirements(spellInfo)) return true; break; @@ -1790,7 +1790,7 @@ namespace Game.Entities for (byte i = EquipmentSlot.Start; i < EquipmentSlot.MainHand; ++i) { Item item = GetUseableItemByPos(InventorySlots.Bag0, i); - if (item) + if (item != null) if (item != ignoreItem && item.IsFitToSpellRequirements(spellInfo)) return true; } @@ -1801,7 +1801,7 @@ namespace Game.Entities foreach (byte i in new[] { EquipmentSlot.Head, EquipmentSlot.Shoulders, EquipmentSlot.Chest, EquipmentSlot.Waist, EquipmentSlot.Legs, EquipmentSlot.Feet, EquipmentSlot.Wrist, EquipmentSlot.Hands }) { Item item = GetUseableItemByPos(InventorySlots.Bag0, i); - if (!item || item == ignoreItem || !item.IsFitToSpellRequirements(spellInfo)) + if (item == null || item == ignoreItem || !item.IsFitToSpellRequirements(spellInfo)) return false; } @@ -1834,20 +1834,20 @@ namespace Game.Entities for (byte slot = InventorySlots.ItemStart; slot < inventoryEnd; ++slot) { Item item = GetItemByPos(InventorySlots.Bag0, slot); - if (item) + if (item != null) ApplyItemObtainSpells(item, true); } for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; ++i) { Bag bag = GetBagByPos(i); - if (!bag) + if (bag == null) continue; for (byte slot = 0; slot < bag.GetBagSize(); ++slot) { Item item = bag.GetItemByPos(slot); - if (item) + if (item != null) ApplyItemObtainSpells(item, true); } } @@ -3234,7 +3234,7 @@ namespace Game.Entities { for (byte i = 0; i < InventorySlots.BagEnd; ++i) { - if (m_items[i] && !m_items[i].IsBroken() && CanUseAttackType(GetAttackBySlot(i, m_items[i].GetTemplate().GetInventoryType()))) + if (m_items[i] != null && !m_items[i].IsBroken() && CanUseAttackType(GetAttackBySlot(i, m_items[i].GetTemplate().GetInventoryType()))) { ApplyItemEquipSpell(m_items[i], false, true); // remove spells that not fit to form ApplyItemEquipSpell(m_items[i], true, true); // add spells that fit form but not active @@ -3283,7 +3283,7 @@ namespace Game.Entities if (removeActivePetCooldowns) { Pet pet = GetPet(); - if (pet) + if (pet != null) pet.GetSpellHistory().ResetAllCooldowns(); } } diff --git a/Source/Game/Entities/Player/Player.Talents.cs b/Source/Game/Entities/Player/Player.Talents.cs index 3971be6af..3d2a447ec 100644 --- a/Source/Game/Entities/Player/Player.Talents.cs +++ b/Source/Game/Entities/Player/Player.Talents.cs @@ -285,7 +285,7 @@ namespace Game.Entities // TO-DO: We need more research to know what happens with warlock's reagent Pet pet = GetPet(); - if (pet) + if (pet != null) RemovePet(pet, PetSaveMode.NotInSlot); ClearAllReactives(); @@ -428,7 +428,7 @@ namespace Game.Entities for (byte i = EquipmentSlot.Start; i < EquipmentSlot.End; ++i) { Item equippedItem = GetItemByPos(InventorySlots.Bag0, i); - if (equippedItem) + if (equippedItem != null) SetVisibleItemSlot(i, equippedItem); } diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 09d0987e6..b9992f4d6 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -932,7 +932,7 @@ namespace Game.Entities if (petStable.CurrentPetIndex == (uint)srcPetSlot) { Pet oldPet = GetPet(); - if (oldPet && !oldPet.IsAlive()) + if (oldPet != null && !oldPet.IsAlive()) { sess.SendPetStableResult(StableResult.InternalError); return; @@ -1109,7 +1109,7 @@ namespace Game.Entities public void UnsummonPetTemporaryIfAny() { Pet pet = GetPet(); - if (!pet) + if (pet == null) return; if (m_temporaryUnsummonedPetNumber == 0 && pet.IsControlled() && !pet.IsTemporarySummoned()) @@ -1179,7 +1179,7 @@ namespace Game.Entities public void StopCastingCharm() { Unit charm = GetCharmed(); - if (!charm) + if (charm == null) return; if (charm.IsTypeId(TypeId.Unit)) @@ -1219,7 +1219,7 @@ namespace Game.Entities public void CharmSpellInitialize() { Unit charm = GetFirstControlled(); - if (!charm) + if (charm == null) return; CharmInfo charmInfo = charm.GetCharmInfo(); @@ -1257,7 +1257,7 @@ namespace Game.Entities public void PossessSpellInitialize() { Unit charm = GetCharmed(); - if (!charm) + if (charm == null) return; CharmInfo charmInfo = charm.GetCharmInfo(); @@ -1281,7 +1281,7 @@ namespace Game.Entities public void VehicleSpellInitialize() { Creature vehicle = GetVehicleCreatureBase(); - if (!vehicle) + if (vehicle == null) return; PetSpells petSpells = new(); @@ -1843,7 +1843,7 @@ namespace Game.Entities // Calculates how many reputation points player gains in victim's enemy factions public void RewardReputation(Unit victim, float rate) { - if (!victim || victim.IsTypeId(TypeId.Player)) + if (victim == null || victim.IsTypeId(TypeId.Player)) return; if (victim.ToCreature().IsReputationGainDisabled()) @@ -2021,7 +2021,7 @@ namespace Game.Entities // The player was ported to another map and loses the duel immediately. // We have to perform this check before the teleport, otherwise the // ObjectAccessor won't find the flag. - if (duel != null && GetMapId() != mapid && GetMap().GetGameObject(m_playerData.DuelArbiter)) + if (duel != null && GetMapId() != mapid && GetMap().GetGameObject(m_playerData.DuelArbiter) != null) DuelComplete(DuelCompleteType.Fled); if (GetMapId() == mapid && (!instanceId.HasValue || GetInstanceId() == instanceId)) @@ -2045,7 +2045,7 @@ namespace Game.Entities if (!options.HasAnyFlag(TeleportToOptions.NotUnSummonPet)) { //same map, only remove pet if out of range for new position - if (pet && !pet.IsWithinDist3d(x, y, z, GetMap().GetVisibilityRange())) + if (pet != null && !pet.IsWithinDist3d(x, y, z, GetMap().GetVisibilityRange())) UnsummonPetTemporaryIfAny(); } @@ -2090,7 +2090,7 @@ namespace Game.Entities } // Seamless teleport can happen only if cosmetic maps match - if (!oldmap || (oldmap.GetEntry().CosmeticParentMapID != mapid && GetMapId() != mEntry.CosmeticParentMapID && + if (oldmap == null || (oldmap.GetEntry().CosmeticParentMapID != mapid && GetMapId() != mEntry.CosmeticParentMapID && !((oldmap.GetEntry().CosmeticParentMapID != -1) ^ (oldmap.GetEntry().CosmeticParentMapID != mEntry.CosmeticParentMapID)))) options &= ~TeleportToOptions.Seamless; @@ -2118,7 +2118,7 @@ namespace Game.Entities // remove player from Battlegroundon far teleport (when changing maps) Battleground bg = GetBattleground(); - if (bg) + if (bg != null) { // Note: at Battlegroundjoin Battlegroundid set before teleport // and we already will found "current" Battleground @@ -2132,12 +2132,12 @@ namespace Game.Entities { RemoveArenaSpellCooldowns(true); RemoveArenaAuras(); - if (pet) + if (pet != null) pet.RemoveArenaAuras(); } // remove pet on map change - if (pet) + if (pet != null) UnsummonPetTemporaryIfAny(); // remove all dyn objects @@ -2259,7 +2259,7 @@ namespace Game.Entities } }); - if (!m_unitMovedByMe.GetVehicleBase() || !m_unitMovedByMe.GetVehicle().GetVehicleInfo().Flags.HasAnyFlag(VehicleFlags.FixedPosition)) + if (m_unitMovedByMe.GetVehicleBase() == null || !m_unitMovedByMe.GetVehicle().GetVehicleInfo().Flags.HasAnyFlag(VehicleFlags.FixedPosition)) RemoveViolatingFlags(mi.HasMovementFlag(MovementFlag.Root), MovementFlag.Root); /*! This must be a packet spoofing attempt. MOVEMENTFLAG_ROOT sent from the client is not valid @@ -2382,7 +2382,7 @@ namespace Game.Entities public void SendSummonRequestFrom(Unit summoner) { - if (!summoner) + if (summoner == null) return; // Player already has active summon request @@ -2475,7 +2475,7 @@ namespace Game.Entities // drop flag at summon // this code can be reached only when GM is summoning player who carries flag, because player should be immune to summoning spells when he carries flag Battleground bg = GetBattleground(); - if (bg) + if (bg != null) bg.EventPlayerDroppedFlag(this); m_summon_expire = 0; @@ -2626,7 +2626,7 @@ namespace Game.Entities bool canTalk = true; GameObject go = source.ToGameObject(); Creature creature = source.ToCreature(); - if (creature) + if (creature != null) { switch (gossipMenuItem.OptionNpc) { @@ -2639,13 +2639,13 @@ namespace Game.Entities canTalk = false; break; case GossipOptionNpc.Battlemaster: - if (!creature.CanInteractWithBattleMaster(this, false)) + if (creature.CanInteractWithBattleMaster(this, false)) canTalk = false; break; case GossipOptionNpc.TalentMaster: case GossipOptionNpc.SpecializationMaster: case GossipOptionNpc.GlyphMaster: - if (!creature.CanResetTalents(this)) + if (creature.CanResetTalents(this)) canTalk = false; break; case GossipOptionNpc.Stablemaster: @@ -2705,7 +2705,7 @@ namespace Game.Entities } public void SendPreparedGossip(WorldObject source) { - if (!source) + if (source == null) return; if (source.IsTypeId(TypeId.Unit) || source.IsTypeId(TypeId.GameObject)) @@ -3450,7 +3450,7 @@ namespace Game.Entities public bool IsAllowedToLoot(Creature creature) { - if (!creature.IsDead()) + if (creature.IsDead()) return false; if (HasPendingBind()) @@ -4256,7 +4256,7 @@ namespace Game.Entities if (InBattleground()) { Battleground bg = GetBattleground(); - if (bg) + if (bg != null) bg.HandlePlayerResurrect(this); } @@ -4299,14 +4299,14 @@ namespace Game.Entities public void SetAreaSpiritHealer(Creature creature) { - if (!creature) + if (creature == null) { _areaSpiritHealerGUID = ObjectGuid.Empty; RemoveAurasDueToSpell(BattlegroundConst.SpellWaitingForResurrect); return; } - if (!creature.IsAreaSpiritHealer()) + if (creature.IsAreaSpiritHealer()) return; _areaSpiritHealerGUID = creature.GetGUID(); @@ -4434,7 +4434,7 @@ namespace Game.Entities public void SpawnCorpseBones(bool triggerSave = true) { _corpseLocation = new WorldLocation(); - if (GetMap().ConvertCorpseToBones(GetGUID())) + if (GetMap().ConvertCorpseToBones(GetGUID()) != null) if (triggerSave && !GetSession().PlayerLogoutWithSave()) // at logout we will already store the player SaveToDB(); // prevent loading as ghost without corpse } @@ -4460,7 +4460,7 @@ namespace Game.Entities // Special handle for Battlegroundmaps Battleground bg = GetBattleground(); - if (bg) + if (bg != null) closestGrave = bg.GetClosestGraveyard(this); else { @@ -4545,10 +4545,10 @@ namespace Game.Entities int CalculateCorpseReclaimDelay(bool load = false) { Corpse corpse = GetCorpse(); - if (load && !corpse) + if (load && corpse == null) return -1; - bool pvp = corpse ? corpse.GetCorpseType() == CorpseType.ResurrectablePVP : (m_ExtraFlags & PlayerExtraFlags.PVPDeath) != 0; + bool pvp = corpse != null ? corpse.GetCorpseType() == CorpseType.ResurrectablePVP : (m_ExtraFlags & PlayerExtraFlags.PVPDeath) != 0; uint delay; if (load) @@ -4696,10 +4696,10 @@ namespace Game.Entities public void RemovePet(Pet pet, PetSaveMode mode, bool returnreagent = false) { - if (!pet) + if (pet == null) pet = GetPet(); - if (pet) + if (pet != null) { Log.outDebug(LogFilter.Pet, "RemovePet {0}, {1}, {2}", pet.GetEntry(), mode, returnreagent); @@ -4707,10 +4707,10 @@ namespace Game.Entities return; } - if (returnreagent && (pet || m_temporaryUnsummonedPetNumber != 0) && !InBattleground()) + if (returnreagent && (pet != null || m_temporaryUnsummonedPetNumber != 0) && !InBattleground()) { //returning of reagents only for players, so best done here - uint spellId = pet ? pet.m_unitData.CreatedBySpell : m_oldpetspell; + uint spellId = pet != null ? pet.m_unitData.CreatedBySpell : m_oldpetspell; SpellInfo spellInfo = SpellMgr.GetSpellInfo(spellId, GetMap().GetDifficultyID()); if (spellInfo != null) @@ -4781,7 +4781,7 @@ namespace Game.Entities { SendPacket(new PetSpells()); - if (GetGroup()) + if (GetGroup() != null) SetGroupUpdateFlag(GroupUpdateFlags.Pet); } } @@ -4814,7 +4814,7 @@ namespace Game.Entities public bool InArena() { Battleground bg = GetBattleground(); - if (!bg || !bg.IsArena()) + if (bg == null || !bg.IsArena()) return false; return true; @@ -5341,7 +5341,7 @@ namespace Game.Entities // update level to hunter/summon pet Pet pet = GetPet(); - if (pet) + if (pet != null) pet.SynchronizeLevelWithOwner(); MailLevelReward mailReward = ObjectMgr.GetMailLevelReward(level, GetRace()); @@ -5448,7 +5448,7 @@ namespace Game.Entities return null; // alive or spirit healer - if (!creature.IsAlive() && !creature.GetCreatureDifficulty().TypeFlags.HasFlag(CreatureTypeFlags.InteractWhileDead)) + if (creature.IsAlive() && !creature.GetCreatureDifficulty().TypeFlags.HasFlag(CreatureTypeFlags.InteractWhileDead)) return null; // appropriate npc type @@ -5467,7 +5467,7 @@ namespace Game.Entities return null; // not allow interaction under control, but allow with own pets - if (!creature.GetCharmerGUID().IsEmpty()) + if (creature.GetCharmerGUID().IsEmpty()) return null; // not unfriendly/hostile @@ -5475,7 +5475,7 @@ namespace Game.Entities return null; // not too far, taken from CGGameUI::SetInteractTarget - if (!creature.IsWithinDistInMap(this, creature.GetCombatReach() + 4.0f)) + if (creature.IsWithinDistInMap(this, creature.GetCombatReach() + 4.0f)) return null; return creature; @@ -5510,7 +5510,7 @@ namespace Game.Entities public GameObject GetGameObjectIfCanInteractWith(ObjectGuid guid, GameObjectTypes type) { GameObject go = GetGameObjectIfCanInteractWith(guid); - if (!go) + if (go == null) return null; if (go.GetGoType() != type) @@ -5980,7 +5980,7 @@ namespace Game.Entities // update level to hunter/summon pet Pet pet = GetPet(); - if (pet) + if (pet != null) pet.SynchronizeLevelWithOwner(); } public void InitDataForForm(bool reapplyMods = false) @@ -6246,10 +6246,10 @@ namespace Game.Entities return false; // group update - if (GetGroup()) + if (GetGroup() != null) SetGroupUpdateFlag(GroupUpdateFlags.Position); - if (GetTrader() && !IsWithinDistInMap(GetTrader(), SharedConst.InteractionDistance)) + if (GetTrader() != null && !IsWithinDistInMap(GetTrader(), SharedConst.InteractionDistance)) GetSession().SendCancelTrade(); CheckAreaExploreAndOutdoor(); @@ -6441,7 +6441,7 @@ namespace Game.Entities public void SendBuyError(BuyResult msg, Creature creature, uint item) { BuyFailed packet = new(); - packet.VendorGUID = creature ? creature.GetGUID() : ObjectGuid.Empty; + packet.VendorGUID = creature != null ? creature.GetGUID() : ObjectGuid.Empty; packet.Muid = item; packet.Reason = msg; SendPacket(packet); @@ -6449,7 +6449,7 @@ namespace Game.Entities public void SendSellError(SellResult msg, Creature creature, ObjectGuid guid) { SellResponse sellResponse = new(); - sellResponse.VendorGUID = creature ? creature.GetGUID() : ObjectGuid.Empty; + sellResponse.VendorGUID = creature != null ? creature.GetGUID() : ObjectGuid.Empty; sellResponse.ItemGUIDs.Add(guid); sellResponse.Reason = msg; SendPacket(sellResponse); @@ -6553,7 +6553,7 @@ namespace Game.Entities public override void Whisper(uint textId, Player target, bool isBossWhisper = false) { - if (!target) + if (target == null) return; BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(textId); @@ -6685,9 +6685,9 @@ namespace Game.Entities bonus_xp = victim != null ? _restMgr.GetRestBonusFor(RestTypes.XP, xp) : 0; // XP resting bonus LogXPGain packet = new(); - packet.Victim = victim ? victim.GetGUID() : ObjectGuid.Empty; + packet.Victim = victim != null ? victim.GetGUID() : ObjectGuid.Empty; packet.Original = (int)(xp + bonus_xp); - packet.Reason = victim ? PlayerLogXPReason.Kill : PlayerLogXPReason.NoKill; + packet.Reason = victim != null ? PlayerLogXPReason.Kill : PlayerLogXPReason.NoKill; packet.Amount = (int)xp; packet.GroupBonus = group_rate; SendPacket(packet); @@ -7154,12 +7154,12 @@ namespace Game.Entities if (GetLevel() <= WorldConfig.GetIntValue(WorldCfg.MaxRecruitAFriendBonusPlayerLevel) || !forXP) { Group group = GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); - if (!player) + if (player == null) continue; if (!player.IsAtRecruitAFriendDistance(this)) @@ -7192,11 +7192,11 @@ namespace Game.Entities bool IsAtRecruitAFriendDistance(WorldObject pOther) { - if (!pOther || !IsInMap(pOther)) + if (pOther == null || !IsInMap(pOther)) return false; WorldObject player = GetCorpse(); - if (!player || IsAlive()) + if (player == null || IsAlive()) player = this; return pOther.GetDistance(player) <= WorldConfig.GetFloatValue(WorldCfg.MaxRecruitAFriendDistance); @@ -7228,7 +7228,7 @@ namespace Game.Entities randomRoll.RollerWowAccount = GetSession().GetAccountGUID(); Group group = GetGroup(); - if (group) + if (group != null) group.BroadcastPacket(randomRoll, false); else SendPacket(randomRoll); @@ -7409,7 +7409,7 @@ namespace Game.Entities public void SetClientControl(Unit target, bool allowMove) { // a player can never client control nothing - Cypher.Assert(target); + Cypher.Assert(target != null); // don't allow possession to be overridden if (target.HasUnitState(UnitState.Charmed) && (GetGUID() != target.GetCharmerGUID())) diff --git a/Source/Game/Entities/Player/SocialMgr.cs b/Source/Game/Entities/Player/SocialMgr.cs index 7f068c5d1..ebd307675 100644 --- a/Source/Game/Entities/Player/SocialMgr.cs +++ b/Source/Game/Entities/Player/SocialMgr.cs @@ -22,7 +22,7 @@ namespace Game.Entities public static void GetFriendInfo(Player player, ObjectGuid friendGUID, FriendInfo friendInfo) { - if (!player) + if (player == null) return; friendInfo.Status = FriendStatus.Offline; @@ -31,7 +31,7 @@ namespace Game.Entities friendInfo.Class = 0; Player target = Global.ObjAccessor.FindPlayer(friendGUID); - if (!target) + if (target == null) return; var playerFriendInfo = player.GetSocial().PlayerSocialMap.LookupByKey(friendGUID); @@ -84,7 +84,7 @@ namespace Game.Entities void BroadcastToFriendListers(Player player, ServerPacket packet) { - if (!player) + if (player == null) return; AccountTypes gmSecLevel = (AccountTypes)WorldConfig.GetIntValue(WorldCfg.GmLevelInWhoList); @@ -94,7 +94,7 @@ namespace Game.Entities if (info != null && info.Flags.HasAnyFlag(SocialFlag.Friend)) { Player target = Global.ObjAccessor.FindPlayer(pair.Key); - if (!target || !target.IsInWorld) + if (target == null || !target.IsInWorld) continue; WorldSession session = target.GetSession(); @@ -244,7 +244,7 @@ namespace Game.Entities public void SendSocialList(Player player, SocialFlag flags) { - if (!player) + if (player == null) return; uint friendsCount = 0; diff --git a/Source/Game/Entities/Player/TradeData.cs b/Source/Game/Entities/Player/TradeData.cs index 95e2c42a6..2caaee21a 100644 --- a/Source/Game/Entities/Player/TradeData.cs +++ b/Source/Game/Entities/Player/TradeData.cs @@ -51,7 +51,7 @@ namespace Game.Entities public void SetItem(TradeSlots slot, Item item, bool update = false) { - ObjectGuid itemGuid = item ? item.GetGUID() : ObjectGuid.Empty; + ObjectGuid itemGuid = item != null ? item.GetGUID() : ObjectGuid.Empty; if (m_items[(int)slot] == itemGuid && !update) return; @@ -77,7 +77,7 @@ namespace Game.Entities public void SetSpell(uint spell_id, Item castItem = null) { - ObjectGuid itemGuid = castItem ? castItem.GetGUID() : ObjectGuid.Empty; + ObjectGuid itemGuid = castItem != null ? castItem.GetGUID() : ObjectGuid.Empty; if (m_spell == spell_id && m_spellCastItem == itemGuid) return; diff --git a/Source/Game/Entities/StatSystem.cs b/Source/Game/Entities/StatSystem.cs index ea52e2c7e..6e29265e4 100644 --- a/Source/Game/Entities/StatSystem.cs +++ b/Source/Game/Entities/StatSystem.cs @@ -510,9 +510,9 @@ namespace Game.Entities // group update Player player = ToPlayer(); - if (player) + if (player != null) { - if (player.GetGroup()) + if (player.GetGroup() != null) player.SetGroupUpdateFlag(GroupUpdateFlags.CurHp); } else if (IsPet()) @@ -536,7 +536,7 @@ namespace Game.Entities // group update if (IsTypeId(TypeId.Player)) { - if (ToPlayer().GetGroup()) + if (ToPlayer().GetGroup() != null) ToPlayer().SetGroupUpdateFlag(GroupUpdateFlags.MaxHp); } else if (IsPet()) @@ -590,7 +590,7 @@ namespace Game.Entities Player thisPlayer = ToPlayer(); if (thisPlayer != null) { - if (thisPlayer.GetGroup()) + if (thisPlayer.GetGroup() != null) thisPlayer.SetGroupUpdateFlag(GroupUpdateFlags.PowerType); } /*else if (IsPet()) TODO 6.x @@ -634,7 +634,7 @@ namespace Game.Entities // group update if (IsTypeId(TypeId.Player)) { - if (ToPlayer().GetGroup()) + if (ToPlayer().GetGroup() != null) ToPlayer().SetGroupUpdateFlag(GroupUpdateFlags.MaxPower); } /*else if (IsPet()) TODO 6.x @@ -675,7 +675,7 @@ namespace Game.Entities if (IsTypeId(TypeId.Player)) { Player player = ToPlayer(); - if (player.GetGroup()) + if (player.GetGroup() != null) player.SetGroupUpdateFlag(GroupUpdateFlags.CurPower); } /*else if (IsPet()) TODO 6.x @@ -788,7 +788,7 @@ namespace Game.Entities target = owner; } - if (!target) + if (target == null) return; damage -= (int)target.GetDamageReduction((uint)damage); @@ -809,13 +809,13 @@ namespace Game.Entities float GetCombatRatingReduction(CombatRating cr) { Player player = ToPlayer(); - if (player) + if (player != null) return player.GetRatingBonusValue(cr); // Player's pet get resilience from owner - else if (IsPet() && GetOwner()) + else if (IsPet() && GetOwner() != null) { Player owner = GetOwner().ToPlayer(); - if (owner) + if (owner != null) return owner.GetRatingBonusValue(cr); } @@ -954,7 +954,7 @@ namespace Game.Entities float chance = 0.0f; float levelBonus = 0.0f; Player playerVictim = victim.ToPlayer(); - if (playerVictim) + if (playerVictim != null) chance = playerVictim.m_activePlayerData.DodgePercentage; else { @@ -991,15 +991,15 @@ namespace Game.Entities float chance = 0.0f; float levelBonus = 0.0f; Player playerVictim = victim.ToPlayer(); - if (playerVictim) + if (playerVictim != null) { if (playerVictim.CanParry()) { Item tmpitem = playerVictim.GetWeaponForAttack(WeaponAttackType.BaseAttack, true); - if (!tmpitem) + if (tmpitem == null) tmpitem = playerVictim.GetWeaponForAttack(WeaponAttackType.OffAttack, true); - if (tmpitem) + if (tmpitem != null) chance = playerVictim.m_activePlayerData.ParryPercentage; } } @@ -1039,12 +1039,12 @@ namespace Game.Entities float chance = 0.0f; float levelBonus = 0.0f; Player playerVictim = victim.ToPlayer(); - if (playerVictim) + if (playerVictim != null) { if (playerVictim.CanBlock()) { Item tmpitem = playerVictim.GetUseableItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand); - if (tmpitem && !tmpitem.IsBroken() && tmpitem.GetTemplate().GetInventoryType() == InventoryType.Shield) + if (tmpitem != null && !tmpitem.IsBroken() && tmpitem.GetTemplate().GetInventoryType() == InventoryType.Shield) chance = playerVictim.m_activePlayerData.BlockPercentage; } } @@ -1391,7 +1391,7 @@ namespace Game.Entities { UpdateDamagePhysical(WeaponAttackType.BaseAttack); Item offhand = GetWeaponForAttack(WeaponAttackType.OffAttack, true); - if (offhand) + if (offhand != null) if (CanDualWield() || offhand.GetTemplate().HasFlag(ItemFlags3.AlwaysAllowDualWield)) UpdateDamagePhysical(WeaponAttackType.OffAttack); @@ -1432,7 +1432,7 @@ namespace Game.Entities SetArmor((int)value, (int)(value - baseValue)); Pet pet = GetPet(); - if (pet) + if (pet != null) pet.UpdateArmor(); UpdateAttackPowerAndDamage(); // armor dependent auras update for SPELL_AURA_MOD_ATTACK_POWER_OF_ARMOR diff --git a/Source/Game/Entities/TemporarySummon.cs b/Source/Game/Entities/TemporarySummon.cs index 12eeadc52..f32e9ca97 100644 --- a/Source/Game/Entities/TemporarySummon.cs +++ b/Source/Game/Entities/TemporarySummon.cs @@ -385,7 +385,7 @@ namespace Game.Entities bool IsSharingTotemSlotWith(ObjectGuid objectGuid) { Creature otherSummon = GetMap().GetCreature(objectGuid); - if (!otherSummon) + if (otherSummon == null) return false; SpellInfo mySummonSpell = Global.SpellMgr.GetSpellInfo(m_unitData.CreatedBySpell, Difficulty.None); @@ -456,7 +456,7 @@ namespace Game.Entities : base(properties, owner, isWorldObject) { m_owner = owner; - Cypher.Assert(m_owner); + Cypher.Assert(m_owner != null); UnitTypeMask |= UnitTypeMask.Minion; m_followAngle = SharedConst.PetFollowAngle; /// @todo: Find correct way @@ -513,7 +513,7 @@ namespace Game.Entities public override string GetDebugInfo() { - return $"{base.GetDebugInfo()}\nOwner: {(GetOwner() ? GetOwner().GetGUID() : "")}"; + return $"{base.GetDebugInfo()}\nOwner: {(GetOwner() != null ? GetOwner().GetGUID() : "")}"; } public override Unit GetOwner() { return m_owner; } @@ -1033,7 +1033,7 @@ namespace Game.Entities else val = 2 * GetStat(Stats.Strength) - 20.0f; - Player owner = GetOwner() ? GetOwner().ToPlayer() : null; + Player owner = GetOwner() != null ? GetOwner().ToPlayer() : null; if (owner != null) { if (IsHunterPet()) //hunter pets benefit from owner's attack power diff --git a/Source/Game/Entities/Totem.cs b/Source/Game/Entities/Totem.cs index 1bc7abd3c..4ba0ededc 100644 --- a/Source/Game/Entities/Totem.cs +++ b/Source/Game/Entities/Totem.cs @@ -42,7 +42,7 @@ namespace Game.Entities { // client requires SMSG_TOTEM_CREATED to be sent before adding to world and before removing old totem Player owner = GetOwner().ToPlayer(); - if (owner) + if (owner != null) { int slot = m_Properties.Slot; if (slot == (int)SummonSlot.Any) @@ -121,12 +121,12 @@ namespace Game.Entities GetSpellHistory().SendCooldownEvent(spell, 0, null, false); Group group = owner.GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player target = refe.GetSource(); - if (target && target.IsInMap(owner) && group.SameSubGroup(owner, target)) + if (target != null && target.IsInMap(owner) && group.SameSubGroup(owner, target)) target.RemoveAurasDueToSpell(GetSpell(), GetGUID()); } } diff --git a/Source/Game/Entities/Transport.cs b/Source/Game/Entities/Transport.cs index 11f6fdbdc..4c88cecc1 100644 --- a/Source/Game/Entities/Transport.cs +++ b/Source/Game/Entities/Transport.cs @@ -327,7 +327,7 @@ namespace Game.Entities passenger.m_movementInfo.transport.guid = GetGUID(); Player player = passenger.ToPlayer(); - if (player) + if (player != null) Global.ScriptMgr.OnAddPassenger(this, player); } } @@ -358,7 +358,7 @@ namespace Game.Entities return null; Creature creature = Creature.CreateCreatureFromDB(guid, map, false, true); - if (!creature) + if (creature == null) return null; float x, y, z, o; @@ -377,7 +377,7 @@ namespace Game.Entities // because the current GameObjectModel cannot be moved without recreating creature.AddUnitState(UnitState.IgnorePathfinding); - if (!creature.IsPositionValid()) + if (creature.IsPositionValid()) { Log.outError(LogFilter.Transport, "Creature (guidlow {0}, entry {1}) not created. Suggested coordinates aren't valid (X: {2} Y: {3})", creature.GetGUID().ToString(), creature.GetEntry(), creature.GetPositionX(), creature.GetPositionY()); return null; @@ -401,7 +401,7 @@ namespace Game.Entities return null; GameObject go = CreateGameObjectFromDB(guid, map, false); - if (!go) + if (go == null) return null; float x, y, z, o; @@ -653,7 +653,7 @@ namespace Game.Entities { // will be relocated in UpdatePosition of the vehicle Unit veh = obj.ToUnit().GetVehicleBase(); - if (veh) + if (veh != null) if (veh.GetTransport() == this) continue; diff --git a/Source/Game/Entities/Unit/CharmInfo.cs b/Source/Game/Entities/Unit/CharmInfo.cs index c92a30bcb..805ef795b 100644 --- a/Source/Game/Entities/Unit/CharmInfo.cs +++ b/Source/Game/Entities/Unit/CharmInfo.cs @@ -40,7 +40,7 @@ namespace Game.Entities if (_unit.IsTypeId(TypeId.Unit)) { Creature creature = _unit.ToCreature(); - if (creature) + if (creature != null) creature.SetReactState(_oldReactState); } } diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs index 22f604311..77afaaf58 100644 --- a/Source/Game/Entities/Unit/Unit.Combat.cs +++ b/Source/Game/Entities/Unit/Unit.Combat.cs @@ -263,7 +263,7 @@ namespace Game.Entities if (creature.IsInEvadeMode()) return false; - if (!creature.CanMelee()) + if (creature.CanMelee()) meleeAttack = false; } @@ -372,7 +372,7 @@ namespace Game.Entities { SendMessageToSet(new SAttackStop(this, victim), true); - if (victim) + if (victim != null) Log.outInfo(LogFilter.Unit, "{0} {1} stopped attacking {2} {3}", (IsTypeId(TypeId.Player) ? "Player" : "Creature"), GetGUID().ToString(), (victim.IsTypeId(TypeId.Player) ? "player" : "creature"), victim.GetGUID().ToString()); else @@ -448,13 +448,13 @@ namespace Game.Entities if (mgr.HasPvPCombat()) return mgr.GetPvPCombatRefs().First().Value.GetOther(this); - if (owner && (owner.GetCombatManager().HasPvPCombat())) + if (owner != null && (owner.GetCombatManager().HasPvPCombat())) return owner.GetCombatManager().GetPvPCombatRefs().First().Value.GetOther(owner); if (mgr.HasPvECombat()) return mgr.GetPvECombatRefs().First().Value.GetOther(this); - if (owner && (owner.GetCombatManager().HasPvECombat())) + if (owner != null && (owner.GetCombatManager().HasPvECombat())) return owner.GetCombatManager().GetPvECombatRefs().First().Value.GetOther(owner); return null; @@ -676,7 +676,7 @@ namespace Game.Entities Player myPlayerOwner = GetCharmerOrOwnerPlayerOrPlayerItself(); Player targetPlayerOwner = target.GetCharmerOrOwnerPlayerOrPlayerItself(); - if (myPlayerOwner && targetPlayerOwner && !(myPlayerOwner.duel != null && myPlayerOwner.duel.Opponent == targetPlayerOwner)) + if (myPlayerOwner != null && targetPlayerOwner != null && !(myPlayerOwner.duel != null && myPlayerOwner.duel.Opponent == targetPlayerOwner)) { myPlayerOwner.UpdatePvP(true); myPlayerOwner.SetContestedPvP(targetPlayerOwner); @@ -720,7 +720,7 @@ namespace Game.Entities isRewardAllowed = isRewardAllowed && !creature.GetTapList().Empty(); List tappers = new(); - if (isRewardAllowed && creature) + if (isRewardAllowed && creature != null) { foreach (ObjectGuid tapperGuid in creature.GetTapList()) { @@ -729,12 +729,12 @@ namespace Game.Entities tappers.Add(tapper); } - if (!creature.CanHaveLoot()) + if (creature.CanHaveLoot()) isRewardAllowed = false; } // Exploit fix - if (creature && creature.IsPet() && creature.GetOwnerGUID().IsPlayer()) + if (creature != null && creature.IsPet() && creature.GetOwnerGUID().IsPlayer()) isRewardAllowed = false; // Reward player, his pets, and group/raid members @@ -750,13 +750,13 @@ namespace Game.Entities if (groups.Add(tapperGroup)) { PartyKillLog partyKillLog = new(); - partyKillLog.Player = player && tapperGroup.IsMember(player.GetGUID()) ? player.GetGUID() : tapper.GetGUID(); + partyKillLog.Player = player != null && tapperGroup.IsMember(player.GetGUID()) ? player.GetGUID() : tapper.GetGUID(); partyKillLog.Victim = victim.GetGUID(); partyKillLog.Write(); tapperGroup.BroadcastPacket(partyKillLog, tapperGroup.GetMemberGroup(tapper.GetGUID()) != 0); - if (creature) + if (creature != null) tapperGroup.UpdateLooterGuid(creature, true); } } @@ -770,7 +770,7 @@ namespace Game.Entities } // Generate loot before updating looter - if (creature) + if (creature != null) { DungeonEncounterRecord dungeonEncounter = null; InstanceScript instance = creature.GetInstanceScript(); @@ -788,7 +788,7 @@ namespace Game.Entities else if (!tappers.Empty()) { Group group = !groups.Empty() ? groups.First() : null; - Player looter = group ? Global.ObjAccessor.GetPlayer(creature, group.GetLooterGuid()) : tappers[0]; + Player looter = group != null ? Global.ObjAccessor.GetPlayer(creature, group.GetLooterGuid()) : tappers[0]; Loot loot = new(creature.GetMap(), creature.GetGUID(), LootType.Corpse, dungeonEncounter != null ? group : null); @@ -799,7 +799,7 @@ namespace Game.Entities if (creature.GetLootMode() > 0) loot.GenerateMoneyLoot(creature.GetCreatureDifficulty().GoldMin, creature.GetCreatureDifficulty().GoldMax); - if (group) + if (group != null) loot.NotifyLootList(creature.GetMap()); creature.m_personalLoot[looter.GetGUID()] = loot; // trash mob loot is personal, generated with round robin rules @@ -920,10 +920,10 @@ namespace Game.Entities { Log.outDebug(LogFilter.Unit, "DealDamageNotPlayer"); - if (!creature.IsPet()) + if (creature.IsPet()) { // must be after setDeathState which resets dynamic flags - if (!creature.IsFullyLooted()) + if (creature.IsFullyLooted()) creature.SetDynamicFlag(UnitDynFlags.Lootable); else creature.AllLootRemovedFromCorpse(); @@ -978,10 +978,10 @@ namespace Game.Entities if (player != null && player.InBattleground()) { Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) { Player playerVictim = victim.ToPlayer(); - if (playerVictim) + if (playerVictim != null) bg.HandleKillPlayer(playerVictim, player); else bg.HandleKillUnit(victim.ToCreature(), player); @@ -1418,7 +1418,7 @@ namespace Game.Entities return GetBaseAttackTime(attType) / 1000.0f; Item weapon = ToPlayer().GetWeaponForAttack(attType, true); - if (!weapon) + if (weapon == null) return 2.0f; if (!normalized) @@ -1484,7 +1484,7 @@ namespace Game.Entities public bool IsWithinMeleeRangeAt(Position pos, Unit obj) { - if (!obj || !IsInMap(obj) || !InSamePhase(obj)) + if (obj == null || !IsInMap(obj) || !InSamePhase(obj)) return false; float dx = pos.GetPositionX() - obj.GetPositionX(); diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs index d22e725f4..146856655 100644 --- a/Source/Game/Entities/Unit/Unit.Movement.cs +++ b/Source/Game/Entities/Unit/Unit.Movement.cs @@ -105,13 +105,13 @@ namespace Game.Entities if (!IsInCombat()) { Pet pet = ToPlayer().GetPet(); - if (pet) + if (pet != null) pet.SetSpeedRate(mtype, m_speed_rate[(int)mtype]); } } Player playerMover = GetUnitBeingMoved()?.ToPlayer(); // unit controlled by a player. - if (playerMover) + if (playerMover != null) { // Send notification to self MoveSetSpeed selfpacket = new(moveTypeToOpcode[(int)mtype, 1]); @@ -248,18 +248,18 @@ namespace Game.Entities public void KnockbackFrom(Position origin, float speedXY, float speedZ, SpellEffectExtraData spellEffectExtraData = null) { Player player = ToPlayer(); - if (!player) + if (player == null) { Unit charmer = GetCharmer(); - if (charmer) + if (charmer != null) { player = charmer.ToPlayer(); - if (player && player.GetUnitBeingMoved() != this) + if (player != null && player.GetUnitBeingMoved() != this) player = null; } } - if (!player) + if (player == null) GetMotionMaster().MoveKnockbackFrom(origin, speedXY, speedZ, spellEffectExtraData); else { @@ -298,7 +298,7 @@ namespace Game.Entities RemoveUnitMovementFlag(MovementFlag.DisableCollision); Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(disable ? ServerOpcodes.MoveSplineEnableCollision : ServerOpcodes.MoveEnableCollision); packet.MoverGUID = GetGUID(); @@ -333,7 +333,7 @@ namespace Game.Entities RemoveUnitMovementFlag2(MovementFlag2.CanSwimToFlyTrans); Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveEnableTransitionBetweenSwimAndFly : ServerOpcodes.MoveDisableTransitionBetweenSwimAndFly); packet.MoverGUID = GetGUID(); @@ -360,7 +360,7 @@ namespace Game.Entities RemoveUnitMovementFlag2(MovementFlag2.CanTurnWhileFalling); Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveSetCanTurnWhileFalling : ServerOpcodes.MoveUnsetCanTurnWhileFalling); packet.MoverGUID = GetGUID(); @@ -386,7 +386,7 @@ namespace Game.Entities RemoveUnitMovementFlag2(MovementFlag2.CanDoubleJump); Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveEnableDoubleJump : ServerOpcodes.MoveDisableDoubleJump); packet.MoverGUID = GetGUID(); @@ -543,7 +543,7 @@ namespace Game.Entities if (normalization != 0) { Creature creature1 = ToCreature(); - if (creature1) + if (creature1 != null) { ulong immuneMask = creature1.GetCreatureTemplate().MechanicImmuneMask; if (Convert.ToBoolean(immuneMask & (1 << ((int)Mechanics.Snare - 1))) || Convert.ToBoolean(immuneMask & (1 << ((int)Mechanics.Daze - 1)))) @@ -683,7 +683,7 @@ namespace Game.Entities public bool IsWithinBoundaryRadius(Unit obj) { - if (!obj || !IsInMap(obj) || !InSamePhase(obj)) + if (obj == null || !IsInMap(obj) || !InSamePhase(obj)) return false; float objBoundaryRadius = Math.Max(obj.GetBoundingRadius(), SharedConst.MinMeleeReach); @@ -706,7 +706,7 @@ namespace Game.Entities Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(disable ? ServerOpcodes.MoveDisableGravity : ServerOpcodes.MoveEnableGravity); packet.MoverGUID = GetGUID(); @@ -892,7 +892,7 @@ namespace Game.Entities // Set _lastLiquid before casting liquid spell to avoid infinite loops _lastLiquid = curLiquid; - if (curLiquid != null && curLiquid.SpellID != 0 && (!player || !player.IsGameMaster())) + if (curLiquid != null && curLiquid.SpellID != 0 && (player == null || !player.IsGameMaster())) CastSpell(this, curLiquid.SpellID, true); } @@ -967,7 +967,7 @@ namespace Game.Entities ToPlayer().SetFallInformation(0, GetPositionZ()); Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveSetCanFly : ServerOpcodes.MoveUnsetCanFly); packet.MoverGUID = GetGUID(); @@ -1000,7 +1000,7 @@ namespace Game.Entities Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveSetWaterWalk : ServerOpcodes.MoveSetLandWalk); packet.MoverGUID = GetGUID(); @@ -1033,7 +1033,7 @@ namespace Game.Entities Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveSetFeatherFall : ServerOpcodes.MoveSetNormalFall); packet.MoverGUID = GetGUID(); @@ -1081,7 +1081,7 @@ namespace Game.Entities } Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(enable ? ServerOpcodes.MoveSetHovering : ServerOpcodes.MoveUnsetHovering); packet.MoverGUID = GetGUID(); @@ -1114,7 +1114,7 @@ namespace Game.Entities public bool IsWithinCombatRange(Unit obj, float dist2compare) { - if (!obj || !IsInMap(obj) || !InSamePhase(obj)) + if (obj == null || !IsInMap(obj) || !InSamePhase(obj)) return false; float dx = GetPositionX() - obj.GetPositionX(); @@ -1321,7 +1321,7 @@ namespace Game.Entities } Player playerMover = GetUnitBeingMoved()?.ToPlayer();// unit controlled by a player. - if (playerMover) + if (playerMover != null) { MoveSetFlag packet = new(apply ? ServerOpcodes.MoveRoot : ServerOpcodes.MoveUnroot); packet.MoverGUID = GetGUID(); @@ -1369,7 +1369,7 @@ namespace Game.Entities // block / allow control to real player in control (eg charmer) if (IsPlayer()) { - if (m_playerMovingMe) + if (m_playerMovingMe != null) m_playerMovingMe.SetClientControl(this, !apply); } } @@ -1394,7 +1394,7 @@ namespace Game.Entities // block / allow control to real player in control (eg charmer) if (IsPlayer()) { - if (m_playerMovingMe) + if (m_playerMovingMe != null) m_playerMovingMe.SetClientControl(this, !apply); } } @@ -1509,7 +1509,7 @@ namespace Game.Entities void SendSetVehicleRecId(uint vehicleId) { Player player = ToPlayer(); - if (player) + if (player != null) { MoveSetVehicleRecID moveSetVehicleRec = new(); moveSetVehicleRec.MoverGUID = GetGUID(); @@ -1673,11 +1673,7 @@ namespace Game.Entities Player GetPlayerBeingMoved() { - Unit mover = GetUnitBeingMoved(); - if (mover) - return mover.ToPlayer(); - - return null; + return GetUnitBeingMoved()?.ToPlayer(); } public Player GetPlayerMovingMe() { return m_playerMovingMe; } @@ -1801,7 +1797,7 @@ namespace Game.Entities if (_positionUpdateInfo.Turned) RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Turning); - if (_positionUpdateInfo.Relocated && !GetVehicle()) + if (_positionUpdateInfo.Relocated && GetVehicle() == null) RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags.Moving); } @@ -1836,7 +1832,7 @@ namespace Game.Entities // should this really be the unit _being_ moved? not the unit doing the moving? Player playerMover = GetUnitBeingMoved()?.ToPlayer(); - if (playerMover) + if (playerMover != null) { float x, y, z, o; pos.GetPosition(out x, out y, out z, out o); diff --git a/Source/Game/Entities/Unit/Unit.Pets.cs b/Source/Game/Entities/Unit/Unit.Pets.cs index e426c2bc4..747fd872c 100644 --- a/Source/Game/Entities/Unit/Unit.Pets.cs +++ b/Source/Game/Entities/Unit/Unit.Pets.cs @@ -114,7 +114,7 @@ namespace Game.Entities if (minion.IsGuardianPet()) { Guardian oldPet = GetGuardianPet(); - if (oldPet) + if (oldPet != null) { if (oldPet != minion && (oldPet.IsPet() || minion.IsPet() || oldPet.GetEntry() != minion.GetEntry())) { @@ -257,7 +257,7 @@ namespace Game.Entities public bool SetCharmedBy(Unit charmer, CharmType type, AuraApplication aurApp = null) { - if (!charmer) + if (charmer == null) return false; // dismount players when charmed @@ -268,7 +268,7 @@ namespace Game.Entities charmer.RemoveAurasByType(AuraType.Mounted); Cypher.Assert(type != CharmType.Possess || charmer.IsTypeId(TypeId.Player)); - Cypher.Assert((type == CharmType.Vehicle) == (GetVehicleKit() && GetVehicleKit().IsControllableVehicle())); + Cypher.Assert((type == CharmType.Vehicle) == (GetVehicleKit() != null && GetVehicleKit().IsControllableVehicle())); Log.outDebug(LogFilter.Unit, "SetCharmedBy: charmer {0} (GUID {1}), charmed {2} (GUID {3}), type {4}.", charmer.GetEntry(), charmer.GetGUID().ToString(), GetEntry(), GetGUID().ToString(), type); @@ -297,7 +297,7 @@ namespace Game.Entities Player playerCharmer = charmer.ToPlayer(); // Charmer stop charming - if (playerCharmer) + if (playerCharmer != null) { playerCharmer.StopCastingCharm(); playerCharmer.StopCastingBindSight(); @@ -340,7 +340,7 @@ namespace Game.Entities charmer.SetCharm(this, true); Player player = ToPlayer(); - if (player) + if (player != null) { if (player.IsAFK()) player.ToggleAFK(); @@ -369,7 +369,7 @@ namespace Game.Entities GetCharmInfo().InitCharmCreateSpells(); } - if (playerCharmer) + if (playerCharmer != null) { switch (type) { @@ -433,12 +433,12 @@ namespace Game.Entities if (!IsCharmed()) return; - if (charmer) + if (charmer != null) Cypher.Assert(charmer == GetCharmer()); else charmer = GetCharmer(); - Cypher.Assert(charmer); + Cypher.Assert(charmer != null); CharmType type; if (HasUnitState(UnitState.Possessed)) @@ -473,7 +473,7 @@ namespace Game.Entities m_combatManager.RevalidateCombat(); Player playerCharmer = charmer.ToPlayer(); - if (playerCharmer) + if (playerCharmer != null) { switch (type) { @@ -512,7 +512,7 @@ namespace Game.Entities if (player != null) player.SetClientControl(this, true); - if (playerCharmer && this != charmer.GetFirstControlled()) + if (playerCharmer != null && this != charmer.GetFirstControlled()) playerCharmer.SendRemoveControlBar(); // a guardian should always have charminfo @@ -607,7 +607,7 @@ namespace Game.Entities charm.SetUnitFlag(UnitFlags.PlayerControlled); charm.ToPlayer().UpdatePvPState(); } - else if (player) + else if (player != null) { charm.m_ControlledByPlayer = true; charm.SetUnitFlag(UnitFlags.PlayerControlled); @@ -637,7 +637,7 @@ namespace Game.Entities { // Sequence: charmed, pet, other guardians Unit unit = GetCharmed(); - if (!unit) + if (unit == null) { ObjectGuid guid = GetMinionGUID(); if (!guid.IsEmpty()) @@ -685,7 +685,7 @@ namespace Game.Entities public void SendPetActionFeedback(PetActionFeedback msg, uint spellId) { Unit owner = GetOwner(); - if (!owner || !owner.IsTypeId(TypeId.Player)) + if (owner == null || !owner.IsTypeId(TypeId.Player)) return; PetActionFeedbackPacket petActionFeedback = new(); @@ -697,7 +697,7 @@ namespace Game.Entities public void SendPetTalk(PetTalk pettalk) { Unit owner = GetOwner(); - if (!owner || !owner.IsTypeId(TypeId.Player)) + if (owner == null || !owner.IsTypeId(TypeId.Player)) return; PetActionSound petActionSound = new(); @@ -709,7 +709,7 @@ namespace Game.Entities public void SendPetAIReaction(ObjectGuid guid) { Unit owner = GetOwner(); - if (!owner || !owner.IsTypeId(TypeId.Player)) + if (owner == null || !owner.IsTypeId(TypeId.Player)) return; AIReaction packet = new(); diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs index 6ef665dfa..60913b759 100644 --- a/Source/Game/Entities/Unit/Unit.Spells.cs +++ b/Source/Game/Entities/Unit/Unit.Spells.cs @@ -24,7 +24,7 @@ namespace Game.Entities public int SpellBaseDamageBonusDone(SpellSchoolMask schoolMask) { Player thisPlayer = ToPlayer(); - if (thisPlayer) + if (thisPlayer != null) { float overrideSP = thisPlayer.m_activePlayerData.OverrideSpellPowerByAPPercent; if (overrideSP > 0.0f) @@ -105,7 +105,7 @@ namespace Game.Entities { float ApCoeffMod = spellEffectInfo.BonusCoefficientFromAP; Player modOwner = GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { ApCoeffMod *= 100.0f; modOwner.ApplySpellMod(spellProto, SpellModOp.BonusCoefficient, ref ApCoeffMod); @@ -129,7 +129,7 @@ namespace Game.Entities { float coeff = spellEffectInfo.BonusCoefficient; Player modOwner1 = GetSpellModOwner(); - if (modOwner1) + if (modOwner1 != null) { coeff *= 100.0f; modOwner1.ApplySpellMod(spellProto, SpellModOp.BonusCoefficient, ref coeff); @@ -152,7 +152,7 @@ namespace Game.Entities public float SpellDamagePctDone(Unit victim, SpellInfo spellProto, DamageEffectType damagetype, SpellEffectInfo spellEffectInfo) { - if (spellProto == null || !victim || damagetype == DamageEffectType.Direct) + if (spellProto == null || victim == null || damagetype == DamageEffectType.Direct) return 1.0f; // Some spells don't benefit from done mods @@ -180,12 +180,12 @@ namespace Game.Entities // Versatility Player modOwner = GetSpellModOwner(); - if (modOwner) + if (modOwner != null) MathFunctions.AddPct(ref DoneTotalMod, modOwner.GetRatingBonusValue(CombatRating.VersatilityDamageDone) + modOwner.GetTotalAuraModifier(AuraType.ModVersatility)); float maxModDamagePercentSchool = 0.0f; Player thisPlayer = ToPlayer(); - if (thisPlayer) + if (thisPlayer != null) { for (int i = 0; i < (int)SpellSchools.Max; ++i) { @@ -282,7 +282,7 @@ namespace Game.Entities { // Versatility Player modOwner = GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { // only 50% of SPELL_AURA_MOD_VERSATILITY for damage reduction float versaBonus = modOwner.GetTotalAuraModifier(AuraType.ModVersatility) / 2.0f; @@ -402,7 +402,7 @@ namespace Game.Entities if (IsTypeId(TypeId.Unit) && IsTotem()) { Unit owner = GetOwner(); - if (owner) + if (owner != null) return owner.SpellHealingBonusDone(victim, spellProto, healamount, damagetype, spellEffectInfo, stack, spell, aurEff); } @@ -456,7 +456,7 @@ namespace Game.Entities { float coeff = spellEffectInfo.BonusCoefficient; Player modOwner = GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { coeff *= 100.0f; modOwner.ApplySpellMod(spellProto, SpellModOp.BonusCoefficient, ref coeff); @@ -489,7 +489,7 @@ namespace Game.Entities // apply spellmod to Done amount Player _modOwner = GetSpellModOwner(); - if (_modOwner) + if (_modOwner != null) _modOwner.ApplySpellMod(spellProto, damagetype == DamageEffectType.DOT ? SpellModOp.PeriodicHealingAndDamage : SpellModOp.HealingAndDamage, ref heal); return (int)Math.Max(heal, 0.0f); @@ -582,7 +582,7 @@ namespace Game.Entities MathFunctions.AddPct(ref TakenTotalMod, maxval_hot); } - if (caster) + if (caster != null) { TakenTotalMod *= GetTotalAuraMultiplier(AuraType.ModHealingReceived, aurEff => { @@ -605,7 +605,7 @@ namespace Game.Entities { SpellInfo spellInfo = spell != null ? spell.GetSpellInfo() : aurEff.GetSpellInfo(); //! Mobs can't crit with spells. (Except player controlled) - if (IsCreature() && !GetSpellModOwner()) + if (IsCreature() && GetSpellModOwner() == null) return 0.0f; // not critting spell @@ -663,7 +663,7 @@ namespace Game.Entities crit_chance += GetTotalAuraModifier(AuraType.ModAttackerSpellAndWeaponCritChance); } - if (caster) + if (caster != null) { // scripted (increase crit chance ... against ... target by x% var mOverrideClassScript = caster.GetAuraEffectsByType(AuraType.OverrideClassScripts); @@ -1419,7 +1419,7 @@ namespace Game.Entities var immuneAuraApply = GetAuraEffectsByType(AuraType.ModImmuneAuraApplySchool); foreach (var auraEffect in immuneAuraApply) if (Convert.ToBoolean(auraEffect.GetMiscValue() & (int)spellInfo.GetSchoolMask()) && // Check school - ((caster && !IsFriendlyTo(caster)) || !spellInfo.IsPositiveEffect(spellEffectInfo.EffectIndex))) // Harmful + ((caster != null && !IsFriendlyTo(caster)) || !spellInfo.IsPositiveEffect(spellEffectInfo.EffectIndex))) // Harmful return true; } } @@ -1508,7 +1508,7 @@ namespace Game.Entities if (typeMaskActor && actor != null) actor.ProcSkillsAndReactives(false, actionTarget, typeMaskActor, hitMask, attType); - if (typeMaskActionTarget && actionTarget) + if (typeMaskActionTarget && actionTarget != null) actionTarget.ProcSkillsAndReactives(true, actor, typeMaskActionTarget, hitMask, attType); if (actor != null) @@ -1522,7 +1522,7 @@ namespace Game.Entities return; // For melee/ranged based attack need update skills and set some Aura states if victim present - if (typeMask.HasFlag(ProcFlags.MeleeBasedTriggerMask) && procTarget) + if (typeMask.HasFlag(ProcFlags.MeleeBasedTriggerMask) && procTarget != null) { // If exist crit/parry/dodge/block need update aura state (for victim and attacker) if (hitMask.HasAnyFlag(ProcFlagsHit.Critical | ProcFlagsHit.Parry | ProcFlagsHit.Dodge | ProcFlagsHit.Block)) @@ -1618,7 +1618,7 @@ namespace Game.Entities // needed for example for Cobra Strikes, pet does the attack, but aura is on owner Player modOwner = GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { if (modOwner != this && spell != null) { @@ -1636,12 +1636,12 @@ namespace Game.Entities // prepare data for target trigger ProcEventInfo targetProcEventInfo = new(this, actionTarget, this, typeMaskActionTarget, spellTypeMask, spellPhaseMask, hitMask, spell, damageInfo, healInfo); List> targetAurasTriggeringProc = new(); - if (typeMaskActionTarget && actionTarget) + if (typeMaskActionTarget && actionTarget != null) actionTarget.GetProcAurasTriggeredOnEvent(targetAurasTriggeringProc, targetProcAuras, targetProcEventInfo); TriggerAurasProcOnEvent(myProcEventInfo, myAurasTriggeringProc); - if (typeMaskActionTarget && actionTarget) + if (typeMaskActionTarget != null && actionTarget != null) actionTarget.TriggerAurasProcOnEvent(targetProcEventInfo, targetAurasTriggeringProc); } @@ -1892,13 +1892,13 @@ namespace Game.Entities if (healer != null && healer.IsCreature() && healer.IsTotem()) unit = healer.GetOwner(); - if (unit) + if (unit != null) { Player bgPlayer = unit.ToPlayer(); if (bgPlayer != null) { Battleground bg = bgPlayer.GetBattleground(); - if (bg) + if (bg != null) bg.UpdatePlayerScore(bgPlayer, ScoreType.HealingDone, (uint)gain); // use the actual gain, as the overheal shall not be counted, skip gain 0 (it ignored anyway in to criteria) @@ -2174,7 +2174,7 @@ namespace Game.Entities ContentTuningParams contentTuningParams = new(); Unit caster = Global.ObjAccessor.GetUnit(this, aura.GetCasterGUID()); - if (caster && contentTuningParams.GenerateDataForUnits(caster, this)) + if (caster != null && contentTuningParams.GenerateDataForUnits(caster, this)) spellLogEffect.ContentTuning = contentTuningParams; data.Effects.Add(spellLogEffect); @@ -2205,7 +2205,7 @@ namespace Game.Entities { SpellInstakillLog spellInstakillLog = new(); spellInstakillLog.Caster = caster.GetGUID(); - spellInstakillLog.Target = target ? target.GetGUID() : caster.GetGUID(); + spellInstakillLog.Target = target != null ? target.GetGUID() : caster.GetGUID(); spellInstakillLog.SpellID = spellId; SendMessageToSet(spellInstakillLog, false); } @@ -2379,7 +2379,7 @@ namespace Game.Entities case DiminishingGroup.AOEKnockback: if (auraSpellInfo.GetDiminishingReturnsGroupType() == DiminishingReturnsType.All || (auraSpellInfo.GetDiminishingReturnsGroupType() == DiminishingReturnsType.Player && - (targetOwner ? targetOwner.IsAffectedByDiminishingReturns() : IsAffectedByDiminishingReturns()))) + (targetOwner != null ? targetOwner.IsAffectedByDiminishingReturns() : IsAffectedByDiminishingReturns()))) { DiminishingLevels diminish = previousLevel; switch (diminish) @@ -2397,7 +2397,7 @@ namespace Game.Entities default: if (auraSpellInfo.GetDiminishingReturnsGroupType() == DiminishingReturnsType.All || (auraSpellInfo.GetDiminishingReturnsGroupType() == DiminishingReturnsType.Player && - (targetOwner ? targetOwner.IsAffectedByDiminishingReturns() : IsAffectedByDiminishingReturns()))) + (targetOwner != null ? targetOwner.IsAffectedByDiminishingReturns() : IsAffectedByDiminishingReturns()))) { DiminishingLevels diminish = previousLevel; switch (diminish) @@ -2578,7 +2578,7 @@ namespace Game.Entities bool spellClickHandled = false; uint spellClickEntry = GetVehicleKit() != null ? GetVehicleKit().GetCreatureEntry() : GetEntry(); - TriggerCastFlags flags = GetVehicleKit() ? TriggerCastFlags.IgnoreCasterMountedOrOnVehicle : TriggerCastFlags.None; + TriggerCastFlags flags = GetVehicleKit() != null ? TriggerCastFlags.IgnoreCasterMountedOrOnVehicle : TriggerCastFlags.None; var clickBounds = Global.ObjectMgr.GetSpellClickInfoMapBounds(spellClickEntry); foreach (var clickInfo in clickBounds) @@ -2659,7 +2659,7 @@ namespace Game.Entities } Creature creature = ToCreature(); - if (creature && creature.IsAIEnabled()) + if (creature != null && creature.IsAIEnabled()) creature.GetAI().OnSpellClick(clicker, ref spellClickHandled); } @@ -3136,7 +3136,7 @@ namespace Game.Entities else { Unit caster = aura.GetCaster(); - if (!caster || !caster.InSamePhase(this)) + if (caster == null || !caster.InSamePhase(this)) RemoveOwnedAura(pair); } } @@ -4013,7 +4013,7 @@ namespace Game.Entities public Aura _TryStackingOrRefreshingExistingAura(AuraCreateInfo createInfo) { - Cypher.Assert(!createInfo.CasterGUID.IsEmpty() || createInfo.Caster); + Cypher.Assert(!createInfo.CasterGUID.IsEmpty() || createInfo.Caster != null); // Check if these can stack anyway if (createInfo.CasterGUID.IsEmpty() && !createInfo.GetSpellInfo().IsStackableOnOneSlotWithDifferentCasters()) diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index ded25f750..f76475d88 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -226,7 +226,7 @@ namespace Game.Entities { if (pair.Value != null && pair.Value.IsExpired()) RemoveOwnedAura(pair, AuraRemoveMode.Expire); - else if (pair.Value.GetSpellInfo().IsChanneled() && pair.Value.GetCasterGUID() != GetGUID() && !Global.ObjAccessor.GetWorldObject(this, pair.Value.GetCasterGUID())) + else if (pair.Value.GetSpellInfo().IsChanneled() && pair.Value.GetCasterGUID() != GetGUID() && Global.ObjAccessor.GetWorldObject(this, pair.Value.GetCasterGUID()) == null) RemoveOwnedAura(pair, AuraRemoveMode.Cancel); // remove channeled auras when caster is not on the same map } @@ -380,7 +380,7 @@ namespace Game.Entities public virtual void Whisper(string text, Language language, Player target, bool isBossWhisper = false) { - if (!target) + if (target == null) return; Locale locale = target.GetSession().GetSessionDbLocaleIndex(); @@ -420,7 +420,7 @@ namespace Game.Entities public virtual void Whisper(uint textId, Player target, bool isBossWhisper = false) { - if (!target) + if (target == null) return; BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(textId); @@ -558,12 +558,12 @@ namespace Game.Entities { Unit vehicleRoot = GetVehicleBase(); - if (!vehicleRoot) + if (vehicleRoot == null) return null; for (; ; ) { - if (!vehicleRoot.GetVehicleBase()) + if (vehicleRoot.GetVehicleBase() == null) return vehicleRoot; vehicleRoot = vehicleRoot.GetVehicleBase(); @@ -964,10 +964,10 @@ namespace Game.Entities Cell.VisitAllObjects(this, searcher, dist); // remove current target - if (GetVictim()) + if (GetVictim() != null) targets.Remove(GetVictim()); - if (exclude) + if (exclude != null) targets.Remove(exclude); // remove not LoS targets @@ -1037,7 +1037,7 @@ namespace Game.Entities } } - Cypher.Assert(!m_vehicle); + Cypher.Assert(m_vehicle == null); vehicle.AddVehiclePassenger(this, seatId); } @@ -1113,7 +1113,7 @@ namespace Game.Entities Player player = ToPlayer(); // If the player is on mounted duel and exits the mount, he should immediatly lose the duel - if (player && player.duel != null && player.duel.IsMounted) + if (player != null && player.duel != null && player.duel.IsMounted) player.DuelComplete(DuelCompleteType.Fled); SetControlled(false, UnitState.Root); // SMSG_MOVE_FORCE_UNROOT, ~MOVEMENTFLAG_ROOT @@ -1728,7 +1728,7 @@ namespace Game.Entities displayPower = cEntry.DisplayPower; Vehicle vehicle = GetVehicleKit(); - if (vehicle) + if (vehicle != null) { PowerDisplayRecord powerDisplay = CliDB.PowerDisplayStorage.LookupByKey(vehicle.GetVehicleInfo().PowerDisplayID[0]); if (powerDisplay != null) @@ -1737,7 +1737,7 @@ namespace Game.Entities else { Pet pet = ToPet(); - if (pet) + if (pet != null) { if (pet.GetPetType() == PetType.Hunter) // Hunter pets have focus displayPower = PowerType.Focus; @@ -1895,7 +1895,7 @@ namespace Game.Entities Player player = ToPlayer(); if (player != null) { - if (player.GetGroup()) + if (player.GetGroup() != null) player.SetGroupUpdateFlag(GroupUpdateFlags.Level); Global.CharacterCacheStorage.UpdateCharacterLevel(ToPlayer().GetGUID(), (byte)lvl); @@ -2252,7 +2252,7 @@ namespace Game.Entities if (owner != null) { Player ownerPlayer = owner.ToPlayer(); - if (ownerPlayer) + if (ownerPlayer != null) if (ownerPlayer.IsGroupVisibleFor(seerPlayer)) return true; } @@ -2279,7 +2279,7 @@ namespace Game.Entities if (HasUnitTypeMask(UnitTypeMask.Minion)) { Unit owner = GetOwner(); - if (owner) + if (owner != null) { SetFaction(owner.GetFaction()); return; @@ -2588,7 +2588,7 @@ namespace Game.Entities // if any script modified damage, we need to also apply the same modification to unscaled damage value if (tmpDamage != damageTaken) { - if (attacker) + if (attacker != null) damageDone = (uint)(tmpDamage * victim.GetHealthMultiplierForTarget(attacker)); else damageDone = tmpDamage; @@ -2686,7 +2686,7 @@ namespace Game.Entities bool duel_wasMounted = false; if (victim.IsPlayer() && victim.ToPlayer().duel != null && damageTaken >= (health - 1)) { - if (!attacker) + if (attacker == null) return 0; // prevent kill only if killed in duel and killed by opponent or opponent controlled creature @@ -2708,7 +2708,7 @@ namespace Game.Entities Player victimRider = victim.GetCharmer().ToPlayer(); if (victimRider != null && victimRider.duel != null && victimRider.duel.IsMounted) { - if (!attacker) + if (attacker == null) return 0; // prevent kill only if killed in duel and killed by opponent or opponent controlled creature @@ -2923,7 +2923,7 @@ namespace Game.Entities { Player he = duel_wasMounted ? victim.GetCharmer().ToPlayer() : victim.ToPlayer(); - Cypher.Assert(he && he.duel != null); + Cypher.Assert(he != null && he.duel != null); if (duel_wasMounted) // In this case victim==mount victim.SetHealth(1); @@ -3046,7 +3046,7 @@ namespace Game.Entities uint damage = (uint)dmgShield.GetAmount(); Unit caster = dmgShield.GetCaster(); - if (caster) + if (caster != null) { damage = (uint)caster.SpellDamageBonusDone(this, spellInfo, (int)damage, DamageEffectType.SpellDirect, dmgShield.GetSpellEffectInfo()); damage = (uint)SpellDamageBonusTaken(caster, spellInfo, (int)damage, DamageEffectType.SpellDirect); @@ -3111,7 +3111,7 @@ namespace Game.Entities packet.Health = (long)GetHealth(); Player player = GetCharmerOrOwnerPlayerOrPlayerItself(); - if (player) + if (player != null) player.SendPacket(packet); } @@ -3328,7 +3328,7 @@ namespace Game.Entities return null; Group group = player.GetGroup(); // When there is no group check pet presence - if (!group) + if (group == null) { // We are pet now, return owner if (player != this) @@ -3347,7 +3347,7 @@ namespace Game.Entities for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player target = refe.GetSource(); - if (target) + if (target != null) { // IsHostileTo check duel and controlled by enemy if (target != this && IsWithinDistInMap(target, radius) && target.IsAlive() && !IsHostileTo(target)) @@ -3355,7 +3355,7 @@ namespace Game.Entities // Push player's pet to vector Unit pet = target.GetGuardianPet(); - if (pet) + if (pet != null) if (pet != this && IsWithinDistInMap(pet, radius) && pet.IsAlive() && !IsHostileTo(pet)) nearMembers.Add(pet); } @@ -3484,7 +3484,7 @@ namespace Game.Entities uint bossLevel = 83; float bossResistanceConstant = 510.0f; - uint level = caster ? victim.GetLevelForTarget(caster) : victim.GetLevel(); + uint level = caster != null ? victim.GetLevelForTarget(caster) : victim.GetLevel(); float resistanceConstant; if (level == bossLevel) @@ -3497,7 +3497,7 @@ namespace Game.Entities public static void CalcAbsorbResist(DamageInfo damageInfo, Spell spell = null) { - if (!damageInfo.GetVictim() || !damageInfo.GetVictim().IsAlive() || damageInfo.GetDamage() == 0) + if (damageInfo.GetVictim() == null || !damageInfo.GetVictim().IsAlive() || damageInfo.GetDamage() == 0) return; uint resistedDamage = CalcSpellResistedDamage(damageInfo.GetAttacker(), damageInfo.GetVictim(), damageInfo.GetDamage(), damageInfo.GetSchoolMask(), damageInfo.GetSpellInfo()); @@ -3691,7 +3691,7 @@ namespace Game.Entities // Damage can be splitted only if aura has an alive caster Unit caster = itr.GetCaster(); - if (!caster || (caster == damageInfo.GetVictim()) || !caster.IsInWorld || !caster.IsAlive()) + if (caster == null || (caster == damageInfo.GetVictim()) || !caster.IsInWorld || !caster.IsAlive()) continue; uint splitDamage = MathFunctions.CalculatePct(damageInfo.GetDamage(), itr.GetAmount()); @@ -3789,7 +3789,7 @@ namespace Game.Entities if (currentAbsorb != 0) { SpellHealAbsorbLog absorbLog = new(); - absorbLog.Healer = healInfo.GetHealer() ? healInfo.GetHealer().GetGUID() : ObjectGuid.Empty; + absorbLog.Healer = healInfo.GetHealer() != null ? healInfo.GetHealer().GetGUID() : ObjectGuid.Empty; absorbLog.Target = healInfo.GetTarget().GetGUID(); absorbLog.AbsorbCaster = absorbAurEff.GetBase().GetCasterGUID(); absorbLog.AbsorbedSpellID = (int)(healInfo.GetSpellInfo() != null ? healInfo.GetSpellInfo().Id : 0); @@ -4070,7 +4070,7 @@ namespace Game.Entities // Versatility Player modOwner = GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { // only 50% of SPELL_AURA_MOD_VERSATILITY for damage reduction float versaBonus = modOwner.GetTotalAuraModifier(AuraType.ModVersatility) / 2.0f; diff --git a/Source/Game/Entities/Vehicle.cs b/Source/Game/Entities/Vehicle.cs index ad837bbc8..7c891fd61 100644 --- a/Source/Game/Entities/Vehicle.cs +++ b/Source/Game/Entities/Vehicle.cs @@ -275,7 +275,7 @@ namespace Game.Entities Log.outDebug(LogFilter.Vehicle, "Vehicle ({0}, Entry {1}): installing accessory (Entry: {2}) on seat: {3}", _me.GetGUID().ToString(), GetCreatureEntry(), entry, seatId); TempSummon accessory = _me.SummonCreature(entry, _me, (TempSummonType)type, TimeSpan.FromMilliseconds(summonTime)); - Cypher.Assert(accessory); + Cypher.Assert(accessory != null); if (minion) accessory.AddUnitTypeMask(UnitTypeMask.Accessory); @@ -600,11 +600,6 @@ namespace Game.Entities public Dictionary Seats = new(); public uint UsableSeatNum; //< Number of seats that match VehicleSeatEntry.UsableByPlayer, used for proper display flags - public static implicit operator bool(Vehicle vehicle) - { - return vehicle != null; - } - public enum Status { None, @@ -677,7 +672,7 @@ namespace Game.Entities { // drop flag Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) bg.EventPlayerDroppedFlag(player); player.StopCastingCharm(); diff --git a/Source/Game/Events/GameEventManager.cs b/Source/Game/Events/GameEventManager.cs index 27e0dd9ac..8b92b68d4 100644 --- a/Source/Game/Events/GameEventManager.cs +++ b/Source/Game/Events/GameEventManager.cs @@ -1155,7 +1155,7 @@ namespace Game { GameObject go = GameObject.CreateGameObjectFromDB(guid, map, false); // @todo find out when it is add to map - if (go) + if (go != null) { // @todo find out when it is add to map if (go.IsSpawnedByDefault()) diff --git a/Source/Game/Events/GameEventSender.cs b/Source/Game/Events/GameEventSender.cs index a73af07b9..26d6440ba 100644 --- a/Source/Game/Events/GameEventSender.cs +++ b/Source/Game/Events/GameEventSender.cs @@ -12,7 +12,7 @@ namespace Game { public static void Trigger(uint gameEventId, WorldObject source, WorldObject target) { - Cypher.Assert(source || target, "At least one of [source] or [target] must be provided"); + Cypher.Assert(source != null || target != null, "At least one of [source] or [target] must be provided"); WorldObject refForMapAndZoneScript = source ?? target; diff --git a/Source/Game/Garrisons/GarrisonMap.cs b/Source/Game/Garrisons/GarrisonMap.cs index 777f39bc2..cc387230d 100644 --- a/Source/Game/Garrisons/GarrisonMap.cs +++ b/Source/Game/Garrisons/GarrisonMap.cs @@ -26,11 +26,11 @@ namespace Game.Garrisons public Garrison GetGarrison() { - if (_loadingPlayer) + if (_loadingPlayer != null) return _loadingPlayer.GetGarrison(); Player owner = Global.ObjAccessor.FindConnectedPlayer(_owner); - if (owner) + if (owner != null) return owner.GetGarrison(); return null; @@ -105,7 +105,7 @@ namespace Game.Garrisons continue; GameObject go = plot.CreateGameObject(i_map, i_garrison.GetFaction()); - if (!go) + if (go == null) continue; var cell = new Cell(cellCoord); diff --git a/Source/Game/Garrisons/Garrisons.cs b/Source/Game/Garrisons/Garrisons.cs index 54d8ed150..90eadfb48 100644 --- a/Source/Game/Garrisons/Garrisons.cs +++ b/Source/Game/Garrisons/Garrisons.cs @@ -351,7 +351,7 @@ namespace Game.Garrisons uint oldBuildingId = 0; Map map = FindMap(); GarrBuildingRecord building = CliDB.GarrBuildingStorage.LookupByKey(garrBuildingId); - if (map) + if (map != null) plot.DeleteGameObject(map); if (plot.BuildingInfo.PacketInfo != null) @@ -362,10 +362,10 @@ namespace Game.Garrisons } plot.SetBuildingInfo(placeBuildingResult.BuildingInfo, _owner); - if (map) + if (map != null) { GameObject go = plot.CreateGameObject(map, GetFaction()); - if (go) + if (go != null) map.AddToMap(go); } @@ -401,7 +401,7 @@ namespace Game.Garrisons buildingRemoved.GarrBuildingID = plot.BuildingInfo.PacketInfo.GarrBuildingID; Map map = FindMap(); - if (map) + if (map != null) plot.DeleteGameObject(map); plot.ClearBuildingInfo(GetGarrisonType(), _owner); @@ -430,10 +430,10 @@ namespace Game.Garrisons _owner.SendPacket(placeBuildingResult); } - if (map) + if (map != null) { GameObject go = plot.CreateGameObject(map, GetFaction()); - if (go) + if (go != null) map.AddToMap(go); } } @@ -450,11 +450,11 @@ namespace Game.Garrisons { plot.BuildingInfo.PacketInfo.Active = true; Map map = FindMap(); - if (map) + if (map != null) { plot.DeleteGameObject(map); GameObject go = plot.CreateGameObject(map, GetFaction()); - if (go) + if (go != null) map.AddToMap(go); } @@ -711,7 +711,7 @@ namespace Game.Garrisons } GameObject go = GameObject.CreateGameObject(entry, map, PacketInfo.PlotPos, Rotation, 255, GameObjectState.Ready); - if (!go) + if (go == null) return null; if (BuildingInfo.CanActivate() && BuildingInfo.PacketInfo != null && !BuildingInfo.PacketInfo.Active) @@ -721,7 +721,7 @@ namespace Game.Garrisons { Position pos2 = finalizeInfo.factionInfo[faction].Pos; GameObject finalizer = GameObject.CreateGameObject(finalizeInfo.factionInfo[faction].GameObjectId, map, pos2, Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(pos2.GetOrientation(), 0.0f, 0.0f)), 255, GameObjectState.Ready); - if (finalizer) + if (finalizer != null) { // set some spell id to make the object delete itself after use finalizer.SetSpellId(finalizer.GetGoInfo().Goober.spell); @@ -743,14 +743,14 @@ namespace Game.Garrisons foreach (var spawnId in cellGuids.Value.creatures) { Creature spawn = BuildingSpawnHelper(go, spawnId, map); - if (spawn) + if (spawn != null) BuildingInfo.Spawns.Add(spawn.GetGUID()); } foreach (var spawnId in cellGuids.Value.gameobjects) { GameObject spawn = BuildingSpawnHelper(go, spawnId, map); - if (spawn) + if (spawn != null) BuildingInfo.Spawns.Add(spawn.GetGUID()); } } @@ -780,14 +780,14 @@ namespace Game.Garrisons continue; } - if (obj) + if (obj != null) obj.AddObjectToRemoveList(); } BuildingInfo.Spawns.Clear(); GameObject oldBuilding = map.GetGameObject(BuildingInfo.Guid); - if (oldBuilding) + if (oldBuilding != null) oldBuilding.Delete(); BuildingInfo.Guid.Clear(); diff --git a/Source/Game/Globals/ObjectAccessor.cs b/Source/Game/Globals/ObjectAccessor.cs index b7b9c1683..f3f1cf5c5 100644 --- a/Source/Game/Globals/ObjectAccessor.cs +++ b/Source/Game/Globals/ObjectAccessor.cs @@ -153,7 +153,7 @@ public class ObjectAccessor : Singleton public Player GetPlayer(Map m, ObjectGuid guid) { Player player = _players.LookupByKey(guid); - if (player) + if (player != null) if (player.IsInWorld && player.GetMap() == m) return player; @@ -181,12 +181,12 @@ public class ObjectAccessor : Singleton public Player FindPlayer(ObjectGuid guid) { Player player = FindConnectedPlayer(guid); - return player && player.IsInWorld ? player : null; + return player != null && player.IsInWorld ? player : null; } public Player FindPlayerByName(string name) { Player player = PlayerNameMapHolder.Find(name); - if (!player || !player.IsInWorld) + if (player == null || !player.IsInWorld) return null; return player; diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index a32e1554e..c170ad95a 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -842,7 +842,7 @@ namespace Game uint MapId = location.GetMapId(); // search for zone associated closest graveyard - uint zoneId = Global.TerrainMgr.GetZoneId(conditionObject ? conditionObject.GetPhaseShift() : PhasingHandler.EmptyPhaseShift, MapId, x, y, z); + uint zoneId = Global.TerrainMgr.GetZoneId(conditionObject != null ? conditionObject.GetPhaseShift() : PhasingHandler.EmptyPhaseShift, MapId, x, y, z); if (zoneId == 0) { if (z > -500) @@ -914,7 +914,7 @@ namespace Game continue; } - if (conditionObject) + if (conditionObject != null) { if (!Global.ConditionMgr.IsObjectMeetToConditions(conditionSource, data.Conditions)) continue; @@ -1949,7 +1949,7 @@ namespace Game continue; } - if (!creatureTemplateStorage.TryGetValue(creatureID, out CreatureTemplate creatureTemplate)) + if (creatureTemplateStorage.TryGetValue(creatureID, out CreatureTemplate creatureTemplate)) { Log.outError(LogFilter.Sql, $"creature_template_resistance has resistance definitions for creature {creatureID} but this creature doesn't exist"); continue; @@ -1989,7 +1989,7 @@ namespace Game continue; } - if (!creatureTemplateStorage.TryGetValue(creatureID, out CreatureTemplate creatureTemplate)) + if (creatureTemplateStorage.TryGetValue(creatureID, out CreatureTemplate creatureTemplate)) { Log.outError(LogFilter.Sql, $"creature_template_spell has spell definitions for creature {creatureID} but this creature doesn't exist"); continue; @@ -2071,7 +2071,7 @@ namespace Game continue; } - if (!creatureSummonedDataStorage.ContainsKey(creatureId)) + if (creatureSummonedDataStorage.ContainsKey(creatureId)) creatureSummonedDataStorage[creatureId] = new(); CreatureSummonedData summonedData = creatureSummonedDataStorage[creatureId]; @@ -2405,7 +2405,7 @@ namespace Game uint item = result.Read(2); uint idx = result.Read(3); - if (!creatureTemplateStorage.ContainsKey(entry)) + if (creatureTemplateStorage.ContainsKey(entry)) { Log.outError(LogFilter.Sql, $"Table `creature_questitem` has data for nonexistent creature (entry: {entry}, difficulty: {difficulty} idx: {idx}), skipped"); continue; @@ -2597,7 +2597,7 @@ namespace Game for (byte unitClass = 1; unitClass <= SharedConst.MaxUnitClasses; ++unitClass) { uint unitClassMask = 1u << (unitClass - 1); - if (!creatureBaseStatsStorage.ContainsKey(MathFunctions.MakePair16(unitLevel, unitClassMask))) + if (creatureBaseStatsStorage.ContainsKey(MathFunctions.MakePair16(unitLevel, unitClassMask))) Log.outError(LogFilter.Sql, $"Missing base stats for creature class {unitClassMask} level {unitLevel}"); } } @@ -3879,7 +3879,7 @@ namespace Game public CreatureData NewOrExistCreatureData(ulong spawnId) { - if (!creatureDataStorage.ContainsKey(spawnId)) + if (creatureDataStorage.ContainsKey(spawnId)) creatureDataStorage[spawnId] = new CreatureData(); return creatureDataStorage[spawnId]; } @@ -9564,7 +9564,7 @@ namespace Game do { ulong receiver = result.Read(3); - if (serverUp && Global.ObjAccessor.FindConnectedPlayer(ObjectGuid.Create(HighGuid.Player, receiver))) + if (serverUp && Global.ObjAccessor.FindConnectedPlayer(ObjectGuid.Create(HighGuid.Player, receiver)) != null) continue; Mail m = new(); diff --git a/Source/Game/Groups/Group.cs b/Source/Game/Groups/Group.cs index 1d9985231..73a627f6b 100644 --- a/Source/Game/Groups/Group.cs +++ b/Source/Game/Groups/Group.cs @@ -67,7 +67,7 @@ namespace Game.Groups } // If there aren't assistants in raid, or if the group is not a raid, pick the first available member - if (!newLeader) + if (newLeader == null) { foreach (var memberSlot in m_memberSlots) { @@ -80,7 +80,7 @@ namespace Game.Groups } } - if (newLeader) + if (newLeader != null) { ChangeLeader(newLeader.GetGUID()); SendUpdate(); @@ -305,12 +305,12 @@ namespace Game.Groups public bool AddInvite(Player player) { - if (player == null || player.GetGroupInvite()) + if (player == null || player.GetGroupInvite() != null) return false; Group group = player.GetGroup(); - if (group && (group.IsBGGroup() || group.IsBFGroup())) + if (group != null && (group.IsBGGroup() || group.IsBFGroup())) group = player.GetOriginalGroup(); - if (group) + if (group != null) return false; RemoveInvite(player); @@ -467,7 +467,7 @@ namespace Game.Groups } player.SetGroupUpdateFlag(GroupUpdateFlags.Full); Pet pet = player.GetPet(); - if (pet) + if (pet != null) pet.SetGroupUpdateFlag(GroupUpdatePetFlags.Full); UpdatePlayerOutOfRange(player); @@ -524,12 +524,12 @@ namespace Game.Groups Global.ScriptMgr.OnGroupRemoveMember(this, guid, method, kicker, reason); Player player = Global.ObjAccessor.FindConnectedPlayer(guid); - if (player) + if (player != null) { for (GroupReference refe = GetFirstMember(); refe != null; refe = refe.Next()) { Player groupMember = refe.GetSource(); - if (groupMember) + if (groupMember != null) { if (groupMember.GetGUID() == guid) continue; @@ -547,7 +547,7 @@ namespace Game.Groups // remove member and change leader (if need) only if strong more 2 members _before_ member remove (BG/BF allow 1 member group) if (GetMembersCount() > ((IsBGGroup() || IsLFGGroup() || IsBFGroup()) ? 1 : 2)) { - if (player) + if (player != null) { // Battlegroundgroup handling if (IsBGGroup() || IsBFGroup()) @@ -618,7 +618,7 @@ namespace Game.Groups if (m_memberMgr.GetSize() < ((IsLFGGroup() || IsBGGroup()) ? 1 : 2)) Disband(); - else if (player) + else if (player != null) { // send update to removed player too so party frames are destroyed clientside SendUpdateDestroyGroupToPlayer(player); @@ -665,7 +665,7 @@ namespace Game.Groups } Player oldLeader = Global.ObjAccessor.FindConnectedPlayer(m_leaderGuid); - if (oldLeader) + if (oldLeader != null) oldLeader.RemovePlayerFlag(PlayerFlags.GroupLeader); newLeader.SetPlayerFlag(PlayerFlags.GroupLeader); @@ -909,7 +909,7 @@ namespace Game.Groups public void UpdatePlayerOutOfRange(Player player) { - if (!player || !player.IsInWorld) + if (player == null || !player.IsInWorld) return; PartyMemberFullState packet = new(); @@ -918,7 +918,7 @@ namespace Game.Groups for (GroupReference refe = GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (member && member != player && (!member.IsInMap(player) || !member.IsWithinDist(player, member.GetSightRange(), false))) + if (member != null && member != player && (!member.IsInMap(player) || !member.IsWithinDist(player, member.GetSightRange(), false))) member.SendPacket(packet); } } @@ -942,7 +942,7 @@ namespace Game.Groups for (GroupReference refe = GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); - if (!player || (!ignore.IsEmpty() && player.GetGUID() == ignore) || (ignorePlayersInBGRaid && player.GetGroup() != this)) + if (player == null || (!ignore.IsEmpty() && player.GetGUID() == ignore) || (ignorePlayersInBGRaid && player.GetGroup() != this)) continue; if (player.GetSession() != null && (group == -1 || refe.GetSubGroup() == group)) @@ -975,7 +975,7 @@ namespace Game.Groups public bool SameSubGroup(Player member1, Player member2) { - if (!member1 || !member2) + if (member1 == null || member2 == null) return false; if (member1.GetGroup() != this || member2.GetGroup() != this) @@ -1022,7 +1022,7 @@ namespace Game.Groups // In case the moved player is online, update the player object with the new sub group references Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (player.GetGroup() == this) player.GetGroupRef().SetSubGroup(group); @@ -1069,7 +1069,7 @@ namespace Game.Groups } Player player = Global.ObjAccessor.FindConnectedPlayer(slots[i].guid); - if (player) + if (player != null) { if (player.GetGroup() == this) player.GetGroupRef().SetSubGroup(slots[i].group); @@ -1103,7 +1103,7 @@ namespace Game.Groups { // not update if only update if need and ok Player looter = Global.ObjAccessor.FindPlayer(memberSlot.guid); - if (looter && looter.IsAtGroupRewardDistance(pLootedObject)) + if (looter != null && looter.IsAtGroupRewardDistance(pLootedObject)) return; } } @@ -1116,7 +1116,7 @@ namespace Game.Groups continue; Player player = Global.ObjAccessor.FindPlayer(member.guid); - if (player) + if (player != null) if (player.IsAtGroupRewardDistance(pLootedObject)) { pNewLooter = player; @@ -1124,13 +1124,13 @@ namespace Game.Groups } } - if (!pNewLooter) + if (pNewLooter == null) { // search from start foreach (var member in m_memberSlots) { Player player = Global.ObjAccessor.FindPlayer(member.guid); - if (player) + if (player != null) if (player.IsAtGroupRewardDistance(pLootedObject)) { pNewLooter = player; @@ -1139,7 +1139,7 @@ namespace Game.Groups } } - if (pNewLooter) + if (pNewLooter != null) { if (oldLooterGUID != pNewLooter.GetGUID()) { @@ -1174,7 +1174,7 @@ namespace Game.Groups // get a player as reference, to compare other players' stats to (arena team id, queue id based on level, etc.) Player reference = GetFirstMember().GetSource(); // no reference found, can't join this way - if (!reference) + if (reference == null) return GroupJoinBattlegroundResult.BattlegroundJoinFailed; PvpDifficultyRecord bracketEntry = Global.DB2Mgr.GetBattlegroundBracketByLevel((uint)bgOrTemplate.BattlemasterEntry.MapId[0], reference.GetLevel()); @@ -1191,7 +1191,7 @@ namespace Game.Groups { Player member = refe.GetSource(); // offline member? don't let join - if (!member) + if (member == null) return GroupJoinBattlegroundResult.BattlegroundJoinFailed; // rbac permissions if (!member.CanJoinToBattleground(bgOrTemplate)) @@ -1368,7 +1368,7 @@ namespace Game.Groups void _homebindIfInstance(Player player) { - if (player && !player.IsGameMaster() && CliDB.MapStorage.LookupByKey(player.GetMapId()).IsDungeon()) + if (player != null && !player.IsGameMaster() && CliDB.MapStorage.LookupByKey(player.GetMapId()).IsDungeon()) player.m_InstanceValid = false; } @@ -1378,13 +1378,13 @@ namespace Game.Groups // -- not very efficient but safe foreach (var member in m_memberSlots) { - Player pp = Global.ObjAccessor.FindPlayer(member.guid); - if (pp && pp.IsInWorld) + Player player = Global.ObjAccessor.FindPlayer(member.guid); + if (player != null && player.IsInWorld) { - pp.m_values.ModifyValue(pp.m_unitData).ModifyValue(pp.m_unitData.PvpFlags); - pp.m_values.ModifyValue(pp.m_unitData).ModifyValue(pp.m_unitData.FactionTemplate); - pp.ForceUpdateFieldChange(); - Log.outDebug(LogFilter.Server, "-- Forced group value update for '{0}'", pp.GetName()); + player.m_values.ModifyValue(player.m_unitData).ModifyValue(player.m_unitData.PvpFlags); + player.m_values.ModifyValue(player.m_unitData).ModifyValue(player.m_unitData.FactionTemplate); + player.ForceUpdateFieldChange(); + Log.outDebug(LogFilter.Server, "-- Forced group value update for '{0}'", player.GetName()); } } } @@ -1512,7 +1512,7 @@ namespace Game.Groups foreach (MemberSlot member in m_memberSlots) { Player player = Global.ObjAccessor.FindConnectedPlayer(member.guid); - if (!player || !player.GetSession()) + if (player == null || player.GetSession() == null) SetMemberReadyCheck(member, false); } } @@ -1570,7 +1570,7 @@ namespace Game.Groups packet.RaidMarkers.Add(m_markers[i]); } - if (session) + if (session != null) session.SendPacket(packet); else BroadcastPacket(packet, false); @@ -1956,11 +1956,6 @@ namespace Game.Groups // Raid markers RaidMarker[] m_markers = new RaidMarker[MapConst.RaidMarkersCount]; uint m_activeMarkers; - - public static implicit operator bool(Group group) - { - return group != null; - } } public class MemberSlot diff --git a/Source/Game/Groups/GroupManager.cs b/Source/Game/Groups/GroupManager.cs index 5f042f69a..e2e0cdbd6 100644 --- a/Source/Game/Groups/GroupManager.cs +++ b/Source/Game/Groups/GroupManager.cs @@ -156,7 +156,7 @@ namespace Game.Groups { Group group = GetGroupByDbStoreId(result.Read(0)); - if (group) + if (group != null) group.LoadMemberFromDB(result.Read(1), result.Read(2), result.Read(3), (LfgRoles)result.Read(4)); else Log.outError(LogFilter.Server, "GroupMgr:LoadGroups: Consistency failed, can't find group (storage id: {0})", result.Read(0)); diff --git a/Source/Game/Guilds/Guild.cs b/Source/Game/Guilds/Guild.cs index 8dcfe11f9..865ece5cc 100644 --- a/Source/Game/Guilds/Guild.cs +++ b/Source/Game/Guilds/Guild.cs @@ -595,7 +595,7 @@ namespace Game.Guilds invite.GuildName = GetName(); Guild oldGuild = pInvitee.GetGuild(); - if (oldGuild) + if (oldGuild != null) { invite.OldGuildGUID = oldGuild.GetGUID(); invite.OldGuildName = oldGuild.GetName(); @@ -993,7 +993,7 @@ namespace Game.Guilds Group group = player.GetGroup(); // Make sure player is a member of the guild and that he is in a group. - if (!IsMember(player.GetGUID()) || !group) + if (!IsMember(player.GetGUID()) || group == null) return; GuildPartyState partyStateResponse = new(); @@ -1216,7 +1216,7 @@ namespace Game.Guilds eventPacket.LeaverName = leaver.GetName(); eventPacket.LeaverVirtualRealmAddress = Global.WorldMgr.GetVirtualRealmAddress(); - if (isRemoved && remover) + if (isRemoved && remover != null) { eventPacket.RemoverGUID = remover.GetGUID(); eventPacket.RemoverName = remover.GetName(); @@ -1502,7 +1502,7 @@ namespace Game.Guilds foreach (var member in m_members.Values) { Player player = member.FindPlayer(); - if (player) + if (player != null) { if (player.GetSession() != null && _HasRankRight(player, officerOnly ? GuildRankRights.OffChatListen : GuildRankRights.GChatListen) && !player.GetSocial().HasIgnore(session.GetPlayer().GetGUID(), session.GetAccountGUID()) && player.GetSession().IsAddonRegistered(prefix)) @@ -1542,7 +1542,7 @@ namespace Game.Guilds if (member.IsTrackingCriteriaId(criteriaId)) { Player player = member.FindPlayer(); - if (player) + if (player != null) player.SendPacket(packet); } } @@ -2254,11 +2254,11 @@ namespace Game.Guilds GuildBankItemInfo itemInfo = new(); itemInfo.Slot = slot; - itemInfo.Item.ItemID = tabItem ? tabItem.GetEntry() : 0; - itemInfo.Count = (int)(tabItem ? tabItem.GetCount() : 0); - itemInfo.EnchantmentID = (int)(tabItem ? tabItem.GetEnchantmentId(EnchantmentSlot.Perm) : 0); - itemInfo.Charges = tabItem ? Math.Abs(tabItem.GetSpellCharges()) : 0; - itemInfo.OnUseEnchantmentID = (int)(tabItem ? tabItem.GetEnchantmentId(EnchantmentSlot.Use) : 0); + itemInfo.Item.ItemID = tabItem != null ? tabItem.GetEntry() : 0; + itemInfo.Count = (int)(tabItem != null ? tabItem.GetCount() : 0); + itemInfo.EnchantmentID = (int)(tabItem != null ? tabItem.GetEnchantmentId(EnchantmentSlot.Perm) : 0); + itemInfo.Charges = tabItem != null ? Math.Abs(tabItem.GetSpellCharges()) : 0; + itemInfo.OnUseEnchantmentID = (int)(tabItem != null ? tabItem.GetEnchantmentId(EnchantmentSlot.Use) : 0); itemInfo.Flags = 0; itemInfo.Locked = false; @@ -2331,7 +2331,7 @@ namespace Game.Guilds for (byte slotId = 0; slotId < GuildConst.MaxBankSlots; ++slotId) { Item tabItem = tab.GetItem(slotId); - if (tabItem) + if (tabItem != null) { GuildBankItemInfo itemInfo = new(); @@ -2561,11 +2561,6 @@ namespace Game.Guilds GuildAchievementMgr m_achievementSys; #endregion - public static implicit operator bool(Guild guild) - { - return guild != null; - } - #region Classes public class Member { diff --git a/Source/Game/Guilds/GuildManager.cs b/Source/Game/Guilds/GuildManager.cs index a78a6dc01..de79edb7b 100644 --- a/Source/Game/Guilds/GuildManager.cs +++ b/Source/Game/Guilds/GuildManager.cs @@ -142,7 +142,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadRankFromDB(result.GetFields()); ++count; @@ -179,7 +179,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadMemberFromDB(result.GetFields()); ++count; @@ -212,7 +212,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadBankRightFromDB(result.GetFields()); ++count; @@ -244,7 +244,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadEventLogFromDB(result.GetFields()); ++count; @@ -277,7 +277,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadBankEventLogFromDB(result.GetFields()); ++count; @@ -307,7 +307,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadGuildNewsLogFromDB(result.GetFields()); ++count; @@ -339,7 +339,7 @@ namespace Game { uint guildId = result.Read(0); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadBankTabFromDB(result.GetFields()); ++count; @@ -370,7 +370,7 @@ namespace Game { ulong guildId = result.Read(51); Guild guild = GetGuildById(guildId); - if (guild) + if (guild != null) guild.LoadBankItemFromDB(result.GetFields()); ++count; diff --git a/Source/Game/Handlers/ArtifactHandler.cs b/Source/Game/Handlers/ArtifactHandler.cs index ca0c44c37..fa66eea1a 100644 --- a/Source/Game/Handlers/ArtifactHandler.cs +++ b/Source/Game/Handlers/ArtifactHandler.cs @@ -16,11 +16,11 @@ namespace Game [WorldPacketHandler(ClientOpcodes.ArtifactAddPower, Processing = PacketProcessing.Inplace)] void HandleArtifactAddPower(ArtifactAddPower artifactAddPower) { - if (!_player.GetGameObjectIfCanInteractWith(artifactAddPower.ForgeGUID, GameObjectTypes.ItemForge)) + if (_player.GetGameObjectIfCanInteractWith(artifactAddPower.ForgeGUID, GameObjectTypes.ItemForge) == null) return; Item artifact = _player.GetItemByGuid(artifactAddPower.ArtifactGUID); - if (!artifact || artifact.IsArtifactDisabled()) + if (artifact == null || artifact.IsArtifactDisabled()) return; uint currentArtifactTier = artifact.GetModifier(ItemModifier.ArtifactTier); @@ -146,7 +146,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.ArtifactSetAppearance, Processing = PacketProcessing.Inplace)] void HandleArtifactSetAppearance(ArtifactSetAppearance artifactSetAppearance) { - if (!_player.GetGameObjectIfCanInteractWith(artifactSetAppearance.ForgeGUID, GameObjectTypes.ItemForge)) + if (_player.GetGameObjectIfCanInteractWith(artifactSetAppearance.ForgeGUID, GameObjectTypes.ItemForge) == null) return; ArtifactAppearanceRecord artifactAppearance = CliDB.ArtifactAppearanceStorage.LookupByKey(artifactSetAppearance.ArtifactAppearanceID); @@ -154,7 +154,7 @@ namespace Game return; Item artifact = _player.GetItemByGuid(artifactSetAppearance.ArtifactGUID); - if (!artifact) + if (artifact == null) return; ArtifactAppearanceSetRecord artifactAppearanceSet = CliDB.ArtifactAppearanceSetStorage.LookupByKey(artifactAppearance.ArtifactAppearanceSetID); @@ -170,7 +170,7 @@ namespace Game artifact.SetModifier(ItemModifier.ArtifactAppearanceId, artifactAppearance.Id); artifact.SetState(ItemUpdateState.Changed, _player); Item childItem = _player.GetChildItemByGuid(artifact.GetChildItem()); - if (childItem) + if (childItem != null) { childItem.SetAppearanceModId(artifactAppearance.ItemAppearanceModifierID); childItem.SetState(ItemUpdateState.Changed, _player); @@ -180,7 +180,7 @@ namespace Game { // change weapon appearance _player.SetVisibleItemSlot(artifact.GetSlot(), artifact); - if (childItem) + if (childItem != null) _player.SetVisibleItemSlot(childItem.GetSlot(), childItem); // change druid form appearance @@ -192,11 +192,11 @@ namespace Game [WorldPacketHandler(ClientOpcodes.ConfirmArtifactRespec)] void HandleConfirmArtifactRespec(ConfirmArtifactRespec confirmArtifactRespec) { - if (!_player.GetNPCIfCanInteractWith(confirmArtifactRespec.NpcGUID, NPCFlags.ArtifactPowerRespec, NPCFlags2.None)) + if (_player.GetNPCIfCanInteractWith(confirmArtifactRespec.NpcGUID, NPCFlags.ArtifactPowerRespec, NPCFlags2.None) == null) return; Item artifact = _player.GetItemByGuid(confirmArtifactRespec.ArtifactGUID); - if (!artifact || artifact.IsArtifactDisabled()) + if (artifact == null || artifact.IsArtifactDisabled()) return; ulong xpCost = 0; diff --git a/Source/Game/Handlers/AuctionHandler.cs b/Source/Game/Handlers/AuctionHandler.cs index 39b244adf..4e925f5fb 100644 --- a/Source/Game/Handlers/AuctionHandler.cs +++ b/Source/Game/Handlers/AuctionHandler.cs @@ -120,7 +120,7 @@ namespace Game var buyerGuid = _player.GetGUID(); AddTransactionCallback(DB.Characters.AsyncCommitTransaction(trans)).AfterComplete(success => { - if (GetPlayer() && GetPlayer().GetGUID() == buyerGuid) + if (GetPlayer() != null && GetPlayer().GetGUID() == buyerGuid) { if (success) { @@ -138,7 +138,7 @@ namespace Game void HandleAuctionHello(AuctionHelloRequest hello) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(hello.Guid, NPCFlags.Auctioneer, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionHelloOpcode - {hello.Guid} not found or you can't interact with him."); return; @@ -159,7 +159,7 @@ namespace Game return; Creature creature = GetPlayer().GetNPCIfCanInteractWith(listBiddedItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionListBidderItems - {listBiddedItems.Auctioneer} not found or you can't interact with him."); return; @@ -282,7 +282,7 @@ namespace Game return; Creature creature = GetPlayer().GetNPCIfCanInteractWith(listOwnedItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionListOwnerItems - {listOwnedItems.Auctioneer} not found or you can't interact with him."); return; @@ -309,7 +309,7 @@ namespace Game return; Creature creature = GetPlayer().GetNPCIfCanInteractWith(placeBid.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionPlaceBid - {placeBid.Auctioneer} not found or you can't interact with him."); return; @@ -423,7 +423,7 @@ namespace Game player.SaveInventoryAndGoldToDB(trans); AddTransactionCallback(DB.Characters.AsyncCommitTransaction(trans)).AfterComplete(success => { - if (GetPlayer() && GetPlayer().GetGUID() == _player.GetGUID()) + if (GetPlayer() != null && GetPlayer().GetGUID() == _player.GetGUID()) { if (success) { @@ -444,7 +444,7 @@ namespace Game return; Creature creature = GetPlayer().GetNPCIfCanInteractWith(removeItem.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, $"WORLD: HandleAuctionRemoveItem - {removeItem.Auctioneer} not found or you can't interact with him."); return; @@ -492,7 +492,7 @@ namespace Game auctionHouse.RemoveAuction(trans, auction); AddTransactionCallback(DB.Characters.AsyncCommitTransaction(trans)).AfterComplete(success => { - if (GetPlayer() && GetPlayer().GetGUID() == _player.GetGUID()) + if (GetPlayer() != null && GetPlayer().GetGUID() == _player.GetGUID()) { if (success) SendAuctionCommandResult(auctionIdForClient, AuctionCommand.Cancel, AuctionResult.Ok, throttle.DelayUntilNext); //inform player, that auction is removed @@ -506,7 +506,7 @@ namespace Game void HandleReplicateItems(AuctionReplicateItems replicateItems) { Creature creature = GetPlayer().GetNPCIfCanInteractWith(replicateItems.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outError(LogFilter.Network, $"WORLD: HandleReplicateItems - {replicateItems.Auctioneer} not found or you can't interact with him."); return; @@ -612,7 +612,7 @@ namespace Game foreach (var itemForSale in sellCommodity.Items) { Item item = _player.GetItemByGuid(itemForSale.Guid); - if (!item) + if (item == null) { SendAuctionCommandResult(0, AuctionCommand.SellItem, AuctionResult.ItemNotFound, throttle.DelayUntilNext); return; @@ -632,7 +632,7 @@ namespace Game return; } - if (Global.AuctionHouseMgr.GetAItem(item.GetGUID()) || !item.CanBeTraded() || item.IsNotEmptyBag() || + if (Global.AuctionHouseMgr.GetAItem(item.GetGUID()) != null || !item.CanBeTraded() || item.IsNotEmptyBag() || item.GetTemplate().HasFlag(ItemFlags.Conjured) || item.m_itemData.Expiration != 0 || item.GetCount() < itemForSale.UseCount) { @@ -756,7 +756,7 @@ namespace Game var auctionPlayerGuid = _player.GetGUID(); AddTransactionCallback(DB.Characters.AsyncCommitTransaction(trans)).AfterComplete(success => { - if (GetPlayer() && GetPlayer().GetGUID() == auctionPlayerGuid) + if (GetPlayer() != null && GetPlayer().GetGUID() == auctionPlayerGuid) { if (success) { @@ -803,7 +803,7 @@ namespace Game } Creature creature = GetPlayer().GetNPCIfCanInteractWith(sellItem.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outError(LogFilter.Network, "WORLD: HandleAuctionSellItem - Unit (%s) not found or you can't interact with him.", sellItem.Auctioneer.ToString()); return; @@ -832,7 +832,7 @@ namespace Game GetPlayer().RemoveAurasByType(AuraType.FeignDeath); Item item = _player.GetItemByGuid(sellItem.Items[0].Guid); - if (!item) + if (item == null) { SendAuctionCommandResult(0, AuctionCommand.SellItem, AuctionResult.ItemNotFound, throttle.DelayUntilNext); return; @@ -845,7 +845,7 @@ namespace Game return; } - if (Global.AuctionHouseMgr.GetAItem(item.GetGUID()) || !item.CanBeTraded() || item.IsNotEmptyBag() || + if (Global.AuctionHouseMgr.GetAItem(item.GetGUID()) != null || !item.CanBeTraded() || item.IsNotEmptyBag() || item.GetTemplate().HasFlag(ItemFlags.Conjured) || item.m_itemData.Expiration != 0 || item.GetCount() != 1) { @@ -904,7 +904,7 @@ namespace Game var auctionPlayerGuid = _player.GetGUID(); AddTransactionCallback(DB.Characters.AsyncCommitTransaction(trans)).AfterComplete(success => { - if (GetPlayer() && GetPlayer().GetGUID() == auctionPlayerGuid) + if (GetPlayer() != null && GetPlayer().GetGUID() == auctionPlayerGuid) { if (success) { @@ -954,7 +954,7 @@ namespace Game return; Creature creature = GetPlayer().GetNPCIfCanInteractWith(getCommodityQuote.Auctioneer, NPCFlags.Auctioneer, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outError(LogFilter.Network, $"WORLD: HandleAuctionStartCommoditiesPurchase - {getCommodityQuote.Auctioneer} not found or you can't interact with him."); return; diff --git a/Source/Game/Handlers/AzeriteHandler.cs b/Source/Game/Handlers/AzeriteHandler.cs index 843f6bdc6..852bc5a10 100644 --- a/Source/Game/Handlers/AzeriteHandler.cs +++ b/Source/Game/Handlers/AzeriteHandler.cs @@ -15,15 +15,15 @@ namespace Game [WorldPacketHandler(ClientOpcodes.AzeriteEssenceUnlockMilestone, Processing = PacketProcessing.Inplace)] void HandleAzeriteEssenceUnlockMilestone(AzeriteEssenceUnlockMilestone azeriteEssenceUnlockMilestone) { - if (!AzeriteItem.FindHeartForge(_player)) + if (AzeriteItem.FindHeartForge(_player) == null) return; Item item = _player.GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.Everywhere); - if (!item) + if (item == null) return; AzeriteItem azeriteItem = item.ToAzeriteItem(); - if (!azeriteItem || !azeriteItem.CanUseEssences()) + if (azeriteItem == null || !azeriteItem.CanUseEssences()) return; AzeriteItemMilestonePowerRecord milestonePower = CliDB.AzeriteItemMilestonePowerStorage.LookupByKey(azeriteEssenceUnlockMilestone.AzeriteItemMilestonePowerID); diff --git a/Source/Game/Handlers/BankHandler.cs b/Source/Game/Handlers/BankHandler.cs index 4ec82deef..f402784f1 100644 --- a/Source/Game/Handlers/BankHandler.cs +++ b/Source/Game/Handlers/BankHandler.cs @@ -22,7 +22,7 @@ namespace Game } Item item = GetPlayer().GetItemByPos(packet.Bag, packet.Slot); - if (!item) + if (item == null) return; List dest = new(); @@ -48,7 +48,7 @@ namespace Game void HandleBankerActivate(Hello packet) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(packet.Unit, NPCFlags.Banker, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outError(LogFilter.Network, "HandleBankerActivate: {0} not found or you can not interact with him.", packet.Unit.ToString()); return; @@ -70,7 +70,7 @@ namespace Game } Item item = GetPlayer().GetItemByPos(packet.Bag, packet.Slot); - if (!item) + if (item == null) return; if (Player.IsBankPos(packet.Bag, packet.Slot)) // moving from bank to inventory @@ -85,7 +85,7 @@ namespace Game GetPlayer().RemoveItem(packet.Bag, packet.Slot, true); Item storedItem = GetPlayer().StoreItem(dest, item, true); - if (storedItem) + if (storedItem != null) GetPlayer().ItemAddedQuestCheck(storedItem.GetEntry(), storedItem.GetCount()); } else // moving from inventory to bank @@ -213,7 +213,7 @@ namespace Game } Item item = _player.GetItemByPos(autoBankReagent.PackSlot, autoBankReagent.Slot); - if (!item) + if (item == null) return; List dest = new(); @@ -250,7 +250,7 @@ namespace Game } Item pItem = _player.GetItemByPos(autoStoreBankReagent.Slot, autoStoreBankReagent.PackSlot); - if (!pItem) + if (pItem == null) return; if (Player.IsReagentBankPos(autoStoreBankReagent.Slot, autoStoreBankReagent.PackSlot)) diff --git a/Source/Game/Handlers/BattleGroundHandler.cs b/Source/Game/Handlers/BattleGroundHandler.cs index 6072a9622..5487ab37d 100644 --- a/Source/Game/Handlers/BattleGroundHandler.cs +++ b/Source/Game/Handlers/BattleGroundHandler.cs @@ -22,7 +22,7 @@ namespace Game void HandleBattlemasterHello(Hello hello) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(hello.Unit, NPCFlags.BattleMaster, NPCFlags2.None); - if (!unit) + if (unit == null) return; // Stop the npc if moving @@ -198,7 +198,7 @@ namespace Game for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (!member) + if (member == null) continue; // this should never happen if (err != 0) @@ -226,7 +226,7 @@ namespace Game void HandlePVPLogData(PVPLogDataRequest packet) { Battleground bg = GetPlayer().GetBattleground(); - if (!bg) + if (bg == null) return; // Prevent players from sending BuildPvpLogDataPacket in an arena except for when sent in Battleground.EndBattleground. @@ -366,7 +366,7 @@ namespace Game // this is still needed here if Battleground"jumping" shouldn't add deserter debuff // also this is required to prevent stuck at old Battlegroundafter SetBattlegroundId set to new Battleground currentBg = GetPlayer().GetBattleground(); - if (currentBg) + if (currentBg != null) currentBg.RemovePlayerAtLeave(GetPlayer().GetGUID(), false, true); // set the destination instance id @@ -411,7 +411,7 @@ namespace Game if (GetPlayer().IsInCombat()) { Battleground bg = GetPlayer().GetBattleground(); - if (bg) + if (bg != null) if (bg.GetStatus() != BattlegroundStatus.WaitLeave) return; } @@ -455,7 +455,7 @@ namespace Game if (ginfo.IsInvitedToBGInstanceGUID != 0) { bg = Global.BattlegroundMgr.GetBattleground(ginfo.IsInvitedToBGInstanceGUID, bgTypeId); - if (!bg) + if (bg == null) continue; BattlefieldStatusNeedConfirmation battlefieldStatus; @@ -512,7 +512,7 @@ namespace Game Group grp = GetPlayer().GetGroup(); // no group found, error - if (!grp) + if (grp == null) return; if (grp.GetLeaderGUID() != GetPlayer().GetGUID()) return; @@ -549,7 +549,7 @@ namespace Game for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (!member) + if (member == null) continue; if (err != 0) @@ -584,7 +584,7 @@ namespace Game void HandleReportPvPAFK(ReportPvPPlayerAFK reportPvPPlayerAFK) { Player reportedPlayer = Global.ObjAccessor.FindPlayer(reportPvPPlayerAFK.Offender); - if (!reportedPlayer) + if (reportedPlayer == null) { Log.outDebug(LogFilter.Battleground, "WorldSession.HandleReportPvPAFK: player not found"); return; diff --git a/Source/Game/Handlers/BattlePetHandler.cs b/Source/Game/Handlers/BattlePetHandler.cs index d475d5f8d..0bc801aee 100644 --- a/Source/Game/Handlers/BattlePetHandler.cs +++ b/Source/Game/Handlers/BattlePetHandler.cs @@ -52,7 +52,7 @@ namespace Game response.BattlePetID = queryBattlePetName.BattlePetID; Creature summonedBattlePet = ObjectAccessor.GetCreatureOrPetOrVehicle(_player, queryBattlePetName.UnitGUID); - if (!summonedBattlePet || !summonedBattlePet.IsSummon()) + if (summonedBattlePet == null || !summonedBattlePet.IsSummon()) { SendPacket(response); return; diff --git a/Source/Game/Handlers/BlackMarketHandlers.cs b/Source/Game/Handlers/BlackMarketHandlers.cs index 015913e37..8e67d41c0 100644 --- a/Source/Game/Handlers/BlackMarketHandlers.cs +++ b/Source/Game/Handlers/BlackMarketHandlers.cs @@ -16,7 +16,7 @@ namespace Game void HandleBlackMarketOpen(BlackMarketOpen blackMarketOpen) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(blackMarketOpen.Guid, NPCFlags.BlackMarket, NPCFlags2.BlackMarketView); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleBlackMarketHello - {0} not found or you can't interact with him.", blackMarketOpen.Guid.ToString()); return; @@ -45,7 +45,7 @@ namespace Game return; Creature unit = GetPlayer().GetNPCIfCanInteractWith(blackMarketRequestItems.Guid, NPCFlags.BlackMarket, NPCFlags2.BlackMarketView); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleBlackMarketRequestItems - {0} not found or you can't interact with him.", blackMarketRequestItems.Guid.ToString()); return; @@ -64,7 +64,7 @@ namespace Game Player player = GetPlayer(); Creature unit = player.GetNPCIfCanInteractWith(blackMarketBidOnItem.Guid, NPCFlags.BlackMarket, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleBlackMarketBidOnItem - {0} not found or you can't interact with him.", blackMarketBidOnItem.Guid.ToString()); return; diff --git a/Source/Game/Handlers/CalendarHandler.cs b/Source/Game/Handlers/CalendarHandler.cs index 9d77d88a1..9c7229d12 100644 --- a/Source/Game/Handlers/CalendarHandler.cs +++ b/Source/Game/Handlers/CalendarHandler.cs @@ -87,7 +87,7 @@ namespace Game void HandleCalendarCommunityInvite(CalendarCommunityInviteRequest calendarCommunityInvite) { Guild guild = Global.GuildMgr.GetGuildById(GetPlayer().GetGuildId()); - if (guild) + if (guild != null) guild.MassInviteToEvent(this, calendarCommunityInvite.MinLevel, calendarCommunityInvite.MaxLevel, (GuildRankOrder)calendarCommunityInvite.MaxRankOrder); } @@ -308,7 +308,7 @@ namespace Game return; Player player = Global.ObjAccessor.FindPlayerByName(calendarInvite.Name); - if (player) + if (player != null) { // Invitee is online inviteeGuid = player.GetGUID(); diff --git a/Source/Game/Handlers/CharacterHandler.cs b/Source/Game/Handlers/CharacterHandler.cs index 3655d0e4e..864c12e44 100644 --- a/Source/Game/Handlers/CharacterHandler.cs +++ b/Source/Game/Handlers/CharacterHandler.cs @@ -186,7 +186,7 @@ namespace Game if (req.QuestID != 0) { - if (!_player) + if (_player == null) return false; if (!_player.IsQuestRewarded((uint)req.QuestID)) @@ -647,14 +647,14 @@ namespace Game uint initAccountId = GetAccountId(); // can't delete loaded character - if (Global.ObjAccessor.FindPlayer(charDelete.Guid)) + if (Global.ObjAccessor.FindPlayer(charDelete.Guid) != null) { Global.ScriptMgr.OnPlayerFailedDelete(charDelete.Guid, initAccountId); return; } // is guild leader - if (Global.GuildMgr.GetGuildByLeader(charDelete.Guid)) + if (Global.GuildMgr.GetGuildByLeader(charDelete.Guid) != null) { Global.ScriptMgr.OnPlayerFailedDelete(charDelete.Guid, initAccountId); SendCharDelete(ResponseCodes.CharDeleteFailedGuildLeader); @@ -764,7 +764,7 @@ namespace Game public void HandleContinuePlayerLogin() { - if (!PlayerLoading() || GetPlayer()) + if (!PlayerLoading() || GetPlayer() != null) { KickPlayer("WorldSession::HandleContinuePlayerLogin incorrect player state when logging in"); return; @@ -834,7 +834,7 @@ namespace Game pCurrChar.SetInGuild(resultGuild.Read(0)); pCurrChar.SetGuildRank(resultGuild.Read(1)); Guild guild = Global.GuildMgr.GetGuildById(pCurrChar.GetGuildId()); - if (guild) + if (guild != null) pCurrChar.SetGuildLevel(guild.GetLevel()); } else if (pCurrChar.GetGuildId() != 0) @@ -890,7 +890,7 @@ namespace Game if (pCurrChar.GetGuildId() != 0) { Guild guild = Global.GuildMgr.GetGuildById(pCurrChar.GetGuildId()); - if (guild) + if (guild != null) guild.SendLoginInfo(this); else { @@ -917,7 +917,7 @@ namespace Game // announce group about member online (must be after add to player list to receive announce to self) Group group = pCurrChar.GetGroup(); - if (group) + if (group != null) { group.SendUpdate(); if (group.GetLeaderGUID() == pCurrChar.GetGUID()) @@ -1093,7 +1093,7 @@ namespace Game public void AbortLogin(LoginFailureReason reason) { - if (!PlayerLoading() || GetPlayer()) + if (!PlayerLoading() || GetPlayer() != null) { KickPlayer("WorldSession::AbortLogin incorrect player state when logging in"); return; @@ -1404,7 +1404,7 @@ namespace Game return; GameObject go = GetPlayer().FindNearestGameObjectOfType(GameObjectTypes.BarberChair, 5.0f); - if (!go) + if (go == null) { SendPacket(new BarberShopResult(BarberShopResult.ResultEnum.NotOnChair)); return; @@ -1583,7 +1583,7 @@ namespace Game Item item = _player.GetItemByPos(InventorySlots.Bag0, i); // cheating check 1 (item equipped but sent empty guid) - if (!item) + if (item == null) return; // cheating check 2 (sent guid does not match equipped item) @@ -1678,10 +1678,10 @@ namespace Game Item item = GetPlayer().GetItemByGuid(useEquipmentSet.Items[i].Item); ushort dstPos = (ushort)(i | (InventorySlots.Bag0 << 8)); - if (!item) + if (item == null) { Item uItem = GetPlayer().GetItemByPos(InventorySlots.Bag0, i); - if (!uItem) + if (uItem == null) continue; List itemPosCount = new(); @@ -2473,7 +2473,7 @@ namespace Game return; Corpse corpse = GetPlayer().GetCorpse(); - if (!corpse) + if (corpse == null) return; // prevent resurrect before 30-sec delay after body release not finished @@ -2506,7 +2506,7 @@ namespace Game return; Player ressPlayer = Global.ObjAccessor.GetPlayer(GetPlayer(), packet.Resurrecter); - if (ressPlayer) + if (ressPlayer != null) { InstanceScript instance = ressPlayer.GetInstanceScript(); if (instance != null) diff --git a/Source/Game/Handlers/ChatHandler.cs b/Source/Game/Handlers/ChatHandler.cs index d3ec40b7a..99ef6fb4a 100644 --- a/Source/Game/Handlers/ChatHandler.cs +++ b/Source/Game/Handlers/ChatHandler.cs @@ -213,7 +213,7 @@ namespace Game } Player receiver = Global.ObjAccessor.FindPlayerByName(extName.Name); - if (!receiver || (lang != Language.Addon && !receiver.IsAcceptWhispers() && receiver.GetSession().HasPermission(RBACPermissions.CanFilterWhispers) && !receiver.IsInWhisperWhiteList(sender.GetGUID()))) + if (receiver == null || (lang != Language.Addon && !receiver.IsAcceptWhispers() && receiver.GetSession().HasPermission(RBACPermissions.CanFilterWhispers) && !receiver.IsInWhisperWhiteList(sender.GetGUID()))) { SendChatPlayerNotfoundNotice(target); return; @@ -251,10 +251,10 @@ namespace Game { // if player is in Battleground, he cannot say to Battlegroundmembers by /p Group group = GetPlayer().GetOriginalGroup(); - if (!group) + if (group == null) { group = GetPlayer().GetGroup(); - if (!group || group.IsBGGroup()) + if (group == null || group.IsBGGroup()) return; } @@ -272,7 +272,7 @@ namespace Game if (GetPlayer().GetGuildId() != 0) { Guild guild = Global.GuildMgr.GetGuildById(GetPlayer().GetGuildId()); - if (guild) + if (guild != null) { Global.ScriptMgr.OnPlayerChat(GetPlayer(), type, lang, msg, guild); @@ -284,7 +284,7 @@ namespace Game if (GetPlayer().GetGuildId() != 0) { Guild guild = Global.GuildMgr.GetGuildById(GetPlayer().GetGuildId()); - if (guild) + if (guild != null) { Global.ScriptMgr.OnPlayerChat(GetPlayer(), type, lang, msg, guild); @@ -295,7 +295,7 @@ namespace Game case ChatMsg.Raid: { Group group = GetPlayer().GetGroup(); - if (!group || !group.IsRaidGroup() || group.IsBGGroup()) + if (group == null || !group.IsRaidGroup() || group.IsBGGroup()) return; if (group.IsLeader(GetPlayer().GetGUID())) @@ -311,7 +311,7 @@ namespace Game case ChatMsg.RaidWarning: { Group group = GetPlayer().GetGroup(); - if (!group || !(group.IsRaidGroup() || WorldConfig.GetBoolValue(WorldCfg.ChatPartyRaidWarnings)) || !(group.IsLeader(GetPlayer().GetGUID()) || group.IsAssistant(GetPlayer().GetGUID())) || group.IsBGGroup()) + if (group == null || !(group.IsRaidGroup() || WorldConfig.GetBoolValue(WorldCfg.ChatPartyRaidWarnings)) || !(group.IsLeader(GetPlayer().GetGUID()) || group.IsAssistant(GetPlayer().GetGUID())) || group.IsBGGroup()) return; Global.ScriptMgr.OnPlayerChat(GetPlayer(), type, lang, msg, group); @@ -341,7 +341,7 @@ namespace Game case ChatMsg.InstanceChat: { Group group = GetPlayer().GetGroup(); - if (!group) + if (group == null) return; if (group.IsLeader(GetPlayer().GetGUID())) @@ -393,7 +393,7 @@ namespace Game if (sender.GetGuildId() != 0) { Guild guild = Global.GuildMgr.GetGuildById(sender.GetGuildId()); - if (guild) + if (guild != null) guild.BroadcastAddonToGuild(this, type == ChatMsg.Officer, text, prefix, isLogged); } break; @@ -405,7 +405,7 @@ namespace Game break; Player receiver = Global.ObjAccessor.FindPlayerByName(extName.Name); - if (!receiver) + if (receiver == null) break; sender.WhisperAddon(text, prefix, isLogged, receiver); @@ -420,10 +420,10 @@ namespace Game if (type != ChatMsg.InstanceChat) group = sender.GetOriginalGroup(); - if (!group) + if (group == null) { group = sender.GetGroup(); - if (!group) + if (group == null) break; if (type == ChatMsg.Party) @@ -586,10 +586,10 @@ namespace Game GetPlayer().UpdateCriteria(CriteriaType.DoEmote, (uint)packet.EmoteID, 0, 0, unit); // Send scripted event call - if (unit) + if (unit != null) { Creature creature = unit.ToCreature(); - if (creature) + if (creature != null) creature.GetAI().ReceiveEmote(GetPlayer(), (TextEmotes)packet.EmoteID); } @@ -601,7 +601,7 @@ namespace Game void HandleChatIgnoredOpcode(ChatReportIgnored packet) { Player player = Global.ObjAccessor.FindPlayer(packet.IgnoredGUID); - if (!player || player.GetSession() == null) + if (player == null || player.GetSession() == null) return; ChatPkt data = new(); @@ -631,7 +631,7 @@ namespace Game Player sender = GetPlayer(); Player receiver = Global.ObjAccessor.FindConnectedPlayer(canLocalWhisperTargetRequest.WhisperTarget); - if (!receiver || (!receiver.IsAcceptWhispers() && receiver.GetSession().HasPermission(RBACPermissions.CanFilterWhispers) && !receiver.IsInWhisperWhiteList(sender.GetGUID()))) + if (receiver == null || (!receiver.IsAcceptWhispers() && receiver.GetSession().HasPermission(RBACPermissions.CanFilterWhispers) && !receiver.IsInWhisperWhiteList(sender.GetGUID()))) status = ChatWhisperTargetStatus.Offline; else { diff --git a/Source/Game/Handlers/CombatHandler.cs b/Source/Game/Handlers/CombatHandler.cs index 22d4cb989..9986059a3 100644 --- a/Source/Game/Handlers/CombatHandler.cs +++ b/Source/Game/Handlers/CombatHandler.cs @@ -15,7 +15,7 @@ namespace Game void HandleAttackSwing(AttackSwing packet) { Unit enemy = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Victim); - if (!enemy) + if (enemy == null) { // stop attack state at client SendAttackStop(null); @@ -33,7 +33,7 @@ namespace Game //! so we'll place the same check here. Note that it might be possible to reuse this snippet //! in other places as well. Vehicle vehicle = GetPlayer().GetVehicle(); - if (vehicle) + if (vehicle != null) { VehicleSeatRecord seat = vehicle.GetSeatForPassenger(GetPlayer()); Cypher.Assert(seat != null); diff --git a/Source/Game/Handlers/DuelHandler.cs b/Source/Game/Handlers/DuelHandler.cs index 50600cd5a..b8eb31458 100644 --- a/Source/Game/Handlers/DuelHandler.cs +++ b/Source/Game/Handlers/DuelHandler.cs @@ -15,7 +15,7 @@ namespace Game { Player player = Global.ObjAccessor.FindPlayer(packet.TargetGUID); - if (!player) + if (player == null) return; CanDuelResult response = new(); diff --git a/Source/Game/Handlers/GarrisonHandler.cs b/Source/Game/Handlers/GarrisonHandler.cs index baa95d636..c936b0c85 100644 --- a/Source/Game/Handlers/GarrisonHandler.cs +++ b/Source/Game/Handlers/GarrisonHandler.cs @@ -21,7 +21,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GarrisonPurchaseBuilding)] void HandleGarrisonPurchaseBuilding(GarrisonPurchaseBuilding garrisonPurchaseBuilding) { - if (!_player.GetNPCIfCanInteractWith(garrisonPurchaseBuilding.NpcGUID, NPCFlags.None, NPCFlags2.GarrisonArchitect)) + if (_player.GetNPCIfCanInteractWith(garrisonPurchaseBuilding.NpcGUID, NPCFlags.None, NPCFlags2.GarrisonArchitect) == null) return; Garrison garrison = _player.GetGarrison(); @@ -32,7 +32,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GarrisonCancelConstruction)] void HandleGarrisonCancelConstruction(GarrisonCancelConstruction garrisonCancelConstruction) { - if (!_player.GetNPCIfCanInteractWith(garrisonCancelConstruction.NpcGUID, NPCFlags.None, NPCFlags2.GarrisonArchitect)) + if (_player.GetNPCIfCanInteractWith(garrisonCancelConstruction.NpcGUID, NPCFlags.None, NPCFlags2.GarrisonArchitect) == null) return; Garrison garrison = _player.GetGarrison(); diff --git a/Source/Game/Handlers/GroupHandler.cs b/Source/Game/Handlers/GroupHandler.cs index 831695ccd..533a11d35 100644 --- a/Source/Game/Handlers/GroupHandler.cs +++ b/Source/Game/Handlers/GroupHandler.cs @@ -89,11 +89,11 @@ namespace Game Group group2 = invitedPlayer.GetGroup(packet.PartyIndex); PartyInvite partyInvite; // player already in another group or invited - if (group2 || invitedPlayer.GetGroupInvite()) + if (group2 != null || invitedPlayer.GetGroupInvite() != null) { SendPartyResult(PartyOperation.Invite, invitedPlayer.GetName(), PartyResult.AlreadyInGroupS); - if (group2) + if (group2 != null) { // tell the player that they were invited but it failed as they were already in a group partyInvite = new PartyInvite(); @@ -104,7 +104,7 @@ namespace Game return; } - if (group) + if (group != null) { // not have permissions for invite if (!group.IsLeader(invitingPlayer.GetGUID()) && !group.IsAssistant(invitingPlayer.GetGUID())) @@ -185,14 +185,14 @@ namespace Game if (!group.IsCreated()) { // This can happen if the leader is zoning. To be removed once delayed actions for zoning are implemented - if (!leader) + if (leader == null) { group.RemoveAllInvites(); return; } // If we're about to create a group there really should be a leader present - Cypher.Assert(leader); + Cypher.Assert(leader != null); group.RemoveInvite(leader); group.Create(leader); Global.GroupMgr.AddGroup(group); @@ -212,7 +212,7 @@ namespace Game // uninvite, group can be deleted GetPlayer().UninviteFromGroup(); - if (!leader || leader.GetSession() == null) + if (leader == null || leader.GetSession() == null) return; // report @@ -241,7 +241,7 @@ namespace Game Group grp = GetPlayer().GetGroup(packet.PartyIndex); // grp is checked already above in CanUninviteFromGroup() - Cypher.Assert(grp); + Cypher.Assert(grp != null); if (grp.IsMember(packet.TargetGUID)) { @@ -249,7 +249,7 @@ namespace Game return; } Player player = grp.GetInvited(packet.TargetGUID); - if (player) + if (player != null) { player.UninviteFromGroup(); return; @@ -264,7 +264,7 @@ namespace Game Player player = Global.ObjAccessor.FindConnectedPlayer(packet.TargetGUID); Group group = GetPlayer().GetGroup(packet.PartyIndex); - if (!group || !player) + if (group == null || player == null) return; if (!group.IsLeader(GetPlayer().GetGUID()) || player.GetGroup() != group) @@ -281,7 +281,7 @@ namespace Game RoleChangedInform roleChangedInform = new(); Group group = GetPlayer().GetGroup(packet.PartyIndex); - byte oldRole = (byte)(group ? group.GetLfgRoles(packet.TargetGUID) : 0); + byte oldRole = (byte)(group != null ? group.GetLfgRoles(packet.TargetGUID) : 0); if (oldRole == packet.Role) return; @@ -291,7 +291,7 @@ namespace Game roleChangedInform.OldRole = oldRole; roleChangedInform.NewRole = packet.Role; - if (group) + if (group != null) { group.BroadcastPacket(roleChangedInform, false); group.SetLfgRoles(packet.TargetGUID, (LfgRoles)packet.Role); @@ -336,7 +336,7 @@ namespace Game // not allowed to change /* Group group = GetPlayer().GetGroup(packet.PartyIndex); - if (!group) + if (group == null) return; if (!group.IsLeader(GetPlayer().GetGUID())) @@ -410,7 +410,7 @@ namespace Game if (packet.Target.IsPlayer()) { Player target = Global.ObjAccessor.FindConnectedPlayer(packet.Target); - if (!target || target.IsHostileTo(GetPlayer())) + if (target == null || target.IsHostileTo(GetPlayer())) return; } @@ -422,7 +422,7 @@ namespace Game void HandleConvertRaid(ConvertRaid packet) { Group group = GetPlayer().GetGroup(); - if (!group) + if (group == null) return; if (GetPlayer().InBattleground()) @@ -559,7 +559,7 @@ namespace Game PartyMemberFullState partyMemberStats = new(); Player player = Global.ObjAccessor.FindConnectedPlayer(packet.TargetGUID); - if (!player) + if (player == null) { partyMemberStats.MemberGuid = packet.TargetGUID; partyMemberStats.MemberStats.Status = GroupMemberOnlineStatus.Offline; @@ -581,7 +581,7 @@ namespace Game void HandleOptOutOfLoot(OptOutOfLoot packet) { // ignore if player not loaded - if (!GetPlayer()) // needed because STATUS_AUTHED + if (GetPlayer() == null) // needed because STATUS_AUTHED { if (packet.PassOnLoot) Log.outError(LogFilter.Network, "CMSG_OPT_OUT_OF_LOOT value<>0 for not-loaded character!"); @@ -643,7 +643,7 @@ namespace Game return false; group = player.GetGroup(); - if (!group) + if (group == null) return false; if (group.IsRestrictPingsToAssistants() && !group.IsLeader(player.GetGUID()) && !group.IsAssistant(player.GetGUID())) @@ -656,7 +656,7 @@ namespace Game void HandleSetRestrictPingsToAssistants(SetRestrictPingsToAssistants setRestrictPingsToAssistants) { Group group = GetPlayer().GetGroup(setRestrictPingsToAssistants.PartyIndex); - if (!group) + if (group == null) return; if (!group.IsLeader(GetPlayer().GetGUID())) @@ -673,7 +673,7 @@ namespace Game return; Unit target = Global.ObjAccessor.GetUnit(_player, pingUnit.TargetGUID); - if (!target || !_player.HaveAtClient(target)) + if (target == null || !_player.HaveAtClient(target)) return; ReceivePingUnit broadcastPingUnit = new(); diff --git a/Source/Game/Handlers/GuildHandler.cs b/Source/Game/Handlers/GuildHandler.cs index 258cbf89a..b31cc4d00 100644 --- a/Source/Game/Handlers/GuildHandler.cs +++ b/Source/Game/Handlers/GuildHandler.cs @@ -15,7 +15,7 @@ namespace Game void HandleGuildQuery(QueryGuildInfo query) { Guild guild = Global.GuildMgr.GetGuildByGuid(query.GuildGuid); - if (guild) + if (guild != null) { guild.SendQueryResponse(this); return; @@ -33,7 +33,7 @@ namespace Game return; Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleInviteMember(this, packet.Name); } @@ -41,7 +41,7 @@ namespace Game void HandleGuildOfficerRemoveMember(GuildOfficerRemoveMember packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleRemoveMember(this, packet.Removee); } @@ -51,7 +51,7 @@ namespace Game if (GetPlayer().GetGuildId() == 0) { Guild guild = Global.GuildMgr.GetGuildById(GetPlayer().GetGuildIdInvited()); - if (guild) + if (guild != null) guild.HandleAcceptMember(this); } } @@ -70,7 +70,7 @@ namespace Game void HandleGuildGetRoster(GuildGetRoster packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleRoster(this); else Guild.SendCommandResult(this, GuildCommandType.GetRoster, GuildCommandError.PlayerNotInGuild); @@ -80,7 +80,7 @@ namespace Game void HandleGuildPromoteMember(GuildPromoteMember packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleUpdateMemberRank(this, packet.Promotee, false); } @@ -88,7 +88,7 @@ namespace Game void HandleGuildDemoteMember(GuildDemoteMember packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleUpdateMemberRank(this, packet.Demotee, true); } @@ -98,7 +98,7 @@ namespace Game ObjectGuid setterGuid = GetPlayer().GetGUID(); Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetMemberRank(this, packet.Member, setterGuid, (GuildRankOrder)packet.RankOrder); } @@ -106,7 +106,7 @@ namespace Game void HandleGuildLeave(GuildLeave packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleLeaveMember(this); } @@ -114,7 +114,7 @@ namespace Game void HandleGuildDisband(GuildDelete packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleDelete(this); } @@ -128,7 +128,7 @@ namespace Game return; Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetMOTD(this, packet.MotdText); } @@ -142,7 +142,7 @@ namespace Game return; Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetMemberNote(this, packet.Note, packet.NoteeGUID, packet.IsPublic); } @@ -150,7 +150,7 @@ namespace Game void HandleGuildGetRanks(GuildGetRanks packet) { Guild guild = Global.GuildMgr.GetGuildByGuid(packet.GuildGUID); - if (guild) + if (guild != null) if (guild.IsMember(GetPlayer().GetGUID())) guild.SendGuildRankInfo(this); } @@ -165,7 +165,7 @@ namespace Game return; Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleAddNewRank(this, packet.Name); } @@ -173,7 +173,7 @@ namespace Game void HandleGuildDeleteRank(GuildDeleteRank packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleRemoveRank(this, (GuildRankOrder)packet.RankOrder); } @@ -181,7 +181,7 @@ namespace Game void HandleGuildShiftRank(GuildShiftRank shiftRank) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleShiftRank(this, (GuildRankOrder)shiftRank.RankOrder, shiftRank.ShiftUp); } @@ -195,7 +195,7 @@ namespace Game return; Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetInfo(this, packet.InfoText); } @@ -205,7 +205,7 @@ namespace Game Guild.EmblemInfo emblemInfo = new(); emblemInfo.ReadPacket(packet); - if (GetPlayer().GetNPCIfCanInteractWith(packet.Vendor, NPCFlags.TabardDesigner, NPCFlags2.None)) + if (GetPlayer().GetNPCIfCanInteractWith(packet.Vendor, NPCFlags.TabardDesigner, NPCFlags2.None) != null) { // Remove fake death if (GetPlayer().HasUnitState(UnitState.Died)) @@ -218,7 +218,7 @@ namespace Game } Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetEmblem(this, emblemInfo); else Guild.SendSaveEmblemResult(this, GuildEmblemError.NoGuild); // "You are not part of a guild!"; @@ -231,7 +231,7 @@ namespace Game void HandleGuildEventLogQuery(GuildEventLogQuery packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SendEventLog(this); } @@ -239,7 +239,7 @@ namespace Game void HandleGuildBankMoneyWithdrawn(GuildBankRemainingWithdrawMoneyQuery packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SendMoneyInfo(this); } @@ -247,7 +247,7 @@ namespace Game void HandleGuildPermissionsQuery(GuildPermissionsQuery packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SendPermissions(this); } @@ -271,10 +271,10 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GuildBankQueryTab)] void HandleGuildBankQueryTab(GuildBankQueryTab packet) { - if (GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank) != null) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SendBankList(this, packet.Tab, true/*packet.FullUpdate*/); // HACK: client doesn't query entire tab content if it had received SMSG_GUILD_BANK_LIST in this session // but we broadcast bank updates to entire guild when *ANYONE* changes anything, incorrectly initializing clients @@ -285,12 +285,12 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GuildBankDepositMoney)] void HandleGuildBankDepositMoney(GuildBankDepositMoney packet) { - if (GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank) != null) { if (packet.Money != 0 && GetPlayer().HasEnoughMoney(packet.Money)) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleMemberDepositMoney(this, packet.Money); } } @@ -299,10 +299,10 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GuildBankWithdrawMoney)] void HandleGuildBankWithdrawMoney(GuildBankWithdrawMoney packet) { - if (packet.Money != 0 && GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank)) + if (packet.Money != 0 && GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank) != null) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleMemberWithdrawMoney(this, packet.Money); } } @@ -310,7 +310,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.AutoGuildBankItem)] void HandleAutoGuildBankItem(AutoGuildBankItem depositGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(depositGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(depositGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -327,7 +327,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.StoreGuildBankItem)] void HandleStoreGuildBankItem(StoreGuildBankItem storeGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(storeGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(storeGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -344,7 +344,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.SwapItemWithGuildBankItem)] void HandleSwapItemWithGuildBankItem(SwapItemWithGuildBankItem swapItemWithGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(swapItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(swapItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -361,7 +361,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.SwapGuildBankItemWithGuildBankItem)] void HandleSwapGuildBankItemWithGuildBankItem(SwapGuildBankItemWithGuildBankItem swapGuildBankItemWithGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(swapGuildBankItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(swapGuildBankItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -375,7 +375,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MoveGuildBankItem)] void HandleMoveGuildBankItem(MoveGuildBankItem moveGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(moveGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(moveGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -388,7 +388,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MergeItemWithGuildBankItem)] void HandleMergeItemWithGuildBankItem(MergeItemWithGuildBankItem mergeItemWithGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(mergeItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(mergeItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -405,7 +405,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.SplitItemToGuildBank)] void HandleSplitItemToGuildBank(SplitItemToGuildBank splitItemToGuildBank) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(splitItemToGuildBank.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(splitItemToGuildBank.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -422,7 +422,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MergeGuildBankItemWithItem)] void HandleMergeGuildBankItemWithItem(MergeGuildBankItemWithItem mergeGuildBankItemWithItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(mergeGuildBankItemWithItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(mergeGuildBankItemWithItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -439,7 +439,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.SplitGuildBankItemToInventory)] void HandleSplitGuildBankItemToInventory(SplitGuildBankItemToInventory splitGuildBankItemToInventory) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(splitGuildBankItemToInventory.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(splitGuildBankItemToInventory.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -456,7 +456,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.AutoStoreGuildBankItem)] void HandleAutoStoreGuildBankItem(AutoStoreGuildBankItem autoStoreGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(autoStoreGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(autoStoreGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -469,7 +469,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.MergeGuildBankItemWithGuildBankItem)] void HandleMergeGuildBankItemWithGuildBankItem(MergeGuildBankItemWithGuildBankItem mergeGuildBankItemWithGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(mergeGuildBankItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(mergeGuildBankItemWithGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -483,7 +483,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.SplitGuildBankItem)] void HandleSplitGuildBankItem(SplitGuildBankItem splitGuildBankItem) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(splitGuildBankItem.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(splitGuildBankItem.Banker, GameObjectTypes.GuildBank) == null) return; Guild guild = GetPlayer().GetGuild(); @@ -497,10 +497,10 @@ namespace Game [WorldPacketHandler(ClientOpcodes.GuildBankBuyTab)] void HandleGuildBankBuyTab(GuildBankBuyTab packet) { - if (packet.Banker.IsEmpty() || GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank)) + if (packet.Banker.IsEmpty() || GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank) != null) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleBuyBankTab(this, packet.BankTab); } } @@ -516,10 +516,10 @@ namespace Game if (!string.IsNullOrEmpty(packet.Name) && !string.IsNullOrEmpty(packet.Icon)) { - if (GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank)) + if (GetPlayer().GetGameObjectIfCanInteractWith(packet.Banker, GameObjectTypes.GuildBank) != null) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetBankTabInfo(this, packet.BankTab, packet.Name, packet.Icon); } } @@ -529,7 +529,7 @@ namespace Game void HandleGuildBankLogQuery(GuildBankLogQuery packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SendBankLog(this, (byte)packet.Tab); } @@ -537,7 +537,7 @@ namespace Game void HandleGuildBankTextQuery(GuildBankTextQuery packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SendBankTabText(this, (byte)packet.Tab); } @@ -551,7 +551,7 @@ namespace Game return; Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.SetBankTabText((byte)packet.Tab, packet.TabText); } @@ -579,7 +579,7 @@ namespace Game void HandleGuildRequestPartyState(RequestGuildPartyState packet) { Guild guild = Global.GuildMgr.GetGuildByGuid(packet.GuildGUID); - if (guild) + if (guild != null) guild.HandleGuildPartyRequest(this); } @@ -587,7 +587,7 @@ namespace Game void HandleGuildChallengeUpdateRequest(GuildChallengeUpdateRequest packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleGuildRequestChallengeUpdate(this); } @@ -603,7 +603,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.RequestGuildRewardsList)] void HandleRequestGuildRewardsList(RequestGuildRewardsList packet) { - if (Global.GuildMgr.GetGuildById(GetPlayer().GetGuildId())) + if (Global.GuildMgr.GetGuildById(GetPlayer().GetGuildId()) != null) { var rewards = Global.GuildMgr.GetGuildRewards(); @@ -630,7 +630,7 @@ namespace Game void HandleGuildQueryNews(GuildQueryNews packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) if (guild.GetGUID() == packet.GuildGUID) guild.SendNewsUpdate(this); } @@ -639,7 +639,7 @@ namespace Game void HandleGuildNewsUpdateSticky(GuildNewsUpdateSticky packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleNewsSetSticky(this, (uint)packet.NewsID, packet.Sticky); } @@ -647,7 +647,7 @@ namespace Game void HandleGuildReplaceGuildMaster(GuildReplaceGuildMaster replaceGuildMaster) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetNewGuildMaster(this, "", true); } @@ -655,7 +655,7 @@ namespace Game void HandleGuildSetGuildMaster(GuildSetGuildMaster packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetNewGuildMaster(this, packet.NewMasterName, false); } @@ -663,7 +663,7 @@ namespace Game void HandleGuildSetAchievementTracking(GuildSetAchievementTracking packet) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleSetAchievementTracking(this, packet.AchievementIDs); } @@ -671,7 +671,7 @@ namespace Game void HandleGuildGetAchievementMembers(GuildGetAchievementMembers getAchievementMembers) { Guild guild = GetPlayer().GetGuild(); - if (guild) + if (guild != null) guild.HandleGetAchievementMembers(this, getAchievementMembers.AchievementID); } } diff --git a/Source/Game/Handlers/InspectHandler.cs b/Source/Game/Handlers/InspectHandler.cs index 2985b3989..0348d8487 100644 --- a/Source/Game/Handlers/InspectHandler.cs +++ b/Source/Game/Handlers/InspectHandler.cs @@ -15,7 +15,7 @@ namespace Game void HandleInspect(Inspect inspect) { Player player = Global.ObjAccessor.GetPlayer(_player, inspect.Target); - if (!player) + if (player == null) { Log.outDebug(LogFilter.Network, "WorldSession.HandleInspectOpcode: Target {0} not found.", inspect.Target.ToString()); return; @@ -51,7 +51,7 @@ namespace Game } Guild guild = Global.GuildMgr.GetGuildById(player.GetGuildId()); - if (guild) + if (guild != null) { InspectGuildData guildData; guildData.GuildGUID = guild.GetGUID(); @@ -83,7 +83,7 @@ namespace Game void HandleQueryInspectAchievements(QueryInspectAchievements inspect) { Player player = Global.ObjAccessor.GetPlayer(_player, inspect.Guid); - if (!player) + if (player == null) { Log.outDebug(LogFilter.Network, "WorldSession.HandleQueryInspectAchievements: [{0}] inspected unknown Player [{1}]", GetPlayer().GetGUID().ToString(), inspect.Guid.ToString()); return; diff --git a/Source/Game/Handlers/ItemHandler.cs b/Source/Game/Handlers/ItemHandler.cs index d17b677a9..ec3e327cf 100644 --- a/Source/Game/Handlers/ItemHandler.cs +++ b/Source/Game/Handlers/ItemHandler.cs @@ -270,7 +270,7 @@ namespace Game else { Item parentItem = _player.GetItemByGuid(dstItem.GetCreator()); - if (parentItem) + if (parentItem != null) { if (Player.IsEquipmentPos(dest)) { @@ -565,7 +565,7 @@ namespace Game } Item item = GetPlayer().GetItemByPos(packet.ContainerSlotA, packet.SlotA); - if (!item) + if (item == null) return; if (!GetPlayer().IsValidPos(packet.ContainerSlotB, ItemConst.NullSlot, false)) // can be autostore pos @@ -647,7 +647,7 @@ namespace Game byte itemSlot = packet.Inv.Items[1].Slot; Item gift = GetPlayer().GetItemByPos(giftContainerSlot, giftSlot); - if (!gift) + if (gift == null) { GetPlayer().SendEquipError(InventoryResult.ItemNotFound, gift); return; @@ -660,7 +660,7 @@ namespace Game } Item item = GetPlayer().GetItemByPos(itemContainerSlot, itemSlot); - if (!item) + if (item == null) { GetPlayer().SendEquipError(InventoryResult.ItemNotFound, item); return; @@ -770,7 +770,7 @@ namespace Game return; Item itemTarget = GetPlayer().GetItemByGuid(socketGems.ItemGuid); - if (!itemTarget) //missing item to socket + if (itemTarget == null) //missing item to socket return; ItemTemplate itemProto = itemTarget.GetTemplate(); @@ -789,7 +789,7 @@ namespace Game for (int i = 0; i < ItemConst.MaxGemSockets; ++i) { Item gem = _player.GetItemByGuid(socketGems.GemItem[i]); - if (gem) + if (gem != null) { gems[i] = gem; gemData[i].ItemId = gem.GetEntry(); @@ -836,7 +836,7 @@ namespace Game // check unique-equipped conditions for (int i = 0; i < ItemConst.MaxGemSockets; ++i) { - if (!gems[i]) + if (gems[i] == null) continue; // continue check for case when attempt add 2 similar unique equipped gems in one item. @@ -850,7 +850,7 @@ namespace Game if (i == j) // skip self continue; - if (gems[j]) + if (gems[j] != null) { if (iGemProto.GetId() == gems[j].GetEntry()) { @@ -879,7 +879,7 @@ namespace Game // NOTE: limitEntry.mode is not checked because if item has limit then it is applied in equip case for (int j = 0; j < ItemConst.MaxGemSockets; ++j) { - if (gems[j]) + if (gems[j] != null) { // new gem if (iGemProto.GetItemLimitCategory() == gems[j].GetTemplate().GetItemLimitCategory()) @@ -926,7 +926,7 @@ namespace Game for (ushort i = 0; i < ItemConst.MaxGemSockets; ++i) { - if (gems[i]) + if (gems[i] != null) { uint gemScalingLevel = _player.GetLevel(); uint fixedLevel = gems[i].GetModifier(ItemModifier.TimewalkerLevel); @@ -947,7 +947,7 @@ namespace Game _player._ApplyItemMods(itemTarget, itemTarget.GetSlot(), true); Item childItem = _player.GetChildItemByGuid(itemTarget.GetChildItem()); - if (childItem) + if (childItem != null) { if (childItem.IsEquipped()) _player._ApplyItemMods(childItem, childItem.GetSlot(), false); @@ -981,7 +981,7 @@ namespace Game return; Item item = GetPlayer().GetItemByPos(InventorySlots.Bag0, (byte)packet.Slot); - if (!item) + if (item == null) return; if (item.GetEnchantmentId(EnchantmentSlot.Temp) == 0) @@ -995,7 +995,7 @@ namespace Game void HandleGetItemPurchaseData(GetItemPurchaseData packet) { Item item = GetPlayer().GetItemByGuid(packet.ItemGUID); - if (!item) + if (item == null) { Log.outDebug(LogFilter.Network, "HandleGetItemPurchaseData: Item {0} not found!", packet.ItemGUID.ToString()); return; @@ -1008,7 +1008,7 @@ namespace Game void HandleItemRefund(ItemPurchaseRefund packet) { Item item = GetPlayer().GetItemByGuid(packet.ItemGUID); - if (!item) + if (item == null) { Log.outDebug(LogFilter.Network, "WorldSession.HandleItemRefund: Item {0} not found!", packet.ItemGUID.ToString()); return; @@ -1032,7 +1032,7 @@ namespace Game if (!isUsingBankCommand) { Creature creature = GetPlayer().GetNPCIfCanInteractWith(bankerGUID, NPCFlags.Banker, NPCFlags2.None); - if (!creature) + if (creature == null) return false; } @@ -1043,7 +1043,7 @@ namespace Game void HandleUseCritterItem(UseCritterItem useCritterItem) { Item item = GetPlayer().GetItemByGuid(useCritterItem.ItemGuid); - if (!item) + if (item == null) return; foreach (var itemEffect in item.GetEffects()) @@ -1087,7 +1087,7 @@ namespace Game void HandleRemoveNewItem(RemoveNewItem removeNewItem) { Item item = _player.GetItemByGuid(removeNewItem.ItemGuid); - if (!item) + if (item == null) { Log.outDebug(LogFilter.Network, $"WorldSession.HandleRemoveNewItem: Item ({removeNewItem.ItemGuid}) not found for {GetPlayerInfo()}!"); return; diff --git a/Source/Game/Handlers/LFGHandler.cs b/Source/Game/Handlers/LFGHandler.cs index 304c616b5..423c0cc31 100644 --- a/Source/Game/Handlers/LFGHandler.cs +++ b/Source/Game/Handlers/LFGHandler.cs @@ -19,7 +19,7 @@ namespace Game void HandleLfgJoin(DFJoin dfJoin) { if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser) || - (GetPlayer().GetGroup() && GetPlayer().GetGroup().GetLeaderGUID() != GetPlayer().GetGUID() && + (GetPlayer().GetGroup() != null && GetPlayer().GetGroup().GetLeaderGUID() != GetPlayer().GetGUID() && (GetPlayer().GetGroup().GetMembersCount() == MapConst.MaxGroupSize || !GetPlayer().GetGroup().IsLFGGroup()))) return; @@ -47,10 +47,10 @@ namespace Game { Group group = GetPlayer().GetGroup(); - Log.outDebug(LogFilter.Lfg, "CMSG_DF_LEAVE {0} in group: {1} sent guid {2}.", GetPlayerInfo(), group ? 1 : 0, dfLeave.Ticket.RequesterGuid.ToString()); + Log.outDebug(LogFilter.Lfg, "CMSG_DF_LEAVE {0} in group: {1} sent guid {2}.", GetPlayerInfo(), group != null ? 1 : 0, dfLeave.Ticket.RequesterGuid.ToString()); // Check cheating - only leader can leave the queue - if (!group || group.GetLeaderGUID() == dfLeave.Ticket.RequesterGuid) + if (group == null || group.GetLeaderGUID() == dfLeave.Ticket.RequesterGuid) Global.LFGMgr.LeaveLfg(dfLeave.Ticket.RequesterGuid); } @@ -66,7 +66,7 @@ namespace Game { ObjectGuid guid = GetPlayer().GetGUID(); Group group = GetPlayer().GetGroup(); - if (!group) + if (group == null) { Log.outDebug(LogFilter.Lfg, "CMSG_DF_SET_ROLES {0} Not in group", GetPlayerInfo()); @@ -112,7 +112,7 @@ namespace Game ObjectGuid guid = GetPlayer().GetGUID(); LfgUpdateData updateData = Global.LFGMgr.GetLfgStatus(guid); - if (GetPlayer().GetGroup()) + if (GetPlayer().GetGroup() != null) { SendLfgUpdateStatus(updateData, true); updateData.dungeons.Clear(); @@ -199,7 +199,7 @@ namespace Game { ObjectGuid guid = GetPlayer().GetGUID(); Group group = GetPlayer().GetGroup(); - if (!group) + if (group == null) return; LfgPartyInfo lfgPartyInfo = new(); @@ -208,7 +208,7 @@ namespace Game for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player plrg = refe.GetSource(); - if (!plrg) + if (plrg == null) continue; ObjectGuid pguid = plrg.GetGUID(); diff --git a/Source/Game/Handlers/LogoutHandler.cs b/Source/Game/Handlers/LogoutHandler.cs index bc8cfd950..8080d7d92 100644 --- a/Source/Game/Handlers/LogoutHandler.cs +++ b/Source/Game/Handlers/LogoutHandler.cs @@ -66,7 +66,7 @@ namespace Game void HandleLogoutCancel(LogoutCancel packet) { // Player have already logged out serverside, too late to cancel - if (!GetPlayer()) + if (GetPlayer() == null) return; SetLogoutStartTime(0); diff --git a/Source/Game/Handlers/LootHandler.cs b/Source/Game/Handlers/LootHandler.cs index 498841ff6..d94c7d74a 100644 --- a/Source/Game/Handlers/LootHandler.cs +++ b/Source/Game/Handlers/LootHandler.cs @@ -38,7 +38,7 @@ namespace Game GameObject go = player.GetMap().GetGameObject(lguid); // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO - if (!go || ((go.GetOwnerGUID() != player.GetGUID() && go.GetGoType() != GameObjectTypes.FishingHole) && !go.IsWithinDistInMap(player))) + if (go == null || ((go.GetOwnerGUID() != player.GetGUID() && go.GetGoType() != GameObjectTypes.FishingHole) && !go.IsWithinDistInMap(player))) { player.SendLootRelease(lguid); continue; @@ -53,7 +53,7 @@ namespace Game continue; } - if (!creature.IsWithinDistInMap(player, AELootCreatureCheck.LootDistance)) + if (creature.IsWithinDistInMap(player, AELootCreatureCheck.LootDistance)) { player.SendLootError(req.Object, lguid, LootError.TooFar); continue; @@ -102,7 +102,7 @@ namespace Game for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player member = refe.GetSource(); - if (!member) + if (member == null) continue; if (!loot.HasAllowedLooter(member.GetGUID())) @@ -203,7 +203,7 @@ namespace Game return; Creature lootTarget = ObjectAccessor.GetCreature(GetPlayer(), packet.Unit); - if (!lootTarget) + if (lootTarget == null) return; AELootCreatureCheck check = new(_player, packet.Unit); @@ -272,7 +272,7 @@ namespace Game GameObject go = player.GetMap().GetGameObject(lguid); // not check distance for GO in case owned GO (fishing bobber case, for example) or Fishing hole GO - if (!go || ((go.GetOwnerGUID() != player.GetGUID() && go.GetGoType() != GameObjectTypes.FishingHole) && !go.IsWithinDistInMap(player))) + if (go == null || ((go.GetOwnerGUID() != player.GetGUID() && go.GetGoType() != GameObjectTypes.FishingHole) && !go.IsWithinDistInMap(player))) return; if (loot.IsLooted() || go.GetGoType() == GameObjectTypes.FishingNode || go.GetGoType() == GameObjectTypes.FishingHole) @@ -303,7 +303,7 @@ namespace Game else if (lguid.IsCorpse()) // ONLY remove insignia at BG { Corpse corpse = ObjectAccessor.GetCorpse(player, lguid); - if (!corpse || !corpse.IsWithinDistInMap(player, SharedConst.InteractionDistance)) + if (corpse == null || !corpse.IsWithinDistInMap(player, SharedConst.InteractionDistance)) return; if (loot.IsLooted()) @@ -315,7 +315,7 @@ namespace Game else if (lguid.IsItem()) { Item pItem = player.GetItemByGuid(lguid); - if (!pItem) + if (pItem == null) return; ItemTemplate proto = pItem.GetTemplate(); @@ -355,7 +355,7 @@ namespace Game creature.RemoveDynamicFlag(UnitDynFlags.Lootable); // skip pickpocketing loot for speed, skinning timer reduction is no-op in fact - if (!creature.IsAlive()) + if (creature.IsAlive()) creature.AllLootRemovedFromCorpse(); } } @@ -395,7 +395,7 @@ namespace Game // player on other map Player target = Global.ObjAccessor.GetPlayer(_player, masterLootItem.Target); - if (!target) + if (target == null) { GetPlayer().SendLootError(ObjectGuid.Empty, ObjectGuid.Empty, LootError.PlayerNotFound); return; diff --git a/Source/Game/Handlers/MailHandler.cs b/Source/Game/Handlers/MailHandler.cs index a312ecc11..704dbefbe 100644 --- a/Source/Game/Handlers/MailHandler.cs +++ b/Source/Game/Handlers/MailHandler.cs @@ -30,12 +30,12 @@ namespace Game } else if (guid.IsGameObject()) { - if (!GetPlayer().GetGameObjectIfCanInteractWith(guid, GameObjectTypes.Mailbox)) + if (GetPlayer().GetGameObjectIfCanInteractWith(guid, GameObjectTypes.Mailbox) == null) return false; } else if (guid.IsAnyTypeCreature()) { - if (!GetPlayer().GetNPCIfCanInteractWith(guid, NPCFlags.Mailbox, NPCFlags2.None)) + if (GetPlayer().GetNPCIfCanInteractWith(guid, NPCFlags.Mailbox, NPCFlags2.None) == null) return false; } else @@ -389,7 +389,7 @@ namespace Game foreach (var itemInfo in m.items) { Item item = player.GetMItem(itemInfo.item_guid); - if (item) + if (item != null) draft.AddItem(item); player.RemoveMItem(itemInfo.item_guid); } @@ -454,7 +454,7 @@ namespace Game if (HasPermission(RBACPermissions.LogGmTrade)) { string sender_name; - if (receiver) + if (receiver != null) { sender_accId = receiver.GetSession().GetAccountId(); sender_name = receiver.GetName(); @@ -470,11 +470,11 @@ namespace Game Log.outCommand(GetAccountId(), "GM {0} (Account: {1}) receiver mail item: {2} (Entry: {3} Count: {4}) and send COD money: {5} to player: {6} (Account: {7})", GetPlayerName(), GetAccountId(), it.GetTemplate().GetName(), it.GetEntry(), it.GetCount(), m.COD, sender_name, sender_accId); } - else if (!receiver) + else if (receiver == null) sender_accId = Global.CharacterCacheStorage.GetCharacterAccountIdByGuid(sender_guid); // check player existence - if (receiver || sender_accId != 0) + if (receiver != null || sender_accId != 0) { new MailDraft(m.subject, "") .AddMoney(m.COD) diff --git a/Source/Game/Handlers/MiscHandler.cs b/Source/Game/Handlers/MiscHandler.cs index be9f835aa..25893b222 100644 --- a/Source/Game/Handlers/MiscHandler.cs +++ b/Source/Game/Handlers/MiscHandler.cs @@ -29,7 +29,7 @@ namespace Game AccountData adata = GetAccountData(request.DataType); UpdateAccountData data = new(); - data.Player = GetPlayer() ? GetPlayer().GetGUID() : ObjectGuid.Empty; + data.Player = GetPlayer() != null ? GetPlayer().GetGUID() : ObjectGuid.Empty; data.Time = (uint)adata.Time; data.DataType = request.DataType; @@ -111,7 +111,7 @@ namespace Game [WorldPacketHandler(ClientOpcodes.SetActionBarToggles)] void HandleSetActionBarToggles(SetActionBarToggles packet) { - if (!GetPlayer()) // ignore until not logged (check needed because STATUS_AUTHED) + if (GetPlayer() == null) // ignore until not logged (check needed because STATUS_AUTHED) { if (packet.Mask != 0) Log.outError(LogFilter.Network, "WorldSession.HandleSetActionBarToggles in not logged state with value: {0}, ignored", packet.Mask); @@ -252,7 +252,7 @@ namespace Game return; } Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) bg.HandleAreaTrigger(player, packet.AreaTriggerID, packet.Entered); OutdoorPvP pvp = player.GetOutdoorPvP(); @@ -349,7 +349,7 @@ namespace Game } Group group = player.GetGroup(); - if (group) + if (group != null) if (group.IsLFGGroup() && player.GetMap().IsDungeon()) teleported = player.TeleportToBGEntryPoint(); } @@ -536,7 +536,7 @@ namespace Game { Log.outDebug(LogFilter.Network, "Added FarSight {0} to player {1}", GetPlayer().m_activePlayerData.FarsightObject.ToString(), GetPlayer().GetGUID().ToString()); WorldObject target = GetPlayer().GetViewpoint(); - if (target) + if (target != null) GetPlayer().SetSeer(target); else Log.outDebug(LogFilter.Network, "Player {0} (GUID: {1}) requests non-existing seer {2}", GetPlayer().GetName(), GetPlayer().GetGUID().ToString(), GetPlayer().m_activePlayerData.FarsightObject.ToString()); @@ -573,7 +573,7 @@ namespace Game return; Group group = GetPlayer().GetGroup(); - if (group) + if (group != null) { if (!group.IsLeader(GetPlayer().GetGUID())) return; @@ -618,7 +618,7 @@ namespace Game // cannot reset while in an instance Map map = GetPlayer().GetMap(); - if (map && map.Instanceable()) + if (map != null && map.Instanceable()) { Log.outDebug(LogFilter.Network, "WorldSession:HandleSetDungeonDifficulty: player (Name: {0}, {1}) tried to reset the instance while player is inside!", GetPlayer().GetName(), GetPlayer().GetGUID().ToString()); @@ -626,7 +626,7 @@ namespace Game } Group group = GetPlayer().GetGroup(); - if (group) + if (group != null) { if (!group.IsLeader(_player.GetGUID())) return; @@ -684,7 +684,7 @@ namespace Game // cannot reset while in an instance Map map = GetPlayer().GetMap(); - if (map && map.Instanceable()) + if (map != null && map.Instanceable()) { Log.outDebug(LogFilter.Network, "WorldSession:HandleSetRaidDifficulty: player (Name: {0}, {1} tried to reset the instance while inside!", GetPlayer().GetName(), GetPlayer().GetGUID().ToString()); @@ -692,7 +692,7 @@ namespace Game } Group group = GetPlayer().GetGroup(); - if (group) + if (group != null) { if (!group.IsLeader(_player.GetGUID())) return; @@ -732,7 +732,7 @@ namespace Game void HandleGuildSetFocusedAchievement(GuildSetFocusedAchievement setFocusedAchievement) { Guild guild = Global.GuildMgr.GetGuildById(GetPlayer().GetGuildId()); - if (guild) + if (guild != null) guild.GetAchievementMgr().SendAchievementInfo(GetPlayer(), setFocusedAchievement.AchievementID); } diff --git a/Source/Game/Handlers/MovementHandler.cs b/Source/Game/Handlers/MovementHandler.cs index 0185c2a89..7320adc42 100644 --- a/Source/Game/Handlers/MovementHandler.cs +++ b/Source/Game/Handlers/MovementHandler.cs @@ -59,7 +59,7 @@ namespace Game Unit mover = GetPlayer().GetUnitBeingMoved(); Player plrMover = mover.ToPlayer(); - if (plrMover && plrMover.IsBeingTeleported()) + if (plrMover != null && plrMover.IsBeingTeleported()) return; GetPlayer().ValidateMovementInfo(movementInfo); @@ -78,7 +78,7 @@ namespace Game return; // stop some emotes at player move - if (plrMover && (plrMover.GetEmoteState() != 0)) + if (plrMover != null && (plrMover.GetEmoteState() != 0)) plrMover.SetEmoteState(Emote.OneshotNone); //handle special cases @@ -95,7 +95,7 @@ namespace Game movementInfo.Pos.posZ + movementInfo.transport.pos.posZ, movementInfo.Pos.Orientation + movementInfo.transport.pos.Orientation)) return; - if (plrMover) + if (plrMover != null) { if (plrMover.GetTransport() == null) { @@ -124,14 +124,14 @@ namespace Game } } - if (mover.GetTransport() == null && !mover.GetVehicle()) + if (mover.GetTransport() == null && mover.GetVehicle() == null) movementInfo.transport.Reset(); } - else if (plrMover && plrMover.GetTransport() != null) // if we were on a transport, leave + else if (plrMover != null && plrMover.GetTransport() != null) // if we were on a transport, leave plrMover.GetTransport().RemovePassenger(plrMover); // fall damage generation (ignore in flight case that can be triggered also at lags in moment teleportation to another map). - if (opcode == ClientOpcodes.MoveFallLand && plrMover && !plrMover.IsInFlight()) + if (opcode == ClientOpcodes.MoveFallLand && plrMover != null && !plrMover.IsInFlight()) plrMover.HandleFall(movementInfo); // interrupt parachutes upon falling or landing in water @@ -147,7 +147,7 @@ namespace Game // Some vehicles allow the passenger to turn by himself Vehicle vehicle = mover.GetVehicle(); - if (vehicle) + if (vehicle != null) { VehicleSeatRecord seat = vehicle.GetSeatForPassenger(mover); if (seat != null) @@ -170,7 +170,7 @@ namespace Game moveUpdate.Status = mover.m_movementInfo; mover.SendMessageToSet(moveUpdate, GetPlayer()); - if (plrMover) // nothing is charmed, or player charmed + if (plrMover != null) // nothing is charmed, or player charmed { if (plrMover.IsSitState() && movementInfo.HasMovementFlag(MovementFlag.MaskMoving | MovementFlag.MaskTurning)) plrMover.SetStandState(UnitStandStateType.Stand); @@ -179,7 +179,7 @@ namespace Game if (movementInfo.Pos.posZ < plrMover.GetMap().GetMinHeight(plrMover.GetPhaseShift(), movementInfo.Pos.GetPositionX(), movementInfo.Pos.GetPositionY())) { - if (!(plrMover.GetBattleground() && plrMover.GetBattleground().HandlePlayerUnderMap(GetPlayer()))) + if (!(plrMover.GetBattleground() != null && plrMover.GetBattleground().HandlePlayerUnderMap(GetPlayer()))) { // NOTE: this is actually called many times while falling // even after the player has been teleported away @@ -261,7 +261,7 @@ namespace Game // while the player is in transit, for example the map may get full if (newMap == null || newMap.CannotEnter(player) != null) { - Log.outError(LogFilter.Network, $"Map {loc.GetMapId()} could not be created for {(newMap ? newMap.GetMapName() : "Unknown")} ({player.GetGUID()}), porting player to homebind"); + Log.outError(LogFilter.Network, $"Map {loc.GetMapId()} could not be created for {(newMap != null ? newMap.GetMapName() : "Unknown")} ({player.GetGUID()}), porting player to homebind"); player.TeleportTo(player.GetHomebind()); return; } @@ -291,7 +291,7 @@ namespace Game if (!player.GetMap().AddPlayerToMap(player, !seamlessTeleport)) { - Log.outError(LogFilter.Network, $"WORLD: failed to teleport player {player.GetName()} ({player.GetGUID()}) to map {loc.GetMapId()} ({(newMap ? newMap.GetMapName() : "Unknown")}) because of unknown reason!"); + Log.outError(LogFilter.Network, $"WORLD: failed to teleport player {player.GetName()} ({player.GetGUID()}) to map {loc.GetMapId()} ({(newMap != null ? newMap.GetMapName() : "Unknown")}) because of unknown reason!"); player.ResetMap(); player.SetMap(oldMap); player.TeleportTo(player.GetHomebind()); @@ -314,7 +314,7 @@ namespace Game else { Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) { if (player.IsInvitedForBattlegroundInstance(player.GetBattlegroundId())) bg.AddPlayer(player, player.m_bgData.queueId); @@ -443,7 +443,7 @@ namespace Game { Player plMover = GetPlayer().GetUnitBeingMoved().ToPlayer(); - if (!plMover || !plMover.IsBeingTeleportedNear()) + if (plMover == null || !plMover.IsBeingTeleportedNear()) return; if (packet.MoverGUID != plMover.GetGUID()) diff --git a/Source/Game/Handlers/NPCHandler.cs b/Source/Game/Handlers/NPCHandler.cs index 3066ae34e..9acd6151a 100644 --- a/Source/Game/Handlers/NPCHandler.cs +++ b/Source/Game/Handlers/NPCHandler.cs @@ -20,7 +20,7 @@ namespace Game void HandleTabardVendorActivate(Hello packet) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(packet.Unit, NPCFlags.TabardDesigner, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleTabardVendorActivateOpcode - {0} not found or you can not interact with him.", packet.Unit.ToString()); return; @@ -46,7 +46,7 @@ namespace Game void HandleTrainerList(Hello packet) { Creature npc = GetPlayer().GetNPCIfCanInteractWith(packet.Unit, NPCFlags.Trainer, NPCFlags2.None); - if (!npc) + if (npc == null) { Log.outDebug(LogFilter.Network, $"WorldSession.SendTrainerList - {packet.Unit} not found or you can not interact with him."); return; @@ -193,7 +193,7 @@ namespace Game if (GetPlayer().HasUnitState(UnitState.Died)) GetPlayer().RemoveAurasByType(AuraType.FeignDeath); - if ((unit && unit.GetScriptId() != unit.LastUsedScriptID) || (go != null && go.GetScriptId() != go.LastUsedScriptID)) + if ((unit != null && unit.GetScriptId() != unit.LastUsedScriptID) || (go != null && go.GetScriptId() != go.LastUsedScriptID)) { Log.outDebug(LogFilter.Network, "WORLD: HandleGossipSelectOption - Script reloaded while in use, ignoring and set new scipt id"); if (unit != null) @@ -236,7 +236,7 @@ namespace Game void HandleSpiritHealerActivate(SpiritHealerActivate packet) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(packet.Healer, NPCFlags.SpiritHealer, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleSpiritHealerActivateOpcode - {0} not found or you can not interact with him.", packet.Healer.ToString()); return; @@ -283,7 +283,7 @@ namespace Game return; Creature unit = GetPlayer().GetNPCIfCanInteractWith(packet.Unit, NPCFlags.Innkeeper, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleBinderActivate - {0} not found or you can not interact with him.", packet.Unit.ToString()); return; @@ -350,7 +350,7 @@ namespace Game void HandleRepairItem(RepairItem packet) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(packet.NpcGUID, NPCFlags.Repair, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleRepairItemOpcode - {0} not found or you can not interact with him.", packet.NpcGUID.ToString()); return; @@ -368,7 +368,7 @@ namespace Game Log.outDebug(LogFilter.Network, "ITEM: Repair {0}, at {1}", packet.ItemGUID.ToString(), packet.NpcGUID.ToString()); Item item = GetPlayer().GetItemByGuid(packet.ItemGUID); - if (item) + if (item != null) GetPlayer().DurabilityRepair(item.GetPos(), true, discountMod); } else diff --git a/Source/Game/Handlers/PetHandler.cs b/Source/Game/Handlers/PetHandler.cs index 916d437c9..07a8b4383 100644 --- a/Source/Game/Handlers/PetHandler.cs +++ b/Source/Game/Handlers/PetHandler.cs @@ -18,7 +18,7 @@ namespace Game void HandleDismissCritter(DismissCritter packet) { Unit pet = ObjectAccessor.GetCreatureOrPetOrVehicle(GetPlayer(), packet.CritterGUID); - if (!pet) + if (pet == null) { Log.outDebug(LogFilter.Network, "Critter {0} does not exist - player '{1}' ({2} / account: {3}) attempted to dismiss it (possibly lagged out)", packet.CritterGUID.ToString(), GetPlayer().GetName(), GetPlayer().GetGUID().ToString(), GetAccountId()); @@ -51,7 +51,7 @@ namespace Game // used also for charmed creature Unit pet = Global.ObjAccessor.GetUnit(GetPlayer(), guid1); - if (!pet) + if (pet == null) { Log.outError(LogFilter.Network, "HandlePetAction: {0} doesn't exist for {1}", guid1.ToString(), GetPlayer().GetGUID().ToString()); return; @@ -95,7 +95,7 @@ namespace Game void HandlePetStopAttack(PetStopAttack packet) { Unit pet = ObjectAccessor.GetCreatureOrPetOrVehicle(GetPlayer(), packet.PetGUID); - if (!pet) + if (pet == null) { Log.outError(LogFilter.Network, "HandlePetStopAttack: {0} does not exist", packet.PetGUID.ToString()); return; @@ -163,18 +163,18 @@ namespace Game // only place where pet can be player Unit TargetUnit = Global.ObjAccessor.GetUnit(GetPlayer(), guid2); - if (!TargetUnit) + if (TargetUnit == null) return; Unit owner = pet.GetOwner(); - if (owner) + if (owner != null) if (!owner.IsValidAttackTarget(TargetUnit)) return; // This is true if pet has no target or has target but targets differs. if (pet.GetVictim() != TargetUnit || !pet.GetCharmInfo().IsCommandAttack()) { - if (pet.GetVictim()) + if (pet.GetVictim() != null) pet.AttackStop(); if (!pet.IsTypeId(TypeId.Player) && pet.ToCreature().IsAIEnabled()) @@ -308,27 +308,27 @@ namespace Game if (result == SpellCastResult.UnitNotInfront && !pet.IsPossessed() && !pet.IsVehicle()) { Unit unit_target2 = spell.m_targets.GetUnitTarget(); - if (unit_target) + if (unit_target != null) { if (!pet.HasSpellFocus()) pet.SetInFront(unit_target); Player player = unit_target.ToPlayer(); - if (player) + if (player != null) pet.SendUpdateToPlayer(player); } - else if (unit_target2) + else if (unit_target2 != null) { if (!pet.HasSpellFocus()) pet.SetInFront(unit_target2); Player player = unit_target2.ToPlayer(); - if (player) + if (player != null) pet.SendUpdateToPlayer(player); } Unit powner = pet.GetCharmerOrOwner(); - if (powner) + if (powner != null) { Player player = powner.ToPlayer(); - if (player) + if (player != null) pet.SendUpdateToPlayer(player); } @@ -348,7 +348,7 @@ namespace Game pet.SendPetAIReaction(guid1); } - if (unit_target && !GetPlayer().IsFriendlyTo(unit_target) && !pet.IsPossessed() && !pet.IsVehicle()) + if (unit_target != null && !GetPlayer().IsFriendlyTo(unit_target) && !pet.IsPossessed() && !pet.IsVehicle()) { // This is true if pet has no target or has target but targets differs. if (pet.GetVictim() != unit_target) @@ -404,14 +404,14 @@ namespace Game response.UnitGUID = guid; Creature unit = ObjectAccessor.GetCreatureOrPetOrVehicle(GetPlayer(), guid); - if (unit) + if (unit != null) { response.Allow = true; response.Timestamp = unit.m_unitData.PetNameTimestamp; response.Name = unit.GetName(); Pet pet = unit.ToPet(); - if (pet) + if (pet != null) { DeclinedName names = pet.GetDeclinedNames(); if (names != null) @@ -439,7 +439,7 @@ namespace Game // stable master case else { - if (!GetPlayer().GetNPCIfCanInteractWith(guid, NPCFlags.StableMaster, NPCFlags2.None)) + if (GetPlayer().GetNPCIfCanInteractWith(guid, NPCFlags.StableMaster, NPCFlags2.None) == null) { Log.outDebug(LogFilter.Network, "Stablemaster {0} not found or you can't interact with him.", guid.ToString()); return false; @@ -453,7 +453,7 @@ namespace Game { ObjectGuid petguid = packet.PetGUID; Unit pet = Global.ObjAccessor.GetUnit(GetPlayer(), petguid); - if (!pet || pet != GetPlayer().GetFirstControlled()) + if (pet == null || pet != GetPlayer().GetFirstControlled()) { Log.outError(LogFilter.Network, "HandlePetSetAction: Unknown {0} or pet owner {1}", petguid.ToString(), GetPlayer().GetGUID().ToString()); return; @@ -528,7 +528,7 @@ namespace Game PetStable petStable = _player.GetPetStable(); Pet pet = ObjectAccessor.GetPet(GetPlayer(), petguid); // check it! - if (!pet || !pet.IsPet() || pet.ToPet().GetPetType() != PetType.Hunter || !pet.HasPetFlag(UnitPetFlags.CanBeRenamed) || + if (pet == null || !pet.IsPet() || pet.ToPet().GetPetType() != PetType.Hunter || !pet.HasPetFlag(UnitPetFlags.CanBeRenamed) || pet.GetOwnerGUID() != _player.GetGUID() || pet.GetCharmInfo() == null || petStable == null || petStable.GetCurrentPet() == null || petStable.GetCurrentPet().PetNumber != pet.GetCharmInfo().GetPetNumber()) return; @@ -587,7 +587,7 @@ namespace Game { // pet/charmed Creature pet = ObjectAccessor.GetCreatureOrPetOrVehicle(GetPlayer(), packet.Pet); - if (pet && pet.ToPet() && pet.ToPet().GetPetType() == PetType.Hunter) + if (pet != null && pet.ToPet() != null && pet.ToPet().GetPetType() == PetType.Hunter) { _player.RemovePet((Pet)pet, PetSaveMode.AsDeleted); } @@ -597,7 +597,7 @@ namespace Game void HandlePetSpellAutocast(PetSpellAutocast packet) { Creature pet = ObjectAccessor.GetCreatureOrPetOrVehicle(GetPlayer(), packet.PetGUID); - if (!pet) + if (pet == null) { Log.outError(LogFilter.Network, "WorldSession.HandlePetSpellAutocast: {0} not found.", packet.PetGUID.ToString()); return; @@ -648,7 +648,7 @@ namespace Game void HandlePetCastSpell(PetCastSpell petCastSpell) { Unit caster = Global.ObjAccessor.GetUnit(GetPlayer(), petCastSpell.PetGUID); - if (!caster) + if (caster == null) { Log.outError(LogFilter.Network, "WorldSession.HandlePetCastSpell: Caster {0} not found.", petCastSpell.PetGUID.ToString()); return; @@ -702,10 +702,10 @@ namespace Game if (result == SpellCastResult.SpellCastOk) { Creature creature = caster.ToCreature(); - if (creature) + if (creature != null) { Pet pet = creature.ToPet(); - if (pet) + if (pet != null) { // 10% chance to play special pet attack talk, else growl // actually this only seems to happen on special spells, fire shield for imp, torment for voidwalker, but it's stupid to check every spell @@ -752,7 +752,7 @@ namespace Game // Handle the packet CMSG_REQUEST_PET_INFO - sent when player does ingame /reload command // Packet sent when player has a pet - if (_player.GetPet()) + if (_player.GetPet() != null) _player.PetSpellInitialize(); else { diff --git a/Source/Game/Handlers/PetitionsHandler.cs b/Source/Game/Handlers/PetitionsHandler.cs index 263507519..59cd9e913 100644 --- a/Source/Game/Handlers/PetitionsHandler.cs +++ b/Source/Game/Handlers/PetitionsHandler.cs @@ -18,7 +18,7 @@ namespace Game { // prevent cheating Creature creature = GetPlayer().GetNPCIfCanInteractWith(packet.Unit, NPCFlags.Petitioner, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, "WORLD: HandlePetitionBuyOpcode - {0} not found or you can't interact with him.", packet.Unit.ToString()); return; @@ -35,7 +35,7 @@ namespace Game if (GetPlayer().GetGuildId() != 0) return; - if (Global.GuildMgr.GetGuildByName(packet.Title)) + if (Global.GuildMgr.GetGuildByName(packet.Title) != null) { Guild.SendCommandResult(this, GuildCommandType.CreateGuild, GuildCommandError.NameExists_S, packet.Title); return; @@ -70,7 +70,7 @@ namespace Game GetPlayer().ModifyMoney(-cost); Item charter = GetPlayer().StoreNewItem(dest, charterItemID, true); - if (!charter) + if (charter == null) return; charter.SetPetitionId((uint)charter.GetGUID().GetCounter()); @@ -167,7 +167,7 @@ namespace Game void HandlePetitionRenameGuild(PetitionRenameGuild packet) { Item item = GetPlayer().GetItemByGuid(packet.PetitionGuid); - if (!item) + if (item == null) return; Petition petition = Global.PetitionMgr.GetPetition(packet.PetitionGuid); @@ -177,7 +177,7 @@ namespace Game return; } - if (Global.GuildMgr.GetGuildByName(packet.NewGuildName)) + if (Global.GuildMgr.GetGuildByName(packet.NewGuildName) != null) { Guild.SendCommandResult(this, GuildCommandType.CreateGuild, GuildCommandError.NameExists_S, packet.NewGuildName); return; @@ -274,7 +274,7 @@ namespace Game // update for owner if online Player owner1 = Global.ObjAccessor.FindPlayer(ownerGuid); - if (owner1) + if (owner1 != null) owner1.SendPacket(signResult); } @@ -302,7 +302,7 @@ namespace Game void HandleOfferPetition(OfferPetition packet) { Player player = Global.ObjAccessor.FindConnectedPlayer(packet.TargetPlayer); - if (!player) + if (player == null) return; Petition petition = Global.PetitionMgr.GetPetition(packet.ItemGUID); @@ -335,7 +335,7 @@ namespace Game { // Check if player really has the required petition charter Item item = GetPlayer().GetItemByGuid(packet.Item); - if (!item) + if (item == null) return; Petition petition = Global.PetitionMgr.GetPetition(packet.Item); @@ -362,7 +362,7 @@ namespace Game } // Check if guild name is already taken - if (Global.GuildMgr.GetGuildByName(name)) + if (Global.GuildMgr.GetGuildByName(name) != null) { Guild.SendCommandResult(this, GuildCommandType.CreateGuild, GuildCommandError.NameExists_S, name); return; @@ -419,7 +419,7 @@ namespace Game public void SendPetitionShowList(ObjectGuid guid) { Creature creature = GetPlayer().GetNPCIfCanInteractWith(guid, NPCFlags.Petitioner, NPCFlags2.None); - if (!creature) + if (creature == null) { Log.outDebug(LogFilter.Network, "WORLD: HandlePetitionShowListOpcode - {0} not found or you can't interact with him.", guid.ToString()); return; diff --git a/Source/Game/Handlers/QueryHandler.cs b/Source/Game/Handlers/QueryHandler.cs index 5b21b912a..a837e4f71 100644 --- a/Source/Game/Handlers/QueryHandler.cs +++ b/Source/Game/Handlers/QueryHandler.cs @@ -187,7 +187,7 @@ namespace Game { CorpseLocation packet = new(); Player player = Global.ObjAccessor.FindConnectedPlayer(queryCorpseLocation.Player); - if (!player || !player.HasCorpse() || !_player.IsInSameRaidWith(player)) + if (player == null || !player.HasCorpse() || !_player.IsInSameRaidWith(player)) { packet.Valid = false; // corpse not found packet.Player = queryCorpseLocation.Player; @@ -240,10 +240,10 @@ namespace Game response.Player = queryCorpseTransport.Player; Player player = Global.ObjAccessor.FindConnectedPlayer(queryCorpseTransport.Player); - if (player) + if (player != null) { Corpse corpse = player.GetCorpse(); - if (_player.IsInSameRaidWith(player) && corpse && !corpse.GetTransGUID().IsEmpty() && corpse.GetTransGUID() == queryCorpseTransport.Transport) + if (_player.IsInSameRaidWith(player) && corpse != null && !corpse.GetTransGUID().IsEmpty() && corpse.GetTransGUID() == queryCorpseTransport.Transport) { response.Position = new Vector3(corpse.GetTransOffsetX(), corpse.GetTransOffsetY(), corpse.GetTransOffsetZ()); response.Facing = corpse.GetTransOffsetO(); @@ -315,7 +315,7 @@ namespace Game queryItemTextResponse.Id = packet.Id; Item item = GetPlayer().GetItemByGuid(packet.Id); - if (item) + if (item != null) { queryItemTextResponse.Valid = true; queryItemTextResponse.Text = item.GetText(); diff --git a/Source/Game/Handlers/QuestHandler.cs b/Source/Game/Handlers/QuestHandler.cs index e20476107..df5145d2f 100644 --- a/Source/Game/Handlers/QuestHandler.cs +++ b/Source/Game/Handlers/QuestHandler.cs @@ -20,7 +20,7 @@ namespace Game QuestGiverStatus questStatus = QuestGiverStatus.None; var questgiver = Global.ObjAccessor.GetObjectByTypeMask(GetPlayer(), packet.QuestGiverGUID, TypeMask.Unit | TypeMask.GameObject); - if (!questgiver) + if (questgiver == null) { Log.outInfo(LogFilter.Network, "Error in CMSG_QUESTGIVER_STATUS_QUERY, called for non-existing questgiver {0}", packet.QuestGiverGUID.ToString()); return; @@ -95,7 +95,7 @@ namespace Game } Player playerQuestObject = obj.ToPlayer(); - if (playerQuestObject) + if (playerQuestObject != null) { if ((_player.GetPlayerSharingQuest().IsEmpty() && _player.GetPlayerSharingQuest() != packet.QuestGiverGUID) || !playerQuestObject.CanShareQuest(packet.QuestID)) { @@ -151,13 +151,13 @@ namespace Game if (quest.IsPushedToPartyOnAccept()) { var group = _player.GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); - if (!player || player == _player || !player.IsInMap(_player)) // not self and in same map + if (player == null || player == _player || !player.IsInMap(_player)) // not self and in same map continue; if (player.CanTakeQuest(quest, true)) @@ -207,7 +207,7 @@ namespace Game { // Verify that the guid is valid and is a questgiver or involved in the requested quest var obj = Global.ObjAccessor.GetObjectByTypeMask(GetPlayer(), packet.QuestGiverGUID, (TypeMask.Unit | TypeMask.GameObject | TypeMask.Item)); - if (!obj || (!obj.HasQuest(packet.QuestID) && !obj.HasInvolvedQuest(packet.QuestID))) + if (obj == null || (!obj.HasQuest(packet.QuestID) && !obj.HasInvolvedQuest(packet.QuestID))) { GetPlayer().PlayerTalkClass.SendCloseGossip(); return; @@ -342,7 +342,7 @@ namespace Game if (!quest.HasFlag(QuestFlags.AutoComplete)) { obj = Global.ObjAccessor.GetObjectByTypeMask(GetPlayer(), packet.QuestGiverGUID, TypeMask.Unit | TypeMask.GameObject); - if (!obj || !obj.HasInvolvedQuest(packet.QuestID)) + if (obj == null || !obj.HasInvolvedQuest(packet.QuestID)) return; // some kind of WPE protection @@ -499,7 +499,7 @@ namespace Game else obj = Global.ObjAccessor.GetObjectByTypeMask(GetPlayer(), packet.QuestGiverGUID, TypeMask.Unit | TypeMask.GameObject); - if (!obj) + if (obj == null) return; if (!quest.HasFlag(QuestFlags.AutoComplete)) @@ -577,7 +577,7 @@ namespace Game } Group group = sender.GetGroup(); - if (!group) + if (group == null) { sender.SendPushToPartyResponse(sender, QuestPushReason.NotInParty); return; @@ -587,7 +587,7 @@ namespace Game { Player receiver = refe.GetSource(); - if (!receiver || receiver == sender) + if (receiver == null || receiver == sender) continue; if (!receiver.GetPlayerSharingQuest().IsEmpty()) @@ -718,7 +718,7 @@ namespace Game if (_player.GetPlayerSharingQuest() == packet.SenderGUID) { Player player = Global.ObjAccessor.FindPlayer(_player.GetPlayerSharingQuest()); - if (player) + if (player != null) player.SendPushToPartyResponse(_player, packet.Result); } diff --git a/Source/Game/Handlers/SocialHandler.cs b/Source/Game/Handlers/SocialHandler.cs index 0a5dea490..3ea00eddc 100644 --- a/Source/Game/Handlers/SocialHandler.cs +++ b/Source/Game/Handlers/SocialHandler.cs @@ -163,7 +163,7 @@ namespace Game } Player player = Global.ObjAccessor.FindPlayerByName(packet.CharName); - if (!player) + if (player == null) { SendNotification(CypherStrings.PlayerNotExistOrOffline, packet.CharName); return; diff --git a/Source/Game/Handlers/SpellHandler.cs b/Source/Game/Handlers/SpellHandler.cs index edb8db25a..da1224776 100644 --- a/Source/Game/Handlers/SpellHandler.cs +++ b/Source/Game/Handlers/SpellHandler.cs @@ -130,7 +130,7 @@ namespace Game } Item item = player.GetItemByPos(packet.Slot, packet.PackSlot); - if (!item) + if (item == null) { player.SendEquipError(InventoryResult.ItemNotFound); return; @@ -207,11 +207,11 @@ namespace Game void HandleOpenWrappedItemCallback(ushort pos, ObjectGuid itemGuid, SQLResult result) { - if (!GetPlayer()) + if (GetPlayer() == null) return; Item item = GetPlayer().GetItemByPos(pos); - if (!item) + if (item == null) return; if (item.GetGUID() != itemGuid || !item.IsWrapped()) // during getting result, gift was swapped with another item @@ -248,7 +248,7 @@ namespace Game void HandleGameObjectUse(GameObjUse packet) { GameObject obj = GetPlayer().GetGameObjectIfCanInteractWith(packet.Guid); - if (obj) + if (obj != null) { // ignore for remote control state if (GetPlayer().GetUnitBeingMoved() != GetPlayer()) @@ -267,7 +267,7 @@ namespace Game return; GameObject go = GetPlayer().GetGameObjectIfCanInteractWith(packet.Guid); - if (go) + if (go != null) { if (go.GetAI().OnGossipHello(GetPlayer())) return; @@ -571,7 +571,7 @@ namespace Game // Get unit for which data is needed by client Unit unit = Global.ObjAccessor.GetUnit(GetPlayer(), guid); - if (!unit) + if (unit == null) return; if (!unit.HasAuraType(AuraType.CloneCaster)) @@ -579,11 +579,11 @@ namespace Game // Get creator of the unit (SPELL_AURA_CLONE_CASTER does not stack) Unit creator = unit.GetAuraEffectsByType(AuraType.CloneCaster).FirstOrDefault().GetCaster(); - if (!creator) + if (creator == null) return; Player player = creator.ToPlayer(); - if (player) + if (player != null) { MirrorImageComponentedData mirrorImageComponentedData = new(); mirrorImageComponentedData.UnitGUID = guid; @@ -601,7 +601,7 @@ namespace Game } Guild guild = player.GetGuild(); - mirrorImageComponentedData.GuildGUID = (guild ? guild.GetGUID() : ObjectGuid.Empty); + mirrorImageComponentedData.GuildGUID = (guild != null ? guild.GetGUID() : ObjectGuid.Empty); byte[] itemSlots = { @@ -671,7 +671,7 @@ namespace Game void HandleUpdateMissileTrajectory(UpdateMissileTrajectory packet) { Unit caster = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Guid); - Spell spell = caster ? caster.GetCurrentSpell(CurrentSpellTypes.Generic) : null; + Spell spell = caster != null ? caster.GetCurrentSpell(CurrentSpellTypes.Generic) : null; if (spell == null || spell.m_spellInfo.Id != packet.SpellID || spell.m_castId != packet.CastID || !spell.m_targets.HasDst() || !spell.m_targets.HasSrc()) return; diff --git a/Source/Game/Handlers/TaxiHandler.cs b/Source/Game/Handlers/TaxiHandler.cs index a2c0f0a5c..789a9247e 100644 --- a/Source/Game/Handlers/TaxiHandler.cs +++ b/Source/Game/Handlers/TaxiHandler.cs @@ -18,7 +18,7 @@ namespace Game void HandleEnableTaxiNodeOpcode(EnableTaxiNode enableTaxiNode) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(enableTaxiNode.Unit, NPCFlags.FlightMaster, NPCFlags2.None); - if (unit) + if (unit != null) SendLearnNewTaxiNode(unit); } @@ -33,7 +33,7 @@ namespace Game // cheating checks Player player = GetPlayer(); Creature unit = ObjectAccessor.GetCreature(player, guid); - if (!unit || unit.IsHostileTo(player) || !unit.HasNpcFlag(NPCFlags.FlightMaster)) + if (unit == null || unit.IsHostileTo(player) || !unit.HasNpcFlag(NPCFlags.FlightMaster)) { Log.outDebug(LogFilter.Network, "WorldSession.SendTaxiStatus - {0} not found.", guid.ToString()); return; diff --git a/Source/Game/Handlers/ToyHandler.cs b/Source/Game/Handlers/ToyHandler.cs index f52425887..3b4b8e73e 100644 --- a/Source/Game/Handlers/ToyHandler.cs +++ b/Source/Game/Handlers/ToyHandler.cs @@ -18,7 +18,7 @@ namespace Game return; Item item = _player.GetItemByGuid(packet.Guid); - if (!item) + if (item == null) { _player.SendEquipError(InventoryResult.ItemNotFound); return; diff --git a/Source/Game/Handlers/TradeHandler.cs b/Source/Game/Handlers/TradeHandler.cs index f68f808b9..e3f4132fd 100644 --- a/Source/Game/Handlers/TradeHandler.cs +++ b/Source/Game/Handlers/TradeHandler.cs @@ -17,7 +17,7 @@ namespace Game { info.Clear(); // reuse packet Player trader = GetPlayer().GetTrader(); - info.PartnerIsSameBnetAccount = trader && trader.GetSession().GetBattlenetAccountId() == GetBattlenetAccountId(); + info.PartnerIsSameBnetAccount = trader != null && trader.GetSession().GetBattlenetAccountId() == GetBattlenetAccountId(); SendPacket(info); } @@ -41,7 +41,7 @@ namespace Game for (byte i = 0; i < (byte)TradeSlots.Count; ++i) { Item item = view_trade.GetItem((TradeSlots)i); - if (item) + if (item != null) { TradeUpdated.TradeItem tradeItem = new(); tradeItem.Slot = i; @@ -84,7 +84,7 @@ namespace Game void MoveItems(Item[] myItems, Item[] hisItems) { Player trader = GetPlayer().GetTrader(); - if (!trader) + if (trader == null) return; for (byte i = 0; i < (int)TradeSlots.TradedCount; ++i) @@ -98,7 +98,7 @@ namespace Game // Ok, if trade item exists and can be stored // If we trade in both directions we had to check, if the trade will work before we actually do it // A roll back is not possible after we stored it - if (myItems[i]) + if (myItems[i] != null) { // logging Log.outDebug(LogFilter.Network, "partner storing: {0}", myItems[i].GetGUID().ToString()); @@ -116,7 +116,7 @@ namespace Game // store trader.MoveItemToInventory(traderDst, myItems[i], true, true); } - if (hisItems[i]) + if (hisItems[i] != null) { // logging Log.outDebug(LogFilter.Network, "player storing: {0}", hisItems[i].GetGUID().ToString()); @@ -140,7 +140,7 @@ namespace Game { // in case of fatal error log error message // return the already removed items to the original owner - if (myItems[i]) + if (myItems[i] != null) { if (!traderCanTrade) Log.outError(LogFilter.Network, "trader can't store item: {0}", myItems[i].GetGUID().ToString()); @@ -150,7 +150,7 @@ namespace Game Log.outError(LogFilter.Network, "player can't take item back: {0}", myItems[i].GetGUID().ToString()); } // return the already removed items to the original owner - if (hisItems[i]) + if (hisItems[i] != null) { if (!playerCanTrade) Log.outError(LogFilter.Network, "player can't store item: {0}", hisItems[i].GetGUID().ToString()); @@ -172,7 +172,7 @@ namespace Game for (byte i = 0; i < (int)TradeSlots.Count; ++i) { Item item = myTrade.GetItem((TradeSlots)i); - if (item) + if (item != null) { Log.outDebug(LogFilter.Network, "player trade item {0} bag: {1} slot: {2}", item.GetGUID().ToString(), item.GetBagSlot(), item.GetSlot()); //Can return null @@ -180,7 +180,7 @@ namespace Game myItems[i].SetInTrade(); } item = hisTrade.GetItem((TradeSlots)i); - if (item) + if (item != null) { Log.outDebug(LogFilter.Network, "partner trade item {0} bag: {1} slot: {2}", item.GetGUID().ToString(), item.GetBagSlot(), item.GetSlot()); hisItems[i] = item; @@ -200,9 +200,9 @@ namespace Game // clear 'in-trade' flag for (byte i = 0; i < (int)TradeSlots.Count; ++i) { - if (myItems[i]) + if (myItems[i] != null) myItems[i].SetInTrade(false); - if (hisItems[i]) + if (hisItems[i] != null) hisItems[i].SetInTrade(false); } } @@ -285,7 +285,7 @@ namespace Game for (byte i = 0; i < (byte)TradeSlots.Count; ++i) { Item item = my_trade.GetItem((TradeSlots)i); - if (item) + if (item != null) { if (!item.CanBeTraded(false, true)) { @@ -303,7 +303,7 @@ namespace Game } } item = his_trade.GetItem((TradeSlots)i); - if (item) + if (item != null) { if (!item.CanBeTraded(false, true)) { @@ -331,8 +331,8 @@ namespace Game SpellInfo spellEntry = Global.SpellMgr.GetSpellInfo(my_spell_id, _player.GetMap().GetDifficultyID()); Item castItem = my_trade.GetSpellCastItem(); - if (spellEntry == null || !his_trade.GetItem(TradeSlots.NonTraded) || - (my_trade.HasSpellCastItem() && !castItem)) + if (spellEntry == null || his_trade.GetItem(TradeSlots.NonTraded) == null || + (my_trade.HasSpellCastItem() && castItem == null)) { ClearAcceptTradeMode(my_trade, his_trade); ClearAcceptTradeMode(myItems, hisItems); @@ -367,7 +367,7 @@ namespace Game SpellInfo spellEntry = Global.SpellMgr.GetSpellInfo(his_spell_id, trader.GetMap().GetDifficultyID()); Item castItem = his_trade.GetSpellCastItem(); - if (spellEntry == null || !my_trade.GetItem(TradeSlots.NonTraded) || (his_trade.HasSpellCastItem() && !castItem)) + if (spellEntry == null || my_trade.GetItem(TradeSlots.NonTraded) == null || (his_trade.HasSpellCastItem() && castItem == null)) { his_trade.SetSpell(0); @@ -438,12 +438,12 @@ namespace Game // execute trade: 1. remove for (byte i = 0; i < (int)TradeSlots.TradedCount; ++i) { - if (myItems[i]) + if (myItems[i] != null) { myItems[i].SetGiftCreator(GetPlayer().GetGUID()); GetPlayer().MoveItemFromInventory(myItems[i].GetBagSlot(), myItems[i].GetSlot(), true); } - if (hisItems[i]) + if (hisItems[i] != null) { hisItems[i].SetGiftCreator(trader.GetGUID()); trader.MoveItemFromInventory(hisItems[i].GetBagSlot(), hisItems[i].GetSlot(), true); @@ -540,7 +540,7 @@ namespace Game void HandleCancelTrade(CancelTrade cancelTrade) { // sent also after LOGOUT COMPLETE - if (GetPlayer()) // needed because STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT + if (GetPlayer() != null) // needed because STATUS_LOGGEDIN_OR_RECENTLY_LOGGOUT GetPlayer().TradeCancel(true); } @@ -589,7 +589,7 @@ namespace Game Player pOther = Global.ObjAccessor.FindPlayer(initiateTrade.Guid); - if (!pOther) + if (pOther == null) { info.Status = TradeStatus.NoTarget; SendTradeStatus(info); @@ -702,7 +702,7 @@ namespace Game // check cheating, can't fail with correct client operations Item item = GetPlayer().GetItemByPos(setTradeItem.PackSlot, setTradeItem.ItemSlotInPack); - if (!item || (setTradeItem.TradeSlot != (byte)TradeSlots.NonTraded && !item.CanBeTraded(false, true))) + if (item == null || (setTradeItem.TradeSlot != (byte)TradeSlots.NonTraded && !item.CanBeTraded(false, true))) { info.Status = TradeStatus.Cancelled; SendTradeStatus(info); diff --git a/Source/Game/Handlers/TraitHandler.cs b/Source/Game/Handlers/TraitHandler.cs index dc5ae73c9..0f65f3928 100644 --- a/Source/Game/Handlers/TraitHandler.cs +++ b/Source/Game/Handlers/TraitHandler.cs @@ -31,7 +31,7 @@ namespace Game return; } - if (_player.GetBattleground() && _player.GetBattleground().GetStatus() == BattlegroundStatus.InProgress) + if (_player.GetBattleground() != null && _player.GetBattleground().GetStatus() == BattlegroundStatus.InProgress) { SendPacket(new TraitConfigCommitFailed(configId, 0, (int)TalentLearnResult.InPvpMatch)); return; diff --git a/Source/Game/Handlers/TransmogrificationHandler.cs b/Source/Game/Handlers/TransmogrificationHandler.cs index 27a685cb2..efe97c905 100644 --- a/Source/Game/Handlers/TransmogrificationHandler.cs +++ b/Source/Game/Handlers/TransmogrificationHandler.cs @@ -19,7 +19,7 @@ namespace Game Player player = GetPlayer(); // Validate - if (!player.GetNPCIfCanInteractWith(transmogrifyItems.Npc, NPCFlags.Transmogrifier, NPCFlags2.None)) + if (player.GetNPCIfCanInteractWith(transmogrifyItems.Npc, NPCFlags.Transmogrifier, NPCFlags2.None) == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleTransmogrifyItems - Unit (GUID: {0}) not found or player can't interact with it.", transmogrifyItems.ToString()); return; @@ -94,7 +94,7 @@ namespace Game // transmogrified item Item itemTransmogrified = player.GetItemByPos(InventorySlots.Bag0, (byte)transmogItem.Slot); - if (!itemTransmogrified) + if (itemTransmogrified == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleTransmogrifyItems - Player (GUID: {0}, name: {1}) tried to transmogrify an invalid item in a valid slot (slot: {2}).", player.GetGUID().ToString(), player.GetName(), transmogItem.Slot); return; @@ -316,7 +316,7 @@ namespace Game foreach (ObjectGuid itemGuid in itemsProvidingAppearance) { Item item = player.GetItemByGuid(itemGuid); - if (item) + if (item != null) { item.SetNotRefundable(player); item.ClearSoulboundTradeable(player); diff --git a/Source/Game/Handlers/VehicleHandler.cs b/Source/Game/Handlers/VehicleHandler.cs index 06da9d511..30cbdeeb0 100644 --- a/Source/Game/Handlers/VehicleHandler.cs +++ b/Source/Game/Handlers/VehicleHandler.cs @@ -28,7 +28,7 @@ namespace Game void HandleRequestVehiclePrevSeat(RequestVehiclePrevSeat packet) { Unit vehicle_base = GetPlayer().GetVehicleBase(); - if (!vehicle_base) + if (vehicle_base == null) return; VehicleSeatRecord seat = GetPlayer().GetVehicle().GetSeatForPassenger(GetPlayer()); @@ -46,7 +46,7 @@ namespace Game void HandleRequestVehicleNextSeat(RequestVehicleNextSeat packet) { Unit vehicle_base = GetPlayer().GetVehicleBase(); - if (!vehicle_base) + if (vehicle_base == null) return; VehicleSeatRecord seat = GetPlayer().GetVehicle().GetSeatForPassenger(GetPlayer()); @@ -64,7 +64,7 @@ namespace Game void HandleMoveChangeVehicleSeats(MoveChangeVehicleSeats packet) { Unit vehicle_base = GetPlayer().GetVehicleBase(); - if (!vehicle_base) + if (vehicle_base == null) return; VehicleSeatRecord seat = GetPlayer().GetVehicle().GetSeatForPassenger(GetPlayer()); @@ -87,12 +87,12 @@ namespace Game else { Unit vehUnit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.DstVehicle); - if (vehUnit) + if (vehUnit != null) { Vehicle vehicle = vehUnit.GetVehicleKit(); - if (vehicle) - if (vehicle.HasEmptySeat((sbyte) packet.DstSeatIndex)) - vehUnit.HandleSpellClick(GetPlayer(), (sbyte) packet.DstSeatIndex); + if (vehicle != null) + if (vehicle.HasEmptySeat((sbyte)packet.DstSeatIndex)) + vehUnit.HandleSpellClick(GetPlayer(), (sbyte)packet.DstSeatIndex); } } } @@ -101,7 +101,7 @@ namespace Game void HandleRequestVehicleSwitchSeat(RequestVehicleSwitchSeat packet) { Unit vehicle_base = GetPlayer().GetVehicleBase(); - if (!vehicle_base) + if (vehicle_base == null) return; VehicleSeatRecord seat = GetPlayer().GetVehicle().GetSeatForPassenger(GetPlayer()); @@ -117,12 +117,12 @@ namespace Game else { Unit vehUnit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Vehicle); - if (vehUnit) + if (vehUnit != null) { Vehicle vehicle = vehUnit.GetVehicleKit(); - if (vehicle) - if (vehicle.HasEmptySeat((sbyte) packet.SeatIndex)) - vehUnit.HandleSpellClick(GetPlayer(), (sbyte) packet.SeatIndex); + if (vehicle != null) + if (vehicle.HasEmptySeat((sbyte)packet.SeatIndex)) + vehUnit.HandleSpellClick(GetPlayer(), (sbyte)packet.SeatIndex); } } } @@ -131,16 +131,16 @@ namespace Game void HandleRideVehicleInteract(RideVehicleInteract packet) { Player player = Global.ObjAccessor.GetPlayer(_player, packet.Vehicle); - if (player) + if (player != null) { - if (!player.GetVehicleKit()) + if (player.GetVehicleKit() == null) return; if (!player.IsInRaidWith(GetPlayer())) return; if (!player.IsWithinDistInMap(GetPlayer(), SharedConst.InteractionDistance)) return; // Dont' allow players to enter player vehicle on arena - if (!_player.GetMap() || _player.GetMap().IsBattleArena()) + if (_player.GetMap() == null || _player.GetMap().IsBattleArena()) return; GetPlayer().EnterVehicle(player); @@ -151,7 +151,7 @@ namespace Game void HandleEjectPassenger(EjectPassenger packet) { Vehicle vehicle = GetPlayer().GetVehicleKit(); - if (!vehicle) + if (vehicle == null) { Log.outError(LogFilter.Network, "HandleEjectPassenger: {0} is not in a vehicle!", GetPlayer().GetGUID().ToString()); return; @@ -160,7 +160,7 @@ namespace Game if (packet.Passenger.IsUnit()) { Unit unit = Global.ObjAccessor.GetUnit(GetPlayer(), packet.Passenger); - if (!unit) + if (unit == null) { Log.outError(LogFilter.Network, "{0} tried to eject {1} from vehicle, but the latter was not found in world!", GetPlayer().GetGUID().ToString(), packet.Passenger.ToString()); return; @@ -188,7 +188,7 @@ namespace Game void HandleRequestVehicleExit(RequestVehicleExit packet) { Vehicle vehicle = GetPlayer().GetVehicle(); - if (vehicle) + if (vehicle != null) { VehicleSeatRecord seat = vehicle.GetSeatForPassenger(GetPlayer()); if (seat != null) diff --git a/Source/Game/Handlers/VoidStorageHandler.cs b/Source/Game/Handlers/VoidStorageHandler.cs index ecfac9219..b643896b9 100644 --- a/Source/Game/Handlers/VoidStorageHandler.cs +++ b/Source/Game/Handlers/VoidStorageHandler.cs @@ -20,7 +20,7 @@ namespace Game void HandleVoidStorageUnlock(UnlockVoidStorage unlockVoidStorage) { Creature unit = GetPlayer().GetNPCIfCanInteractWith(unlockVoidStorage.Npc, NPCFlags.VaultKeeper, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleVoidStorageUnlock - {0} not found or player can't interact with it.", unlockVoidStorage.Npc.ToString()); return; @@ -42,7 +42,7 @@ namespace Game Player player = GetPlayer(); Creature unit = player.GetNPCIfCanInteractWith(queryVoidStorage.Npc, NPCFlags.Transmogrifier | NPCFlags.VaultKeeper, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleVoidStorageQuery - {0} not found or player can't interact with it.", queryVoidStorage.Npc.ToString()); SendPacket(new VoidStorageFailed()); @@ -81,7 +81,7 @@ namespace Game Player player = GetPlayer(); Creature unit = player.GetNPCIfCanInteractWith(voidStorageTransfer.Npc, NPCFlags.VaultKeeper, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleVoidStorageTransfer - {0} not found or player can't interact with it.", voidStorageTransfer.Npc.ToString()); return; @@ -106,13 +106,13 @@ namespace Game for (byte i = InventorySlots.BagStart; i < InventorySlots.BagEnd; i++) { Bag bag = player.GetBagByPos(i); - if (bag) + if (bag != null) freeBagSlots += bag.GetFreeSlots(); } int inventoryEnd = InventorySlots.ItemStart + _player.GetInventorySlotCount(); for (byte i = InventorySlots.ItemStart; i < inventoryEnd; i++) { - if (!player.GetItemByPos(InventorySlots.Bag0, i)) + if (player.GetItemByPos(InventorySlots.Bag0, i) == null) ++freeBagSlots; } } @@ -135,7 +135,7 @@ namespace Game for (int i = 0; i < voidStorageTransfer.Deposits.Length; ++i) { Item item = player.GetItemByGuid(voidStorageTransfer.Deposits[i]); - if (!item) + if (item == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleVoidStorageTransfer - {0} {1} wants to deposit an invalid item ({2}).", player.GetGUID().ToString(), player.GetName(), voidStorageTransfer.Deposits[i].ToString()); continue; @@ -200,7 +200,7 @@ namespace Game Player player = GetPlayer(); Creature unit = player.GetNPCIfCanInteractWith(swapVoidItem.Npc, NPCFlags.VaultKeeper, NPCFlags2.None); - if (!unit) + if (unit == null) { Log.outDebug(LogFilter.Network, "WORLD: HandleVoidSwapItem - {0} not found or player can't interact with it.", swapVoidItem.Npc.ToString()); return; diff --git a/Source/Game/Loot/Loot.cs b/Source/Game/Loot/Loot.cs index e9c62b8e0..a0ca6437f 100644 --- a/Source/Game/Loot/Loot.cs +++ b/Source/Game/Loot/Loot.cs @@ -246,7 +246,7 @@ namespace Game.Loots continue; Player player = Global.ObjAccessor.GetPlayer(m_map, playerGuid); - if (!player) + if (player == null) continue; player.RemoveLootRoll(this); @@ -441,7 +441,7 @@ namespace Game.Loots foreach (ObjectGuid allowedLooter in m_lootItem.GetAllowedLooters()) { Player plr = Global.ObjAccessor.GetPlayer(m_map, allowedLooter); - if (!plr || !m_lootItem.HasAllowedLooter(plr.GetGUID())) // check if player meet the condition to be able to roll this item + if (plr == null || !m_lootItem.HasAllowedLooter(plr.GetGUID())) // check if player meet the condition to be able to roll this item { m_rollVoteMap[allowedLooter].Vote = RollVote.NotValid; continue; @@ -650,7 +650,7 @@ namespace Game.Loots public Loot(Map map, ObjectGuid owner, LootType type, Group group) { loot_type = type; - _guid = map ? ObjectGuid.Create(HighGuid.LootObject, map.GetId(), 0, map.GenerateLowGuid(HighGuid.LootObject)) : ObjectGuid.Empty; + _guid = map != null ? ObjectGuid.Create(HighGuid.LootObject, map.GetId(), 0, map.GenerateLowGuid(HighGuid.LootObject)) : ObjectGuid.Empty; _owner = owner; _itemContext = ItemContext.None; _lootMethod = group != null ? group.GetLootMethod() : LootMethod.FreeForAll; @@ -771,7 +771,7 @@ namespace Game.Loots for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player player = refe.GetSource(); - if (player) // should actually be looted object instead of lootOwner but looter has to be really close so doesnt really matter + if (player != null) // should actually be looted object instead of lootOwner but looter has to be really close so doesnt really matter if (player.IsAtGroupRewardDistance(lootOwner)) FillNotNormalLootFor(player); } @@ -860,7 +860,7 @@ namespace Game.Loots continue; Player player = Global.ObjAccessor.GetPlayer(map, PlayersLooting[i]); - if (player) + if (player != null) player.SendNotifyLootItemRemoved(GetGUID(), GetOwnerGUID(), lootListId); else PlayersLooting.RemoveAt(i); diff --git a/Source/Game/Loot/LootManager.cs b/Source/Game/Loot/LootManager.cs index bfcc5e492..0ca18fa56 100644 --- a/Source/Game/Loot/LootManager.cs +++ b/Source/Game/Loot/LootManager.cs @@ -1282,7 +1282,7 @@ namespace Game.Loots if ((item.lootmode & _lootMode) == 0) return true; - if (_personalLooter && !LootItem.AllowedForPlayer(_personalLooter, null, item.itemid, item.needs_quest, + if (_personalLooter != null && !LootItem.AllowedForPlayer(_personalLooter, null, item.itemid, item.needs_quest, !item.needs_quest || Global.ObjectMgr.GetItemTemplate(item.itemid).HasFlag(ItemFlagsCustom.FollowLootRules), true, item.conditions)) return true; diff --git a/Source/Game/Mails/Mail.cs b/Source/Game/Mails/Mail.cs index bf30a1f52..8a1e9d09f 100644 --- a/Source/Game/Mails/Mail.cs +++ b/Source/Game/Mails/Mail.cs @@ -76,7 +76,7 @@ namespace Game.Mails m_receiver = receiver; m_receiver_lowguid = receiver_lowguid; - Cypher.Assert(!receiver || receiver.GetGUID().GetCounter() == receiver_lowguid); + Cypher.Assert(receiver == null || receiver.GetGUID().GetCounter() == receiver_lowguid); } public MailReceiver(Player receiver, ObjectGuid receiverGuid) @@ -84,7 +84,7 @@ namespace Game.Mails m_receiver = receiver; m_receiver_lowguid = receiverGuid.GetCounter(); - Cypher.Assert(!receiver || receiver.GetGUID() == receiverGuid); + Cypher.Assert(receiver == null || receiver.GetGUID() == receiverGuid); } public Player GetPlayer() { return m_receiver; } diff --git a/Source/Game/Maps/GridNotifiers.cs b/Source/Game/Maps/GridNotifiers.cs index 4569031d6..b8533c2f3 100644 --- a/Source/Game/Maps/GridNotifiers.cs +++ b/Source/Game/Maps/GridNotifiers.cs @@ -91,7 +91,7 @@ namespace Game.Maps // at this moment i_clientGUIDs have guids that not iterate at grid level checks // but exist one case when this possible and object not out of range: transports Transport transport = i_player.GetTransport(); - if (transport) + if (transport != null) { foreach (var obj in transport.GetPassengers()) { @@ -197,10 +197,10 @@ namespace Game.Maps { DynamicObject dynamicObject = objs[i]; Unit caster = dynamicObject.GetCaster(); - if (caster) + if (caster != null) { Player pl = caster.ToPlayer(); - if (pl && pl.seerView == dynamicObject) + if (pl != null && pl.seerView == dynamicObject) pl.UpdateVisibilityOf(i_objects); } } @@ -277,7 +277,7 @@ namespace Game.Maps Creature creature = objs[i]; CreatureUnitRelocationWorker(i_creature, creature); - if (!creature.IsNeedNotify(NotifyFlags.VisibilityChanged)) + if (creature.IsNeedNotify(NotifyFlags.VisibilityChanged)) CreatureUnitRelocationWorker(creature, i_creature); } } @@ -320,7 +320,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.IsNeedNotify(NotifyFlags.VisibilityChanged)) + if (creature.IsNeedNotify(NotifyFlags.VisibilityChanged)) continue; CreatureRelocationNotifier relocate = new(creature); @@ -439,7 +439,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if ((!required3dDist ? creature.GetExactDist2dSq(i_source) : creature.GetExactDistSq(i_source)) > i_distSq) @@ -468,10 +468,10 @@ namespace Game.Maps // Send packet back to the caster if the caster has vision of dynamic object Unit caster = dynamicObject.GetCaster(); - if (caster) + if (caster != null) { Player player = caster.ToPlayer(); - if (player && player.seerView == dynamicObject) + if (player != null && player.seerView == dynamicObject) SendPacket(player); } } @@ -524,7 +524,7 @@ namespace Game.Maps SendPacket(visionPlayer); } - if (player.seerView == player || player.GetVehicle()) + if (player.seerView == player || player.GetVehicle() != null) SendPacket(player); } } @@ -534,7 +534,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (creature.GetExactDist2dSq(i_source) > i_distSq) @@ -566,7 +566,7 @@ namespace Game.Maps { // Send packet back to the caster if the caster has vision of dynamic object Player player = caster.ToPlayer(); - if (player && player.seerView == dynamicObject) + if (player != null && player.seerView == dynamicObject) SendPacket(player); } } @@ -839,7 +839,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.GetSharedVisionList().Empty()) + if (creature.GetSharedVisionList().Empty()) { foreach (var visionPlayer in creature.GetSharedVisionList()) BuildPacket(visionPlayer); @@ -1007,7 +1007,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1030,7 +1030,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1053,13 +1053,13 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (i_check.Invoke(creature)) @@ -1076,7 +1076,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1099,7 +1099,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1122,7 +1122,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1145,7 +1145,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1168,7 +1168,7 @@ namespace Game.Maps return; // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1242,7 +1242,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (i_check.Invoke(creature)) @@ -1468,7 +1468,7 @@ namespace Game.Maps public override void Visit(IList objs) { // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -1574,7 +1574,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (i_check.Invoke(creature)) @@ -1618,7 +1618,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (i_check.Invoke(creature)) @@ -1680,13 +1680,13 @@ namespace Game.Maps public override void Visit(IList objs) { // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (i_check.Invoke(creature)) @@ -1717,7 +1717,7 @@ namespace Game.Maps for (var i = 0; i < objs.Count; ++i) { Creature creature = objs[i]; - if (!creature.InSamePhase(i_phaseShift)) + if (creature.InSamePhase(i_phaseShift)) continue; if (i_check.Invoke(creature)) @@ -1768,7 +1768,7 @@ namespace Game.Maps public override void Visit(IList objs) { // already found - if (i_object) + if (i_object != null) return; for (var i = 0; i < objs.Count; ++i) @@ -2804,7 +2804,7 @@ namespace Game.Maps public bool Invoke(T obj) { - return obj.ToUnit() && obj.ToUnit().HasAura(_spellId, _casterGUID) == _present; + return obj.ToUnit() != null && obj.ToUnit().HasAura(_spellId, _casterGUID) == _present; } public static implicit operator Predicate(UnitAuraCheck unit) @@ -3033,15 +3033,15 @@ namespace Game.Maps public virtual bool Invoke(T obj) { Player player = obj.ToPlayer(); - if (player) + if (player != null) return !player.IsAlive() && !player.HasAuraType(AuraType.Ghost) && i_searchObj.IsWithinDistInMap(player, i_range); Creature creature = obj.ToCreature(); - if (creature) + if (creature != null) return !creature.IsAlive() && i_searchObj.IsWithinDistInMap(creature, i_range); Corpse corpse = obj.ToCorpse(); - if (corpse) + if (corpse != null) return corpse.GetCorpseType() != CorpseType.Bones && i_searchObj.IsWithinDistInMap(corpse, i_range); return false; @@ -3074,7 +3074,7 @@ namespace Game.Maps return false; Creature creature = obj.ToCreature(); - if (creature) + if (creature != null) return !creature.IsPet(); return true; diff --git a/Source/Game/Maps/Instances/InstanceScript.cs b/Source/Game/Maps/Instances/InstanceScript.cs index ece4c1b18..9cc4faa00 100644 --- a/Source/Game/Maps/Instances/InstanceScript.cs +++ b/Source/Game/Maps/Instances/InstanceScript.cs @@ -232,7 +232,7 @@ namespace Game.Maps continue; // nothing to do here // if we should spawn group, then spawn it... if (doSpawn) - instance.SpawnGroupSpawn(groupId, instance); + instance.SpawnGroupSpawn(groupId, instance != null); else // otherwise, set it as inactive so it no longer respawns (but don't despawn it) instance.SetSpawnGroupInactive(groupId); } @@ -351,7 +351,7 @@ namespace Game.Maps foreach (var guid in bossInfo.minion) { Creature minion = instance.GetCreature(guid); - if (minion) + if (minion != null) if (minion.IsWorldBoss() && minion.IsAlive()) return false; } @@ -401,7 +401,7 @@ namespace Game.Maps foreach (var guid in bossInfo.door[type]) { GameObject door = instance.GetGameObject(guid); - if (door) + if (door != null) UpdateDoorState(door); } } @@ -409,7 +409,7 @@ namespace Game.Maps foreach (var guid in bossInfo.minion.ToArray()) { Creature minion = instance.GetCreature(guid); - if (minion) + if (minion != null) UpdateMinionState(minion, state); } @@ -421,7 +421,7 @@ namespace Game.Maps public bool _SkipCheckRequiredBosses(Player player = null) { - return player && player.GetSession().HasPermission(RBACPermissions.SkipCheckInstanceRequiredBosses); + return player != null && player.GetSession().HasPermission(RBACPermissions.SkipCheckInstanceRequiredBosses); } public virtual void Create() @@ -510,9 +510,9 @@ namespace Game.Maps public void HandleGameObject(ObjectGuid guid, bool open, GameObject go = null) { - if (!go) + if (go == null) go = instance.GetGameObject(guid); - if (go) + if (go != null) go.SetGoState(open ? GameObjectState.Active : GameObjectState.Ready); else Log.outDebug(LogFilter.Scripts, "InstanceScript: HandleGameObject failed"); @@ -524,7 +524,7 @@ namespace Game.Maps return; GameObject go = instance.GetGameObject(uiGuid); - if (go) + if (go != null) { if (go.GetGoType() == GameObjectTypes.Door || go.GetGoType() == GameObjectTypes.Button) { @@ -546,7 +546,7 @@ namespace Game.Maps return; GameObject go = instance.GetGameObject(guid); - if (go) + if (go != null) { if (go.GetGoType() == GameObjectTypes.Door || go.GetGoType() == GameObjectTypes.Button) { @@ -563,7 +563,7 @@ namespace Game.Maps public void DoRespawnGameObject(ObjectGuid guid, TimeSpan timeToDespawn) { GameObject go = instance.GetGameObject(guid); - if (go) + if (go != null) { switch (go.GetGoType()) { @@ -612,7 +612,7 @@ namespace Game.Maps public void DoRemoveAurasDueToSpellOnPlayer(Player player, uint spell, bool includePets = false, bool includeControlled = false) { - if (!player) + if (player == null) return; player.RemoveAurasDueToSpell(spell); @@ -651,7 +651,7 @@ namespace Game.Maps public void DoCastSpellOnPlayer(Player player, uint spell, bool includePets = false, bool includeControlled = false) { - if (!player) + if (player == null) return; player.CastSpell(player, spell, true); @@ -743,7 +743,7 @@ namespace Game.Maps instance.SendToPlayers(encounterEngageMessage); break; case EncounterFrameType.Disengage: - if (!unit) + if (unit == null) return; InstanceEncounterDisengageUnit encounterDisengageMessage = new(); @@ -751,7 +751,7 @@ namespace Game.Maps instance.SendToPlayers(encounterDisengageMessage); break; case EncounterFrameType.UpdatePriority: - if (!unit) + if (unit == null) return; InstanceEncounterChangePriority encounterChangePriorityMessage = new(); diff --git a/Source/Game/Maps/Map.cs b/Source/Game/Maps/Map.cs index 5cb6ede6a..213d8ae47 100644 --- a/Source/Game/Maps/Map.cs +++ b/Source/Game/Maps/Map.cs @@ -590,7 +590,7 @@ namespace Game.Maps // If player is using far sight or mind vision, visit that object too WorldObject viewPoint = player.GetViewpoint(); - if (viewPoint) + if (viewPoint != null) VisitNearbyCellsOf(viewPoint, grid_object_update, world_object_update); // Handle updates for creatures in combat with player and are more than 60 yards away @@ -654,7 +654,7 @@ namespace Game.Maps for (var i = 0; i < _transports.Count; ++i) { Transport transport = _transports[i]; - if (!transport) + if (transport == null) continue; transport.Update(diff); @@ -1119,7 +1119,7 @@ namespace Game.Maps } creature._moveState = ObjectCellMoveState.None; - if (!creature.IsInWorld) + if (creature.IsInWorld) continue; // do move or do move to respawn or remove creature if previous all fail @@ -1136,7 +1136,7 @@ namespace Game.Maps { // if creature can't be move in new cell/grid (not loaded) move it to repawn cell/grid // creature coordinates will be updated and notifiers send - if (!CreatureRespawnRelocation(creature, false)) + if (CreatureRespawnRelocation(creature, false)) { // ... or unload (if respawn grid also not loaded) //This may happen when a player just logs in and a pet moves to a nearby unloaded cell @@ -1671,7 +1671,7 @@ namespace Game.Maps Group group = player.GetGroup(); if (entry.IsRaid() && (int)entry.Expansion() >= WorldConfig.GetIntValue(WorldCfg.Expansion)) // can only enter in a raid group but raids from old expansion don't need a group - if ((!group || !group.IsRaidGroup()) && !WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid)) + if ((group == null || !group.IsRaidGroup()) && !WorldConfig.GetBoolValue(WorldCfg.InstanceIgnoreRaid)) return new TransferAbortParams(TransferAbortReason.NeedGroup); if (entry.Instanceable()) @@ -1847,7 +1847,7 @@ namespace Game.Maps var range = _creatureBySpawnIdStore.LookupByKey(info.spawnId); foreach (var creature in range) { - if (!creature.IsAlive()) + if (creature.IsAlive()) continue; // escort NPCs are allowed to respawn as long as all other instances are already escorting @@ -2505,7 +2505,7 @@ namespace Game.Maps case TypeId.GameObject: GameObject go = obj.ToGameObject(); Transport transport = go.ToTransport(); - if (transport) + if (transport != null) RemoveFromMap(transport, true); else RemoveFromMap(go, true); @@ -2877,7 +2877,7 @@ namespace Game.Maps void RemoveCorpse(Corpse corpse) { - Cypher.Assert(corpse); + Cypher.Assert(corpse != null); corpse.UpdateObjectVisibilityOnDestroy(); if (corpse.GetCurrentCell() != null) @@ -2898,7 +2898,7 @@ namespace Game.Maps public Corpse ConvertCorpseToBones(ObjectGuid ownerGuid, bool insignia = false) { Corpse corpse = GetCorpseByPlayer(ownerGuid); - if (!corpse) + if (corpse == null) return null; RemoveCorpse(corpse); @@ -3143,7 +3143,7 @@ namespace Game.Maps var players = GetPlayers(); foreach (var player in players) { - if (player) + if (player != null) { if (player.IsInWorld) { @@ -3509,7 +3509,7 @@ namespace Game.Maps return null; GameObject go = GetGameObject(guid); - return go ? go.ToTransport() : null; + return go != null ? go.ToTransport() : null; } public Creature GetCreatureBySpawnId(ulong spawnId) @@ -3734,11 +3734,6 @@ namespace Game.Maps _updateObjects.Remove(obj); } - public static implicit operator bool(Map map) - { - return map != null; - } - public MultiPersonalPhaseTracker GetMultiPersonalPhaseTracker() { return _multiPersonalPhaseTracker; } public SpawnedPoolData GetPoolData() { return _poolData; } @@ -3829,8 +3824,8 @@ namespace Game.Maps if (player == null) Log.outError(LogFilter.Scripts, "{0} neither source nor target object is player (source: TypeId: {1}, Entry: {2}, {3}; target: TypeId: {4}, Entry: {5}, {6}), skipping.", - scriptInfo.GetDebugInfo(), source ? source.GetTypeId() : 0, source ? source.GetEntry() : 0, source ? source.GetGUID().ToString() : "", - target ? target.GetTypeId() : 0, target ? target.GetEntry() : 0, target ? target.GetGUID().ToString() : ""); + scriptInfo.GetDebugInfo(), source != null ? source.GetTypeId() : 0, source != null ? source.GetEntry() : 0, source != null ? source.GetGUID().ToString() : "", + target != null ? target.GetTypeId() : 0, target != null ? target.GetEntry() : 0, target != null ? target.GetGUID().ToString() : ""); } return player; } @@ -3861,8 +3856,8 @@ namespace Game.Maps if (creature == null) Log.outError(LogFilter.Scripts, "{0} neither source nor target are creatures (source: TypeId: {1}, Entry: {2}, {3}; target: TypeId: {4}, Entry: {5}, {6}), skipping.", - scriptInfo.GetDebugInfo(), source ? source.GetTypeId() : 0, source ? source.GetEntry() : 0, source ? source.GetGUID().ToString() : "", - target ? target.GetTypeId() : 0, target ? target.GetEntry() : 0, target ? target.GetGUID().ToString() : ""); + scriptInfo.GetDebugInfo(), source != null ? source.GetTypeId() : 0, source != null ? source.GetEntry() : 0, source != null ? source.GetGUID().ToString() : "", + target != null ? target.GetTypeId() : 0, target != null ? target.GetEntry() : 0, target != null ? target.GetGUID().ToString() : ""); } return creature; } @@ -4112,10 +4107,10 @@ namespace Game.Maps else source = _GetScriptCreatureSourceOrTarget(source, target, step.script); - if (source) + if (source != null) { Unit sourceUnit = source.ToUnit(); - if (!sourceUnit) + if (sourceUnit == null) { Log.outError(LogFilter.Scripts, "{0} source object ({1}) is not an unit, skipping.", step.script.GetDebugInfo(), source.GetGUID().ToString()); break; @@ -4136,8 +4131,8 @@ namespace Game.Maps case ChatMsg.Whisper: case ChatMsg.RaidBossWhisper: { - Player receiver = target ? target.ToPlayer() : null; - if (!receiver) + Player receiver = target != null ? target.ToPlayer() : null; + if (receiver == null) Log.outError(LogFilter.Scripts, "{0} attempt to whisper to non-player unit, skipping.", step.script.GetDebugInfo()); else sourceUnit.Whisper((uint)step.script.Talk.TextID, receiver, step.script.Talk.ChatType == ChatMsg.RaidBossWhisper); @@ -4153,7 +4148,7 @@ namespace Game.Maps { // Source or target must be Creature. Creature cSource = _GetScriptCreatureSourceOrTarget(source, target, step.script); - if (cSource) + if (cSource != null) { if (step.script.Emote.Flags.HasAnyFlag(eScriptFlags.EmoteUseState)) cSource.SetEmoteState((Emote)step.script.Emote.EmoteID); @@ -4166,7 +4161,7 @@ namespace Game.Maps { // Source or target must be Creature. Creature cSource = _GetScriptCreatureSourceOrTarget(source, target, step.script); - if (cSource) + if (cSource != null) { Unit unit = cSource.ToUnit(); if (step.script.MoveTo.TravelTime != 0) @@ -4189,7 +4184,7 @@ namespace Game.Maps { // Source or target must be Creature. Creature cSource = _GetScriptCreatureSourceOrTarget(source, target, step.script); - if (cSource) + if (cSource != null) cSource.NearTeleportTo(step.script.TeleportTo.DestX, step.script.TeleportTo.DestY, step.script.TeleportTo.DestZ, step.script.TeleportTo.Orientation); } @@ -4197,7 +4192,7 @@ namespace Game.Maps { // Source or target must be Player. Player player = _GetScriptPlayerSourceOrTarget(source, target, step.script); - if (player) + if (player != null) player.TeleportTo(step.script.TeleportTo.MapID, step.script.TeleportTo.DestX, step.script.TeleportTo.DestY, step.script.TeleportTo.DestZ, step.script.TeleportTo.Orientation); } @@ -4205,12 +4200,12 @@ namespace Game.Maps } case ScriptCommands.QuestExplored: { - if (!source) + if (source == null) { Log.outError(LogFilter.Scripts, "{0} source object is NULL.", step.script.GetDebugInfo()); break; } - if (!target) + if (target == null) { Log.outError(LogFilter.Scripts, "{0} target object is NULL.", step.script.GetDebugInfo()); break; @@ -4265,7 +4260,7 @@ namespace Game.Maps { // Source or target must be Player. Player player = _GetScriptPlayerSourceOrTarget(source, target, step.script); - if (player) + if (player != null) { if (step.script.KillCredit.Flags.HasAnyFlag(eScriptFlags.KillcreditRewardGroup)) player.RewardPlayerAndGroupAtEvent(step.script.KillCredit.CreatureEntry, player); @@ -4284,7 +4279,7 @@ namespace Game.Maps // Source or target must be WorldObject. WorldObject pSummoner = _GetScriptWorldObject(source, true, step.script); - if (pSummoner) + if (pSummoner != null) { GameObject pGO = _FindGameObject(pSummoner, step.script.RespawnGameObject.GOGuid); if (pGO == null) @@ -4318,7 +4313,7 @@ namespace Game.Maps { // Source must be WorldObject. WorldObject pSummoner = _GetScriptWorldObject(source, true, step.script); - if (pSummoner) + if (pSummoner != null) { if (step.script.TempSummonCreature.CreatureEntry == 0) Log.outError(LogFilter.Scripts, "{0} creature entry (datalong) is not specified.", step.script.GetDebugInfo()); @@ -4344,7 +4339,7 @@ namespace Game.Maps { // Source must be Unit. Unit unit = _GetScriptUnit(source, true, step.script); - if (unit) + if (unit != null) { // Target must be GameObject. if (target == null) @@ -4361,7 +4356,7 @@ namespace Game.Maps break; } GameObject pGO = target.ToGameObject(); - if (pGO) + if (pGO != null) pGO.Use(unit); } break; @@ -4371,7 +4366,7 @@ namespace Game.Maps // Source (datalong2 != 0) or target (datalong2 == 0) must be Unit. bool bReverse = step.script.RemoveAura.Flags.HasAnyFlag(eScriptFlags.RemoveauraReverse); Unit unit = _GetScriptUnit(bReverse ? source : target, bReverse, step.script); - if (unit) + if (unit != null) unit.RemoveAurasDueToSpell(step.script.RemoveAura.SpellID); break; } @@ -4432,7 +4427,7 @@ namespace Game.Maps case ScriptCommands.PlaySound: // Source must be WorldObject. WorldObject obj = _GetScriptWorldObject(source, true, step.script); - if (obj) + if (obj != null) { // PlaySound.Flags bitmask: 0/1=anyone/target Player player2 = null; @@ -4455,7 +4450,7 @@ namespace Game.Maps case ScriptCommands.CreateItem: // Target or source must be Player. Player pReceiver = _GetScriptPlayerSourceOrTarget(source, target, step.script); - if (pReceiver) + if (pReceiver != null) { var dest = new List(); InventoryResult msg = pReceiver.CanStoreNewItem(ItemConst.NullBag, ItemConst.NullSlot, dest, step.script.CreateItem.ItemEntry, step.script.CreateItem.Amount); @@ -4488,7 +4483,7 @@ namespace Game.Maps { // Source must be Unit. Unit unit = _GetScriptUnit(source, true, step.script); - if (unit) + if (unit != null) { if (Global.WaypointMgr.GetPath(step.script.LoadPath.PathID) == null) Log.outError(LogFilter.Scripts, "{0} source object has an invalid path ({1}), skipping.", step.script.GetDebugInfo(), step.script.LoadPath.PathID); @@ -4512,7 +4507,7 @@ namespace Game.Maps Creature cTarget = null; var creatureBounds = _creatureBySpawnIdStore.LookupByKey(step.script.CallScript.CreatureEntry); - if (!creatureBounds.Empty()) + if (creatureBounds.Empty()) { // Prefer alive (last respawned) creature var foundCreature = creatureBounds.Find(creature => creature.IsAlive()); @@ -4535,7 +4530,7 @@ namespace Game.Maps { // Source or target must be Creature. Creature cSource = _GetScriptCreatureSourceOrTarget(source, target, step.script); - if (cSource) + if (cSource != null) { if (cSource.IsDead()) Log.outError(LogFilter.Scripts, "{0} creature is already dead (Entry: {1}, GUID: {2})", step.script.GetDebugInfo(), cSource.GetEntry(), cSource.GetGUID().ToString()); @@ -4552,7 +4547,7 @@ namespace Game.Maps { // Source must be Unit. Unit sourceUnit = _GetScriptUnit(source, true, step.script); - if (sourceUnit) + if (sourceUnit != null) { if (step.script.Orientation.Flags.HasAnyFlag(eScriptFlags.OrientationFaceTarget)) { @@ -4571,16 +4566,16 @@ namespace Game.Maps case ScriptCommands.Equip: { // Source must be Creature. - Creature cSource = _GetScriptCreature(source, target, step.script); - if (cSource) + Creature cSource = _GetScriptCreature(source, target != null, step.script); + if (cSource != null) cSource.LoadEquipment((int)step.script.Equip.EquipmentID); break; } case ScriptCommands.Model: { // Source must be Creature. - Creature cSource = _GetScriptCreature(source, target, step.script); - if (cSource) + Creature cSource = _GetScriptCreature(source, target != null, step.script); + if (cSource != null) cSource.SetDisplayId(step.script.Model.ModelID); break; } @@ -4596,7 +4591,7 @@ namespace Game.Maps { // Source must be Player. Player player = _GetScriptPlayer(source, true, step.script); - if (player) + if (player != null) player.SendMovieStart(step.script.PlayMovie.MovieID); break; } @@ -4604,7 +4599,7 @@ namespace Game.Maps { // Source must be Creature. Creature cSource = _GetScriptCreature(source, true, step.script); - if (cSource) + if (cSource != null) { if (!cSource.IsAlive()) return; @@ -4627,7 +4622,7 @@ namespace Game.Maps { // Source must be Creature. Creature cSource = _GetScriptCreature(source, true, step.script); - if (cSource) + if (cSource != null) cSource.PlayOneShotAnimKitId((ushort)step.script.PlayAnimKit.AnimKitID); break; } diff --git a/Source/Game/Maps/MapManager.cs b/Source/Game/Maps/MapManager.cs index 6df7ef547..6d6cb0749 100644 --- a/Source/Game/Maps/MapManager.cs +++ b/Source/Game/Maps/MapManager.cs @@ -117,7 +117,7 @@ namespace Game.Entities /// the right instance for the object, based on its InstanceId public Map CreateMap(uint mapId, Player player) { - if (!player) + if (player == null) return null; var entry = CliDB.MapStorage.LookupByKey(mapId); @@ -138,7 +138,7 @@ namespace Game.Entities return null; map = FindMap_i(mapId, newInstanceId); - if (!map) + if (map == null) { Battleground bg = player.GetBattleground(); if (bg != null) @@ -169,7 +169,7 @@ namespace Game.Entities { // Try finding instance id for normal dungeon if (!entries.MapDifficulty.HasResetSchedule()) - newInstanceId = group ? group.GetRecentInstanceId(mapId) : player.GetRecentInstanceId(mapId); + newInstanceId = group != null ? group.GetRecentInstanceId(mapId) : player.GetRecentInstanceId(mapId); // If not found or instance is not a normal dungeon, generate new one if (newInstanceId == 0) @@ -188,10 +188,10 @@ namespace Game.Entities map = null; } - if (!map) + if (map == null) { map = CreateInstance(mapId, newInstanceId, instanceLock, difficulty, player.GetTeamId(), group); - if (group) + if (group != null) group.SetRecentInstance(mapId, instanceOwnerGuid, newInstanceId); else player.SetRecentInstance(mapId, newInstanceId); @@ -201,7 +201,7 @@ namespace Game.Entities { newInstanceId = (uint)player.GetGUID().GetCounter(); map = FindMap_i(mapId, newInstanceId); - if (!map) + if (map == null) map = CreateGarrison(mapId, newInstanceId, player); } else @@ -211,11 +211,11 @@ namespace Game.Entities newInstanceId = (uint)player.GetTeamId(); map = FindMap_i(mapId, newInstanceId); - if (!map) + if (map == null) map = CreateWorldMap(mapId, newInstanceId); } - if (map) + if (map != null) i_maps[(map.GetId(), map.GetInstanceId())] = map; return map; @@ -242,13 +242,13 @@ namespace Game.Entities Difficulty difficulty = group != null ? group.GetDifficultyID(entry) : player.GetDifficultyID(entry); MapDb2Entries entries = new(entry, Global.DB2Mgr.GetDownscaledMapDifficultyData(mapId, ref difficulty)); - ObjectGuid instanceOwnerGuid = group ? group.GetRecentInstanceOwner(mapId) : player.GetGUID(); + ObjectGuid instanceOwnerGuid = group != null ? group.GetRecentInstanceOwner(mapId) : player.GetGUID(); InstanceLock instanceLock = Global.InstanceLockMgr.FindActiveInstanceLock(instanceOwnerGuid, entries); uint newInstanceId = 0; if (instanceLock != null) newInstanceId = instanceLock.GetInstanceId(); else if (!entries.MapDifficulty.HasResetSchedule()) // Try finding instance id for normal dungeon - newInstanceId = group ? group.GetRecentInstanceId(mapId) : player.GetRecentInstanceId(mapId); + newInstanceId = group != null ? group.GetRecentInstanceId(mapId) : player.GetRecentInstanceId(mapId); if (newInstanceId == 0) return 0; diff --git a/Source/Game/Miscellaneous/Formulas.cs b/Source/Game/Miscellaneous/Formulas.cs index 1bb1cd8bd..6747766d7 100644 --- a/Source/Game/Miscellaneous/Formulas.cs +++ b/Source/Game/Miscellaneous/Formulas.cs @@ -138,13 +138,13 @@ namespace Game Creature creature = u.ToCreature(); uint gain = 0; - if (!creature || creature.CanGiveExperience()) + if (creature == null || creature.CanGiveExperience()) { float xpMod = 1.0f; gain = BaseGain(player.GetLevel(), u.GetLevelForTarget(player)); - if (gain != 0 && creature) + if (gain != 0 && creature != null) { // Players get only 10% xp for killing creatures of lower expansion levels than himself if ((creature.GetCreatureDifficulty().GetHealthScalingExpansion() < (int)GetExpansionForLevel(player.GetLevel()))) @@ -162,7 +162,7 @@ namespace Game xpMod *= creature.GetCreatureTemplate().ModExperience; } xpMod *= isBattleGround ? WorldConfig.GetFloatValue(WorldCfg.RateXpBgKill) : WorldConfig.GetFloatValue(WorldCfg.RateXpKill); - if (creature && creature.m_PlayerDamageReq != 0) // if players dealt less than 50% of the damage and were credited anyway (due to CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ), scale XP gained appropriately (linear scaling) + if (creature != null && creature.m_PlayerDamageReq != 0) // if players dealt less than 50% of the damage and were credited anyway (due to CREATURE_FLAG_EXTRA_NO_PLAYER_DAMAGE_REQ), scale XP gained appropriately (linear scaling) xpMod *= 1.0f - 2.0f * creature.m_PlayerDamageReq / creature.GetMaxHealth(); gain = (uint)(gain * xpMod); diff --git a/Source/Game/Movement/AbstractFollower.cs b/Source/Game/Movement/AbstractFollower.cs index 6961aab18..92abf7e3c 100644 --- a/Source/Game/Movement/AbstractFollower.cs +++ b/Source/Game/Movement/AbstractFollower.cs @@ -16,12 +16,12 @@ namespace Game.Movement if (unit == _target) return; - if (_target) + if (_target != null) _target.FollowerRemoved(this); _target = unit; - if (_target) + if (_target != null) _target.FollowerAdded(this); } diff --git a/Source/Game/Movement/Generators/ChaseMovementGenerator.cs b/Source/Game/Movement/Generators/ChaseMovementGenerator.cs index 27c313f9f..bd93fa1ce 100644 --- a/Source/Game/Movement/Generators/ChaseMovementGenerator.cs +++ b/Source/Game/Movement/Generators/ChaseMovementGenerator.cs @@ -55,7 +55,7 @@ namespace Game.Movement public override bool Update(Unit owner, uint diff) { // owner might be dead or gone (can we even get nullptr here?) - if (!owner || !owner.IsAlive()) + if (owner == null || !owner.IsAlive()) return false; // our target might have gone away @@ -162,7 +162,7 @@ namespace Game.Movement bool success = _path.CalculatePath(x, y, z, owner.CanFly()); if (!success || _path.GetPathType().HasAnyFlag(PathType.NoPath)) { - if (cOwner) + if (cOwner != null) cOwner.SetCannotReachTarget(true); owner.StopMoving(); @@ -172,11 +172,11 @@ namespace Game.Movement if (shortenPath) _path.ShortenPathUntilDist(target, maxTarget); - if (cOwner) + if (cOwner != null) cOwner.SetCannotReachTarget(false); bool walk = false; - if (cOwner && !cOwner.IsPet()) + if (cOwner != null && !cOwner.IsPet()) { switch (cOwner.GetMovementTemplate().GetChase()) { diff --git a/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs b/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs index 51962f8bf..ecd87e223 100644 --- a/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs +++ b/Source/Game/Movement/Generators/ConfusedMovementGenerator.cs @@ -25,7 +25,7 @@ namespace Game.Movement RemoveFlag(MovementGeneratorFlags.InitializationPending | MovementGeneratorFlags.Transitory | MovementGeneratorFlags.Deactivated); AddFlag(MovementGeneratorFlags.Initialized); - if (!owner || !owner.IsAlive()) + if (owner == null || !owner.IsAlive()) return; // TODO: UNIT_FIELD_FLAGS should not be handled by generators @@ -45,7 +45,7 @@ namespace Game.Movement public override bool DoUpdate(T owner, uint diff) { - if (!owner || !owner.IsAlive()) + if (owner == null || !owner.IsAlive()) return false; if (owner.HasUnitState(UnitState.NotMove) || owner.IsMovementPreventedByCasting()) @@ -124,7 +124,7 @@ namespace Game.Movement { owner.RemoveUnitFlag(UnitFlags.Confused); owner.ClearUnitState(UnitState.ConfusedMove); - if (owner.GetVictim()) + if (owner.GetVictim() != null) owner.SetTarget(owner.GetVictim().GetGUID()); } } diff --git a/Source/Game/Movement/Generators/FollowMovementGenerator.cs b/Source/Game/Movement/Generators/FollowMovementGenerator.cs index 833541fe5..755a8426d 100644 --- a/Source/Game/Movement/Generators/FollowMovementGenerator.cs +++ b/Source/Game/Movement/Generators/FollowMovementGenerator.cs @@ -189,7 +189,7 @@ namespace Game.Movement Pet oPet = owner.ToPet(); if (oPet != null) { - if (!_abstractFollower.GetTarget() || _abstractFollower.GetTarget().GetGUID() == owner.GetOwnerGUID()) + if (_abstractFollower.GetTarget() == null || _abstractFollower.GetTarget().GetGUID() == owner.GetOwnerGUID()) { oPet.UpdateSpeed(UnitMoveType.Run); oPet.UpdateSpeed(UnitMoveType.Walk); diff --git a/Source/Game/Movement/Generators/GenericMovementGenerator.cs b/Source/Game/Movement/Generators/GenericMovementGenerator.cs index 174379202..3743aa8bc 100644 --- a/Source/Game/Movement/Generators/GenericMovementGenerator.cs +++ b/Source/Game/Movement/Generators/GenericMovementGenerator.cs @@ -56,7 +56,7 @@ namespace Game.Movement public override bool Update(Unit owner, uint diff) { - if (!owner || HasFlag(MovementGeneratorFlags.Finalized)) + if (owner == null || HasFlag(MovementGeneratorFlags.Finalized)) return false; // Cyclic splines never expire, so update the duration only if it's not cyclic diff --git a/Source/Game/Movement/Generators/PointMovement.cs b/Source/Game/Movement/Generators/PointMovement.cs index 09021fabe..ae1a9c403 100644 --- a/Source/Game/Movement/Generators/PointMovement.cs +++ b/Source/Game/Movement/Generators/PointMovement.cs @@ -87,7 +87,7 @@ namespace Game.Movement if (_speed.HasValue) init.SetVelocity(_speed.Value); - if (_faceTarget) + if (_faceTarget != null) init.SetFacing(_faceTarget); if (_spellEffectExtra != null) diff --git a/Source/Game/Movement/Generators/RandomMovementGenerator.cs b/Source/Game/Movement/Generators/RandomMovementGenerator.cs index 78f4b29dd..0794ab4b0 100644 --- a/Source/Game/Movement/Generators/RandomMovementGenerator.cs +++ b/Source/Game/Movement/Generators/RandomMovementGenerator.cs @@ -59,7 +59,7 @@ namespace Game.Movement public override bool DoUpdate(Creature owner, uint diff) { - if (!owner || !owner.IsAlive()) + if (owner == null || !owner.IsAlive()) return true; if (HasFlag(MovementGeneratorFlags.Finalized | MovementGeneratorFlags.Paused)) diff --git a/Source/Game/Movement/Generators/WaypointMovement.cs b/Source/Game/Movement/Generators/WaypointMovement.cs index a1e14c08d..9466044d8 100644 --- a/Source/Game/Movement/Generators/WaypointMovement.cs +++ b/Source/Game/Movement/Generators/WaypointMovement.cs @@ -160,7 +160,7 @@ namespace Game.Movement public override bool DoUpdate(Creature owner, uint diff) { - if (!owner || !owner.IsAlive()) + if (owner == null || !owner.IsAlive()) return true; if (HasFlag(MovementGeneratorFlags.Finalized | MovementGeneratorFlags.Paused) || _path == null || _path.nodes.Empty()) @@ -363,7 +363,7 @@ namespace Game.Movement trans.CalculatePassengerPosition(ref x, ref y, ref z, ref o); owner.SetHomePosition(x, y, z, o); } - // else if (vehicle) - this should never happen, vehicle offsets are const + // else if (vehicle != null) - this should never happen, vehicle offsets are const } AddFlag(MovementGeneratorFlags.Finalized); diff --git a/Source/Game/Movement/MotionMaster.cs b/Source/Game/Movement/MotionMaster.cs index 370a82b00..89338459f 100644 --- a/Source/Game/Movement/MotionMaster.cs +++ b/Source/Game/Movement/MotionMaster.cs @@ -288,7 +288,7 @@ namespace Game.Movement public void Update(uint diff) { - if (!_owner) + if (_owner == null) return; if (HasFlag(MotionMasterFlags.InitializationPending | MotionMasterFlags.Initializing)) @@ -556,7 +556,7 @@ namespace Game.Movement public void MoveFollow(Unit target, float dist, ChaseAngle angle, TimeSpan? duration = null, MovementSlot slot = MovementSlot.Active) { // Ignore movement request if target not exist - if (!target || target == _owner) + if (target == null || target == _owner) return; Add(new FollowMovementGenerator(target, dist, angle, duration), slot); @@ -567,7 +567,7 @@ namespace Game.Movement public void MoveChase(Unit target, ChaseRange? dist = null, ChaseAngle? angle = null) { // Ignore movement request if target not exist - if (!target || target == _owner) + if (target == null || target == _owner) return; Add(new ChaseMovementGenerator(target, dist, angle)); @@ -583,7 +583,7 @@ namespace Game.Movement public void MoveFleeing(Unit enemy, TimeSpan time = default) { - if (!enemy) + if (enemy == null) return; if (_owner.IsCreature()) @@ -899,7 +899,7 @@ namespace Game.Movement public void MoveAlongSplineChain(uint pointId, uint dbChainId, bool walk) { Creature owner = _owner.ToCreature(); - if (!owner) + if (owner == null) { Log.outError(LogFilter.Misc, "MotionMaster.MoveAlongSplineChain: non-creature {0} tried to walk along DB spline chain. Ignoring.", _owner.GetGUID().ToString()); return; diff --git a/Source/Game/Movement/MoveSplineInitArgs.cs b/Source/Game/Movement/MoveSplineInitArgs.cs index 232e3b0aa..38b35b04a 100644 --- a/Source/Game/Movement/MoveSplineInitArgs.cs +++ b/Source/Game/Movement/MoveSplineInitArgs.cs @@ -47,7 +47,7 @@ namespace Game.Movement { if (!exp) { - if (unit) + if (unit != null) Log.outError(LogFilter.Movement, $"MoveSplineInitArgs::Validate: expression '{exp}' failed for {(verbose ? unit.GetDebugInfo() : unit.GetGUID().ToString())}"); else Log.outError(LogFilter.Movement, $"MoveSplineInitArgs::Validate: expression '{exp}' failed for cyclic spline continuation"); diff --git a/Source/Game/Networking/PacketManager.cs b/Source/Game/Networking/PacketManager.cs index 8bea1d7c0..38cbf48ed 100644 --- a/Source/Game/Networking/PacketManager.cs +++ b/Source/Game/Networking/PacketManager.cs @@ -171,7 +171,7 @@ namespace Game.Networking return false; Player player = m_pSession.GetPlayer(); - if (!player) + if (player == null) return false; //in Map.Update() we do not process packets where player is not in world! @@ -196,7 +196,7 @@ namespace Game.Networking //no player attached? . our client! ^^ Player player = m_pSession.GetPlayer(); - if (!player) + if (player == null) return true; //lets process all packets for non-in-the-world player diff --git a/Source/Game/Networking/Packets/ChatPackets.cs b/Source/Game/Networking/Packets/ChatPackets.cs index ad65dd083..7ece0e1f3 100644 --- a/Source/Game/Networking/Packets/ChatPackets.cs +++ b/Source/Game/Networking/Packets/ChatPackets.cs @@ -168,10 +168,10 @@ namespace Game.Networking.Packets SlashCmd = chatType; _Language = language; - if (sender) + if (sender != null) SetSender(sender, locale); - if (receiver) + if (receiver != null) SetReceiver(receiver, locale); SenderVirtualAddress = Global.WorldMgr.GetVirtualRealmAddress(); @@ -187,11 +187,11 @@ namespace Game.Networking.Packets SenderGUID = sender.GetGUID(); Creature creatureSender = sender.ToCreature(); - if (creatureSender) + if (creatureSender != null) SenderName = creatureSender.GetName(locale); Player playerSender = sender.ToPlayer(); - if (playerSender) + if (playerSender != null) { SenderAccountGUID = playerSender.GetSession().GetAccountGUID(); _ChatFlags = playerSender.GetChatFlags(); @@ -205,7 +205,7 @@ namespace Game.Networking.Packets TargetGUID = receiver.GetGUID(); Creature creatureReceiver = receiver.ToCreature(); - if (creatureReceiver) + if (creatureReceiver != null) TargetName = creatureReceiver.GetName(locale); } diff --git a/Source/Game/Networking/Packets/CombatPackets.cs b/Source/Game/Networking/Packets/CombatPackets.cs index c9d375195..6b1bf330f 100644 --- a/Source/Game/Networking/Packets/CombatPackets.cs +++ b/Source/Game/Networking/Packets/CombatPackets.cs @@ -61,7 +61,7 @@ namespace Game.Networking.Packets public SAttackStop(Unit attacker, Unit victim) : base(ServerOpcodes.AttackStop, ConnectionType.Instance) { Attacker = attacker.GetGUID(); - if (victim) + if (victim != null) { Victim = victim.GetGUID(); NowDead = !victim.IsAlive(); // using isAlive instead of isDead to catch JUST_DIED death states as well diff --git a/Source/Game/Networking/Packets/MailPackets.cs b/Source/Game/Networking/Packets/MailPackets.cs index 5311f9d10..5027e2be8 100644 --- a/Source/Game/Networking/Packets/MailPackets.cs +++ b/Source/Game/Networking/Packets/MailPackets.cs @@ -388,7 +388,7 @@ namespace Game.Networking.Packets for (byte i = 0; i < mail.items.Count; i++) { Item item = player.GetMItem(mail.items[i].item_guid); - if (item) + if (item != null) Attachments.Add(new MailAttachedItem(item, i)); } } diff --git a/Source/Game/Networking/Packets/PartyPackets.cs b/Source/Game/Networking/Packets/PartyPackets.cs index fc0bf881e..9311c1383 100644 --- a/Source/Game/Networking/Packets/PartyPackets.cs +++ b/Source/Game/Networking/Packets/PartyPackets.cs @@ -255,7 +255,7 @@ namespace Game.Networking.Packets if (player.IsDND()) MemberStats.Status |= GroupMemberOnlineStatus.DND; - if (player.GetVehicle()) + if (player.GetVehicle() != null) MemberStats.Status |= GroupMemberOnlineStatus.Vehicle; // Level @@ -319,7 +319,7 @@ namespace Game.Networking.Packets PhasingHandler.FillPartyMemberPhase(MemberStats.Phases, player.GetPhaseShift()); // Pet - if (player.GetPet()) + if (player.GetPet() != null) { Pet pet = player.GetPet(); diff --git a/Source/Game/Networking/Packets/QueryPackets.cs b/Source/Game/Networking/Packets/QueryPackets.cs index ef6246ed8..eeab3253a 100644 --- a/Source/Game/Networking/Packets/QueryPackets.cs +++ b/Source/Game/Networking/Packets/QueryPackets.cs @@ -589,7 +589,7 @@ namespace Game.Networking.Packets if (characterInfo == null) return false; - if (player) + if (player != null) { Cypher.Assert(player.GetGUID() == guid); diff --git a/Source/Game/Networking/Packets/SpellPackets.cs b/Source/Game/Networking/Packets/SpellPackets.cs index 2ea3816b0..1adc2958e 100644 --- a/Source/Game/Networking/Packets/SpellPackets.cs +++ b/Source/Game/Networking/Packets/SpellPackets.cs @@ -1294,28 +1294,28 @@ namespace Game.Networking.Packets { Player playerAttacker = attacker.ToPlayer(); Creature creatureAttacker = attacker.ToCreature(); - if (playerAttacker) + if (playerAttacker != null) { Player playerTarget = target.ToPlayer(); Creature creatureTarget = target.ToCreature(); - if (playerTarget) + if (playerTarget != null) return GenerateDataPlayerToPlayer(playerAttacker, playerTarget); - else if (creatureTarget) + else if (creatureTarget != null) { if (creatureTarget.HasScalableLevels()) return GenerateDataPlayerToCreature(playerAttacker, creatureTarget); } } - else if (creatureAttacker) + else if (creatureAttacker != null) { Player playerTarget = target.ToPlayer(); Creature creatureTarget = target.ToCreature(); - if (playerTarget) + if (playerTarget != null) { if (creatureAttacker.HasScalableLevels()) return GenerateDataCreatureToPlayer(creatureAttacker, playerTarget); } - else if (creatureTarget) + else if (creatureTarget != null) { if (creatureAttacker.HasScalableLevels() || creatureTarget.HasScalableLevels()) return GenerateDataCreatureToCreature(creatureAttacker, creatureTarget); diff --git a/Source/Game/OutdoorPVP/OutdoorPvP.cs b/Source/Game/OutdoorPVP/OutdoorPvP.cs index db739b276..8fd3cd0bc 100644 --- a/Source/Game/OutdoorPVP/OutdoorPvP.cs +++ b/Source/Game/OutdoorPVP/OutdoorPvP.cs @@ -72,13 +72,13 @@ namespace Game.PvP public virtual void HandleKill(Player killer, Unit killed) { Group group = killer.GetGroup(); - if (group) + if (group != null) { for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next()) { Player groupGuy = refe.GetSource(); - if (!groupGuy) + if (groupGuy == null) continue; // skip if too far away @@ -148,7 +148,7 @@ namespace Game.PvP foreach (var guid in m_players[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendPacket(packet); } } @@ -169,7 +169,7 @@ namespace Game.PvP foreach (var guid in m_players[teamIndex]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) { if (spellId > 0) player.CastSpell(player, (uint)spellId, true); @@ -219,7 +219,7 @@ namespace Game.PvP foreach (var guid in m_players[i]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) if (player.GetZoneId() == zoneId) _worker.Invoke(player); } @@ -276,7 +276,7 @@ namespace Game.PvP public virtual bool HandlePlayerEnter(Player player) { - if (m_capturePoint) + if (m_capturePoint != null) { player.SendUpdateWorldState(m_capturePoint.GetGoInfo().ControlZone.worldState1, 1); player.SendUpdateWorldState(m_capturePoint.GetGoInfo().ControlZone.worldstate2, (uint)Math.Ceiling((m_value + m_maxValue) / (2 * m_maxValue) * 100.0f)); @@ -287,14 +287,14 @@ namespace Game.PvP public virtual void HandlePlayerLeave(Player player) { - if (m_capturePoint) + if (m_capturePoint != null) player.SendUpdateWorldState(m_capturePoint.GetGoInfo().ControlZone.worldState1, 0); m_activePlayers[player.GetTeamId()].Remove(player.GetGUID()); } public virtual void SendChangePhase() { - if (!m_capturePoint) + if (m_capturePoint == null) return; // send this too, sometimes the slider disappears, dunno why :( @@ -327,7 +327,7 @@ namespace Game.PvP public virtual bool Update(uint diff) { - if (!m_capturePoint) + if (m_capturePoint == null) return false; float radius = m_capturePoint.GetGoInfo().ControlZone.radius; @@ -337,7 +337,7 @@ namespace Game.PvP foreach (var playerGuid in m_activePlayers[team].ToList()) { Player player = Global.ObjAccessor.FindPlayer(playerGuid); - if (player) + if (player != null) if (!m_capturePoint.IsWithinDistInMap(player, radius) || !player.IsOutdoorPvPActive()) HandlePlayerLeave(player); } @@ -451,7 +451,7 @@ namespace Game.PvP foreach (var guid in m_activePlayers[team]) { Player player = Global.ObjAccessor.FindPlayer(guid); - if (player) + if (player != null) player.SendUpdateWorldState(field, value); } } @@ -476,7 +476,7 @@ namespace Game.PvP foreach (var playerGuid in m_activePlayers[team]) { Player player = Global.ObjAccessor.FindPlayer(playerGuid); - if (player) + if (player != null) player.KilledMonsterCredit(id, guid); } } diff --git a/Source/Game/Phasing/PhasingHandler.cs b/Source/Game/Phasing/PhasingHandler.cs index ac8d19fee..f89950db6 100644 --- a/Source/Game/Phasing/PhasingHandler.cs +++ b/Source/Game/Phasing/PhasingHandler.cs @@ -57,7 +57,7 @@ namespace Game if (!unit.m_SummonSlot[i].IsEmpty()) { Creature summon = unit.GetMap().GetCreature(unit.m_SummonSlot[i]); - if (summon) + if (summon != null) func(summon); } } @@ -88,13 +88,10 @@ namespace Game obj.GetPhaseShift().PersonalGuid = personalGuid; Unit unit = obj.ToUnit(); - if (unit) + if (unit != null) { unit.OnPhaseChange(); - visitor.VisitControlledOf(unit, controlled => - { - AddPhase(controlled, phaseId, personalGuid, updateVisibility, visitor); - }); + visitor.VisitControlledOf(unit, controlled => AddPhase(controlled, phaseId, personalGuid, updateVisibility, visitor)); unit.RemoveNotOwnSingleTargetAuras(true); } @@ -112,13 +109,10 @@ namespace Game bool changed = obj.GetPhaseShift().RemovePhase(phaseId); Unit unit = obj.ToUnit(); - if (unit) + if (unit != null) { unit.OnPhaseChange(); - visitor.VisitControlledOf(unit, controlled => - { - RemovePhase(controlled, phaseId, updateVisibility, visitor); - }); + visitor.VisitControlledOf(unit, controlled => RemovePhase(controlled, phaseId, updateVisibility, visitor)); unit.RemoveNotOwnSingleTargetAuras(true); } @@ -144,13 +138,10 @@ namespace Game obj.GetPhaseShift().PersonalGuid = personalGuid; Unit unit = obj.ToUnit(); - if (unit) + if (unit != null) { unit.OnPhaseChange(); - visitor.VisitControlledOf(unit, controlled => - { - AddPhaseGroup(controlled, phasesInGroup, personalGuid, updateVisibility, visitor); - }); + visitor.VisitControlledOf(unit, controlled => AddPhaseGroup(controlled, phasesInGroup, personalGuid, updateVisibility, visitor)); unit.RemoveNotOwnSingleTargetAuras(true); } @@ -174,13 +165,10 @@ namespace Game changed = obj.GetPhaseShift().RemovePhase(phaseId) || changed; Unit unit = obj.ToUnit(); - if (unit) + if (unit != null) { unit.OnPhaseChange(); - visitor.VisitControlledOf(unit, controlled => - { - RemovePhaseGroup(controlled, phasesInGroup, updateVisibility, visitor); - }); + visitor.VisitControlledOf(unit, controlled => RemovePhaseGroup(controlled, phasesInGroup, updateVisibility, visitor)); unit.RemoveNotOwnSingleTargetAuras(true); } @@ -202,13 +190,8 @@ namespace Game changed = obj.GetPhaseShift().AddUiMapPhaseId(uiMapPhaseId) || changed; Unit unit = obj.ToUnit(); - if (unit) - { - visitor.VisitControlledOf(unit, controlled => - { - AddVisibleMapId(controlled, visibleMapId, visitor); - }); - } + if (unit != null) + visitor.VisitControlledOf(unit, controlled => AddVisibleMapId(controlled, visibleMapId, visitor)); UpdateVisibilityIfNeeded(obj, false, changed); } @@ -228,13 +211,8 @@ namespace Game changed = obj.GetPhaseShift().RemoveUiMapPhaseId(uiWorldMapAreaIDSwap) || changed; Unit unit = obj.ToUnit(); - if (unit) - { - visitor.VisitControlledOf(unit, controlled => - { - RemoveVisibleMapId(controlled, visibleMapId, visitor); - }); - } + if (unit != null) + visitor.VisitControlledOf(unit, controlled => RemoveVisibleMapId(controlled, visibleMapId, visitor)); UpdateVisibilityIfNeeded(obj, false, changed); } @@ -272,7 +250,7 @@ namespace Game foreach (uint uiMapPhaseId in visibleMapInfo.UiMapPhaseIDs) phaseShift.AddUiMapPhaseId(uiMapPhaseId); } - else if(mapId == obj.GetMapId()) + else if (mapId == obj.GetMapId()) suppressedPhaseShift.AddVisibleMapId(visibleMapInfo.Id, visibleMapInfo); } @@ -314,7 +292,7 @@ namespace Game bool changed = phaseShift.GetPhases() != oldPhases; Unit unit = obj.ToUnit(); - if (unit) + if (unit != null) { foreach (AuraEffect aurEff in unit.GetAuraEffectsByType(AuraType.Phase)) { @@ -336,10 +314,7 @@ namespace Game unit.OnPhaseChange(); ControlledUnitVisitor visitor = new(unit); - visitor.VisitControlledOf(unit, controlled => - { - InheritPhaseShift(controlled, unit); - }); + visitor.VisitControlledOf(unit, controlled => InheritPhaseShift(controlled, unit)); if (changed) unit.RemoveNotOwnSingleTargetAuras(true); @@ -406,7 +381,7 @@ namespace Game } Unit unit = obj.ToUnit(); - if (unit) + if (unit != null) { foreach (AuraEffect aurEff in unit.GetAuraEffectsByType(AuraType.Phase)) { @@ -442,16 +417,13 @@ namespace Game foreach (var pair in newSuppressions.VisibleMapIds) suppressedPhaseShift.AddVisibleMapId(pair.Key, pair.Value.VisibleMapInfo, pair.Value.References); - if (unit) + if (unit != null) { if (changed) unit.OnPhaseChange(); ControlledUnitVisitor visitor = new(unit); - visitor.VisitControlledOf(unit, controlled => - { - InheritPhaseShift(controlled, unit); - }); + visitor.VisitControlledOf(unit, controlled => InheritPhaseShift(controlled, unit)); if (changed) unit.RemoveNotOwnSingleTargetAuras(true); @@ -498,7 +470,7 @@ namespace Game { return AlwaysVisible; } - + public static void InitDbPhaseShift(PhaseShift phaseShift, PhaseUseFlagsValues phaseUseFlags, uint phaseId, uint phaseGroupId) { phaseShift.ClearPhases(); @@ -661,18 +633,18 @@ namespace Game return false; } - + static void UpdateVisibilityIfNeeded(WorldObject obj, bool updateVisibility, bool changed) { if (changed && obj.IsInWorld) { Player player = obj.ToPlayer(); - if (player) + if (player != null) SendToPlayer(player); if (updateVisibility) { - if (player) + if (player != null) player.GetMap().SendUpdateTransportVisibility(player); obj.UpdateObjectVisibility(); diff --git a/Source/Game/Pools/PoolManager.cs b/Source/Game/Pools/PoolManager.cs index 56c2b8fb1..4d08dc6b9 100644 --- a/Source/Game/Pools/PoolManager.cs +++ b/Source/Game/Pools/PoolManager.cs @@ -749,7 +749,7 @@ namespace Game if (spawns.GetMap().IsGridLoaded(data.SpawnPoint)) { GameObject go = GameObject.CreateGameObjectFromDB(obj.guid, spawns.GetMap(), false); - if (go && go.IsSpawnedByDefault()) + if (go != null && go.IsSpawnedByDefault()) if (!spawns.GetMap().AddToMap(go)) go.Dispose(); } diff --git a/Source/Game/Quest/Quest.cs b/Source/Game/Quest/Quest.cs index e16fb1160..31aae3ded 100644 --- a/Source/Game/Quest/Quest.cs +++ b/Source/Game/Quest/Quest.cs @@ -392,7 +392,7 @@ namespace Game public static uint XPValue(Player player, uint contentTuningId, uint xpDifficulty, float xpMultiplier = 1.0f, int expansion = -1) { - if (player) + if (player != null) { uint questLevel = (uint)player.GetQuestLevel(contentTuningId); QuestXPRecord questXp = CliDB.QuestXPStorage.LookupByKey(questLevel); diff --git a/Source/Game/Quest/QuestObjectiveCriteriaManager.cs b/Source/Game/Quest/QuestObjectiveCriteriaManager.cs index 289da15e3..ee18dbcb8 100644 --- a/Source/Game/Quest/QuestObjectiveCriteriaManager.cs +++ b/Source/Game/Quest/QuestObjectiveCriteriaManager.cs @@ -271,7 +271,7 @@ namespace Game } Quest quest = Global.ObjectMgr.GetQuestTemplate(objective.QuestID); - if (_owner.GetGroup() && _owner.GetGroup().IsRaidGroup() && !quest.IsAllowedInRaid(referencePlayer.GetMap().GetDifficultyID())) + if (_owner.GetGroup() != null && _owner.GetGroup().IsRaidGroup() && !quest.IsAllowedInRaid(referencePlayer.GetMap().GetDifficultyID())) { Log.outTrace(LogFilter.Achievement, $"QuestObjectiveCriteriaMgr.CanUpdateCriteriaTree: (Id: {criteria.Id} Type {criteria.Entry.Type} Quest Objective {objective.Id}) Quest cannot be completed in raid group"); return false; diff --git a/Source/Game/Scenarios/Scenario.cs b/Source/Game/Scenarios/Scenario.cs index 73bcd000c..517dd1e3d 100644 --- a/Source/Game/Scenarios/Scenario.cs +++ b/Source/Game/Scenarios/Scenario.cs @@ -39,7 +39,7 @@ namespace Game.Scenarios foreach (ObjectGuid guid in _players) { Player player = Global.ObjAccessor.GetPlayer(_map, guid); - if (player) + if (player != null) SendBootPlayer(player); } @@ -60,7 +60,7 @@ namespace Game.Scenarios foreach (ObjectGuid guid in _players) { Player player = Global.ObjAccessor.GetPlayer(_map, guid); - if (player) + if (player != null) player.RewardQuest(quest, LootItemType.Item, 0, null, false); } } @@ -223,7 +223,7 @@ namespace Game.Scenarios foreach (ObjectGuid guid in _players) { Player player = Global.ObjAccessor.GetPlayer(_map, guid); - if (player) + if (player != null) player.SendPacket(data); } } diff --git a/Source/Game/Scripting/CoreScripts.cs b/Source/Game/Scripting/CoreScripts.cs index f7cea23d4..5d67c2847 100644 --- a/Source/Game/Scripting/CoreScripts.cs +++ b/Source/Game/Scripting/CoreScripts.cs @@ -58,7 +58,11 @@ namespace Game.Scripting player.PlayerTalkClass.GetGossipMenu().AddMenuItem(gossipMenuID, gossipMenuItemID, sender, action); } public static void SendGossipMenuFor(Player player, uint npcTextID, ObjectGuid guid) { player.PlayerTalkClass.SendGossipMenu(npcTextID, guid); } - public static void SendGossipMenuFor(Player player, uint npcTextID, Creature creature) { if (creature) SendGossipMenuFor(player, npcTextID, creature.GetGUID()); } + public static void SendGossipMenuFor(Player player, uint npcTextID, Creature creature) + { + if (creature != null) + SendGossipMenuFor(player, npcTextID, creature.GetGUID()); + } public static void CloseGossipMenuFor(Player player) { player.PlayerTalkClass.SendCloseGossip(); } string _name; diff --git a/Source/Game/Scripting/ScriptManager.cs b/Source/Game/Scripting/ScriptManager.cs index 79a6da947..8055c4985 100644 --- a/Source/Game/Scripting/ScriptManager.cs +++ b/Source/Game/Scripting/ScriptManager.cs @@ -547,14 +547,14 @@ namespace Game.Scripting } public bool OnItemUse(Player player, Item item, SpellCastTargets targets, ObjectGuid castId) { - Cypher.Assert(player); - Cypher.Assert(item); + Cypher.Assert(player != null); + Cypher.Assert(item != null); return RunScriptRet(p => p.OnUse(player, item, targets, castId), item.GetScriptId()); } public bool OnItemExpire(Player player, ItemTemplate proto) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(proto != null); return RunScriptRet(p => p.OnExpire(player, proto), proto.ScriptId); @@ -951,27 +951,27 @@ namespace Game.Scripting // GroupScript public void OnGroupAddMember(Group group, ObjectGuid guid) { - Cypher.Assert(group); + Cypher.Assert(group != null); ForEach(p => p.OnAddMember(group, guid)); } public void OnGroupInviteMember(Group group, ObjectGuid guid) { - Cypher.Assert(group); + Cypher.Assert(group != null); ForEach(p => p.OnInviteMember(group, guid)); } public void OnGroupRemoveMember(Group group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, string reason) { - Cypher.Assert(group); + Cypher.Assert(group != null); ForEach(p => p.OnRemoveMember(group, guid, method, kicker, reason)); } public void OnGroupChangeLeader(Group group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid) { - Cypher.Assert(group); + Cypher.Assert(group != null); ForEach(p => p.OnChangeLeader(group, newLeaderGuid, oldLeaderGuid)); } public void OnGroupDisband(Group group) { - Cypher.Assert(group); + Cypher.Assert(group != null); ForEach(p => p.OnDisband(group)); } @@ -1010,7 +1010,7 @@ namespace Game.Scripting // AreaTriggerEntityScript public AreaTriggerAI GetAreaTriggerAI(AreaTrigger areaTrigger) { - Cypher.Assert(areaTrigger); + Cypher.Assert(areaTrigger != null); return RunScriptRet(p => p.GetAI(areaTrigger), areaTrigger.GetScriptId(), null); } @@ -1048,28 +1048,28 @@ namespace Game.Scripting //SceneScript public void OnSceneStart(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(sceneTemplate != null); RunScript(script => script.OnSceneStart(player, sceneInstanceID, sceneTemplate), sceneTemplate.ScriptId); } public void OnSceneTrigger(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate, string triggerName) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(sceneTemplate != null); RunScript(script => script.OnSceneTriggerEvent(player, sceneInstanceID, sceneTemplate, triggerName), sceneTemplate.ScriptId); } public void OnSceneCancel(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(sceneTemplate != null); RunScript(script => script.OnSceneCancel(player, sceneInstanceID, sceneTemplate), sceneTemplate.ScriptId); } public void OnSceneComplete(Player player, uint sceneInstanceID, SceneTemplate sceneTemplate) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(sceneTemplate != null); RunScript(script => script.OnSceneComplete(player, sceneInstanceID, sceneTemplate), sceneTemplate.ScriptId); @@ -1078,21 +1078,21 @@ namespace Game.Scripting //QuestScript public void OnQuestStatusChange(Player player, Quest quest, QuestStatus oldStatus, QuestStatus newStatus) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(quest != null); RunScript(script => script.OnQuestStatusChange(player, quest, oldStatus, newStatus), quest.ScriptId); } public void OnQuestAcknowledgeAutoAccept(Player player, Quest quest) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(quest != null); RunScript(script => script.OnAcknowledgeAutoAccept(player, quest), quest.ScriptId); } public void OnQuestObjectiveChange(Player player, Quest quest, QuestObjective objective, int oldAmount, int newAmount) { - Cypher.Assert(player); + Cypher.Assert(player != null); Cypher.Assert(quest != null); RunScript(script => script.OnQuestObjectiveChange(player, quest, objective, oldAmount, newAmount), quest.ScriptId); diff --git a/Source/Game/Scripting/SpellScript.cs b/Source/Game/Scripting/SpellScript.cs index 530d0d5e8..79a423756 100644 --- a/Source/Game/Scripting/SpellScript.cs +++ b/Source/Game/Scripting/SpellScript.cs @@ -1052,7 +1052,7 @@ namespace Game.Scripting var tempTargets = targets.Select(target => { int negativePoints = 0; - if (prioritizeGroupMembersOf && (!target.IsUnit() || target.ToUnit().IsInRaidWith(prioritizeGroupMembersOf))) + if (prioritizeGroupMembersOf != null && (!target.IsUnit() || target.ToUnit().IsInRaidWith(prioritizeGroupMembersOf))) negativePoints |= 1 << NOT_GROUPED; if (prioritizePlayers && !target.IsPlayer() && (!target.IsCreature() || !target.ToCreature().HasFlag(CreatureStaticFlags4.TreatAsRaidUnitForHelpfulSpells))) diff --git a/Source/Game/Server/WorldSession.cs b/Source/Game/Server/WorldSession.cs index 6c94aac48..8877f44cc 100644 --- a/Source/Game/Server/WorldSession.cs +++ b/Source/Game/Server/WorldSession.cs @@ -53,7 +53,7 @@ namespace Game public void Dispose() { // unload player if not unloaded - if (_player) + if (_player != null) LogoutPlayer(true); // - If have unclosed socket, close it @@ -78,13 +78,13 @@ namespace Game return; // finish pending transfers before starting the logout - while (_player && _player.IsBeingTeleportedFar()) + while (_player != null && _player.IsBeingTeleportedFar()) HandleMoveWorldportAck(); m_playerLogout = true; m_playerSave = save; - if (_player) + if (_player != null) { if (!_player.GetLootGUID().IsEmpty()) DoLootReleaseAll(); @@ -113,7 +113,7 @@ namespace Game //drop a flag if player is carrying it Battleground bg = GetPlayer().GetBattleground(); - if (bg) + if (bg != null) bg.EventPlayerLoggedOut(GetPlayer()); // Teleport to home if the player is in an invalid instance @@ -140,7 +140,7 @@ namespace Game // If the player is in a guild, update the guild roster and broadcast a logout message to other guild members Guild guild = Global.GuildMgr.GetGuildById(_player.GetGuildId()); - if (guild) + if (guild != null) guild.HandleMemberLogout(this); // Remove pet @@ -250,7 +250,7 @@ namespace Game switch (handler.sessionStatus) { case SessionStatus.Loggedin: - if (!_player) + if (_player == null) { if (!m_playerRecentlyLogout) { @@ -266,13 +266,13 @@ namespace Game handler.Invoke(this, packet); break; case SessionStatus.LoggedinOrRecentlyLogout: - if (!_player && !m_playerRecentlyLogout && !m_playerLogout) + if (_player == null && !m_playerRecentlyLogout && !m_playerLogout) LogUnexpectedOpcode(packet, handler.sessionStatus, "the player has not logged in yet and not recently logout"); else if (AntiDOS.EvaluateOpcode(packet, currentTime)) handler.Invoke(this, packet); break; case SessionStatus.Transfer: - if (!_player) + if (_player == null) LogUnexpectedOpcode(packet, handler.sessionStatus, "the player has not logged in yet"); else if (_player.IsInWorld) LogUnexpectedOpcode(packet, handler.sessionStatus, "the player is still in world"); @@ -345,7 +345,7 @@ namespace Game _warden.Update(diff); expireTime -= expireTime > diff ? diff : expireTime; - if (expireTime < diff || forceExit || !GetPlayer()) + if (expireTime < diff || forceExit || GetPlayer() == null) { if (m_Socket[(int)ConnectionType.Realm] != null) { @@ -408,7 +408,7 @@ namespace Game public void KickPlayer(string reason) { - Log.outInfo(LogFilter.Network, $"Account: {GetAccountId()} Character: '{(_player ? _player.GetName() : "")}' {(_player ? _player.GetGUID() : "")} kicked with reason: {reason}"); + Log.outInfo(LogFilter.Network, $"Account: {GetAccountId()} Character: '{(_player != null ? _player.GetName() : "")}' {(_player != null ? _player.GetGUID() : "")} kicked with reason: {reason}"); for (byte i = 0; i < 2; ++i) { @@ -621,7 +621,7 @@ namespace Game { _player = pl; - if (_player) + if (_player != null) m_GUIDLow = _player.GetGUID().GetCounter(); } @@ -636,7 +636,7 @@ namespace Game ss.Append("[Player: "); if (!m_playerLoading.IsEmpty()) ss.AppendFormat("Logging in: {0}, ", m_playerLoading.ToString()); - else if (_player) + else if (_player != null) ss.AppendFormat("{0} {1}, ", _player.GetName(), _player.GetGUID().ToString()); ss.AppendFormat("Account: {0}]", GetAccountId()); @@ -901,7 +901,7 @@ namespace Game public void SetLatency(uint latency) { m_latency = latency; } public void ResetTimeOutTime(bool onlyActive) { - if (GetPlayer()) + if (GetPlayer() != null) m_timeOutTime = GameTime.GetGameTime() + WorldConfig.GetIntValue(WorldCfg.SocketTimeoutTimeActive); else if (!onlyActive) m_timeOutTime = GameTime.GetGameTime() + WorldConfig.GetIntValue(WorldCfg.SocketTimeoutTime); @@ -927,11 +927,6 @@ namespace Game void SetRealmListSecret(Array secret) { _realmListSecret = secret; } public Dictionary GetRealmCharacterCounts() { return _realmCharacterCounts; } - public static implicit operator bool(WorldSession session) - { - return session != null; - } - #region Fields List _legitCharacters = new(); ulong m_GUIDLow; diff --git a/Source/Game/Spells/Auras/Aura.cs b/Source/Game/Spells/Auras/Aura.cs index 56b192783..1ec98040f 100644 --- a/Source/Game/Spells/Auras/Aura.cs +++ b/Source/Game/Spells/Auras/Aura.cs @@ -336,12 +336,12 @@ namespace Game.Spells m_castItemGuid = createInfo.CastItemGUID; m_castItemId = createInfo.CastItemId; m_castItemLevel = createInfo.CastItemLevel; - m_spellVisual = new SpellCastVisual(createInfo.Caster ? createInfo.Caster.GetCastSpellXSpellVisualId(createInfo._spellInfo) : createInfo._spellInfo.GetSpellXSpellVisualId(), 0); + m_spellVisual = new SpellCastVisual(createInfo.Caster != null ? createInfo.Caster.GetCastSpellXSpellVisualId(createInfo._spellInfo) : createInfo._spellInfo.GetSpellXSpellVisualId(), 0); m_applyTime = GameTime.GetGameTime(); m_owner = createInfo._owner; m_timeCla = 0; m_updateTargetMapInterval = 0; - m_casterLevel = createInfo.Caster ? createInfo.Caster.GetLevel() : m_spellInfo.SpellLevel; + m_casterLevel = createInfo.Caster != null ? createInfo.Caster.GetLevel() : m_spellInfo.SpellLevel; m_procCharges = 0; m_stackAmount = 1; m_isRemoved = false; @@ -452,7 +452,7 @@ namespace Game.Spells if (app == null) { Log.outError(LogFilter.Spells, "Aura._UnapplyForTarget, target: {0}, caster: {1}, spell: {2} was not found in owners application map!", - target.GetGUID().ToString(), caster ? caster.GetGUID().ToString() : "", auraApp.GetBase().GetSpellInfo().Id); + target.GetGUID().ToString(), caster != null ? caster.GetGUID().ToString() : "", auraApp.GetBase().GetSpellInfo().Id); Cypher.Assert(false); } @@ -773,10 +773,10 @@ namespace Game.Spells if (withMods) { Unit caster = GetCaster(); - if (caster) + if (caster != null) { Player modOwner = caster.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) modOwner.ApplySpellMod(GetSpellInfo(), SpellModOp.Duration, ref duration); } } @@ -788,7 +788,7 @@ namespace Game.Spells public void RefreshDuration(bool withMods = false) { Unit caster = GetCaster(); - if (withMods && caster) + if (withMods && caster != null) { int duration = m_spellInfo.GetMaxDuration(); // Calculate duration of periodics affected by haste. @@ -872,7 +872,7 @@ namespace Game.Spells // only units have events Unit owner = m_owner.ToUnit(); - if (!owner) + if (owner == null) return; m_dropEvent = new ChargeDropEvent(this, removeMode); @@ -1589,10 +1589,10 @@ namespace Game.Spells if (HasEffectType(AuraType.ControlVehicle) && existingAura.HasEffectType(AuraType.ControlVehicle)) { Vehicle veh = null; - if (GetOwner().ToUnit()) + if (GetOwner().ToUnit() != null) veh = GetOwner().ToUnit().GetVehicleKit(); - if (!veh) // We should probably just let it stack. Vehicle system will prevent undefined behaviour later + if (veh == null) // We should probably just let it stack. Vehicle system will prevent undefined behaviour later return true; if (veh.GetAvailableSeatCount() == 0) @@ -1803,7 +1803,7 @@ namespace Game.Spells item = target.ToPlayer().GetUseableItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand); } - if (!item || item.IsBroken() || !item.IsFitToSpellRequirements(GetSpellInfo())) + if (item == null || item.IsBroken() || !item.IsFitToSpellRequirements(GetSpellInfo())) return 0; } } @@ -2717,7 +2717,7 @@ namespace Game.Spells if (target == null && targetPair.Key == GetUnitOwner().GetGUID()) target = GetUnitOwner(); - if (target) + if (target != null) targets.Add(target, targetPair.Value); } diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs index 49421cafa..6ba7bc1f8 100644 --- a/Source/Game/Spells/Auras/AuraEffect.cs +++ b/Source/Game/Spells/Auras/AuraEffect.cs @@ -96,7 +96,7 @@ namespace Game.Spells amount = (int)mountCapability.Id; break; case AuraType.ShowConfirmationPromptWithDifficulty: - if (caster) + if (caster != null) amount = (int)caster.GetMap().GetDifficultyID(); m_canBeRecalculated = false; break; @@ -144,7 +144,7 @@ namespace Game.Spells public float? CalculateEstimatedAmount(Unit caster, int amount) { - if (!caster || GetBase().GetAuraType() != AuraObjectType.Unit) + if (caster == null || GetBase().GetAuraType() != AuraObjectType.Unit) return null; return CalculateEstimatedAmount(caster, GetBase().GetUnitOwner(), GetSpellInfo(), GetSpellEffectInfo(), amount, GetBase().GetStackAmount(), this); @@ -2422,7 +2422,7 @@ namespace Game.Spells Unit caster = GetCaster(); Unit target = aurApp.GetTarget(); - if (!caster || !caster.IsAlive() || !target.IsAlive() || !caster.CanHaveThreatList()) + if (caster == null || !caster.IsAlive() || !target.IsAlive() || !caster.CanHaveThreatList()) return; caster.GetThreatManager().TauntUpdate(); @@ -2863,7 +2863,7 @@ namespace Game.Spells if (player.InBattleground()) { Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) bg.EventPlayerDroppedFlag(player); } else @@ -3228,7 +3228,7 @@ namespace Game.Spells return; Player player = aurApp.GetTarget().ToPlayer(); - if (player) + if (player != null) player.UpdateHealingDonePercentMod(); } @@ -3300,7 +3300,7 @@ namespace Game.Spells // only players have primary stats Player player = aurApp.GetTarget().ToPlayer(); - if (!player) + if (player == null) return; player.UpdateArmor(); @@ -3359,7 +3359,7 @@ namespace Game.Spells return; Player target = aurApp.GetTarget().ToPlayer(); - if (!target) + if (target == null) return; target.ApplyModOverrideSpellPowerByAPPercent(GetAmount(), apply); @@ -3373,7 +3373,7 @@ namespace Game.Spells return; Player target = aurApp.GetTarget().ToPlayer(); - if (!target) + if (target == null) return; target.ApplyModOverrideAPBySpellPowerPercent(GetAmount(), apply); @@ -3388,7 +3388,7 @@ namespace Game.Spells return; Player target = aurApp.GetTarget().ToPlayer(); - if (target) + if (target != null) { target.SetVersatilityBonus(target.GetTotalAuraModifier(AuraType.ModVersatility)); target.UpdateHealingDonePercentMod(); @@ -3790,7 +3790,7 @@ namespace Game.Spells return; Player target = aurApp.GetTarget().ToPlayer(); - if (!target) + if (target == null) return; target.UpdateAllWeaponDependentCritAuras(); @@ -4116,7 +4116,7 @@ namespace Game.Spells } Guardian pet = playerTarget.GetGuardianPet(); - if (pet) + if (pet != null) pet.UpdateAttackPowerAndDamage(); } } @@ -4177,7 +4177,7 @@ namespace Game.Spells return; Player target = aurApp.GetTarget().ToPlayer(); - if (!target) + if (target == null) return; if (apply) @@ -4463,7 +4463,7 @@ namespace Game.Spells case 57821: // Champion of the Kirin Tor case 57822: // Wyrmrest Champion { - if (!caster || !caster.IsTypeId(TypeId.Player)) + if (caster == null || !caster.IsTypeId(TypeId.Player)) break; uint FactionID = 0; @@ -4724,7 +4724,7 @@ namespace Game.Spells return; Unit caster = triggeredSpellInfo.NeedsToBeTriggeredByCaster(m_spellInfo) ? GetCaster() : target; - if (!caster) + if (caster == null) return; if (mode.HasAnyFlag(AuraEffectHandleModes.Real)) @@ -4861,7 +4861,7 @@ namespace Game.Spells target.m_invisibilityDetect.AddValue(InvisibilityType.Drunk, GetAmount()); Player playerTarget = target.ToPlayer(); - if (playerTarget) + if (playerTarget != null) playerTarget.ApplyModFakeInebriation(GetAmount(), true); } else @@ -5189,7 +5189,7 @@ namespace Game.Spells // ignore negative values (can be result apply spellmods to aura damage uint damage = (uint)Math.Max(GetAmount(), 0); - if (caster) + if (caster != null) damage = (uint)caster.SpellDamageBonusDone(target, GetSpellInfo(), (int)damage, DamageEffectType.DOT, GetSpellEffectInfo(), stackAmountForBonuses, null, this); damage = (uint)target.SpellDamageBonusTaken(caster, GetSpellInfo(), (int)damage, DamageEffectType.DOT); @@ -5249,7 +5249,7 @@ namespace Game.Spells Unit.ProcSkillsAndAuras(caster, target, procAttacker, procVictim, ProcFlagsSpellType.Damage, ProcFlagsSpellPhase.Hit, hitMask, null, damageInfo, null); // process caster heal from now on (must be in world) - if (!caster || !caster.IsAlive()) + if (caster == null || !caster.IsAlive()) return; float gainMultiplier = GetSpellEffectInfo().CalcValueMultiplier(caster); @@ -5533,11 +5533,11 @@ namespace Game.Spells float CalcPeriodicCritChance(Unit caster) { - if (!caster || !CanPeriodicTickCrit()) + if (caster == null || !CanPeriodicTickCrit()) return 0.0f; Player modOwner = caster.GetSpellModOwner(); - if (!modOwner) + if (modOwner == null) return 0.0f; float critChance = modOwner.SpellCritChanceDone(null, this, GetSpellInfo().GetSchoolMask(), GetSpellInfo().GetAttackType()); @@ -5678,7 +5678,7 @@ namespace Game.Spells return; Player player = aurApp.GetTarget().ToPlayer(); - if (!player) + if (player == null) return; if (apply) @@ -5694,14 +5694,14 @@ namespace Game.Spells return; Player player = aurApp.GetTarget().ToPlayer(); - if (!player) + if (player == null) return; if (player.GetClass() != Class.Hunter) return; Pet pet = player.GetPet(); - if (!pet) + if (pet == null) return; ChrSpecializationRecord currSpec = CliDB.ChrSpecializationStorage.LookupByKey(pet.GetSpecialization()); @@ -5734,7 +5734,7 @@ namespace Game.Spells return; Player player = aurApp.GetTarget().ToPlayer(); - if (!player) + if (player == null) return; if (apply) @@ -5758,7 +5758,7 @@ namespace Game.Spells else { Unit caster = GetCaster(); - if (caster) + if (caster != null) caster.RemoveAreaTrigger(this); } } @@ -5770,7 +5770,7 @@ namespace Game.Spells return; Player target = auraApp.GetTarget().ToPlayer(); - if (target) + if (target != null) { if (apply) target.TogglePvpTalents(true); @@ -5827,7 +5827,7 @@ namespace Game.Spells else { TempSummon tempSummon = creature.ToTempSummon(); - if (tempSummon) + if (tempSummon != null) { if (tempSummon.GetSummonerGUID() == target.GetGUID()) { @@ -5848,7 +5848,7 @@ namespace Game.Spells return; Player target = aurApp.GetTarget().ToPlayer(); - if (!target) + if (target == null) return; target.UpdatePvPState(true); diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs index bfa6e43e0..c78a5effe 100644 --- a/Source/Game/Spells/Spell.cs +++ b/Source/Game/Spells/Spell.cs @@ -114,7 +114,7 @@ namespace Game.Spells m_selfContainer = null; } - if (m_caster && m_caster.GetTypeId() == TypeId.Player) + if (m_caster != null && m_caster.GetTypeId() == TypeId.Player) Cypher.Assert(m_caster.ToPlayer().m_spellModTakingSpell != this); } @@ -132,7 +132,7 @@ namespace Game.Spells { // check if object target is valid with needed target flags // for unit case allow corpse target mask because player with not released corpse is a unit target - if ((target.ToUnit() && !neededTargets.HasAnyFlag(SpellCastTargetFlags.UnitMask | SpellCastTargetFlags.CorpseMask)) + if ((target.ToUnit() != null && !neededTargets.HasAnyFlag(SpellCastTargetFlags.UnitMask | SpellCastTargetFlags.CorpseMask)) || (target.IsTypeId(TypeId.GameObject) && !neededTargets.HasFlag(SpellCastTargetFlags.GameobjectMask)) || (target.IsTypeId(TypeId.Corpse) && !neededTargets.HasFlag(SpellCastTargetFlags.CorpseMask))) m_targets.RemoveObjectTarget(); @@ -513,8 +513,8 @@ namespace Game.Spells WorldObject target = Global.ObjAccessor.GetUnit(m_caster, channelTarget); CallScriptObjectTargetSelectHandlers(ref target, spellEffectInfo.EffectIndex, targetType); // unit target may be no longer avalible - teleported out of map for example - Unit unitTarget = target ? target.ToUnit() : null; - if (unitTarget) + Unit unitTarget = target?.ToUnit(); + if (unitTarget != null) AddUnitTarget(unitTarget, 1u << (int)spellEffectInfo.EffectIndex); else Log.outDebug(LogFilter.Spells, "SPELL: cannot find channel spell target for spell ID {0}, effect {1}", m_spellInfo.Id, spellEffectInfo.EffectIndex); @@ -532,7 +532,7 @@ namespace Game.Spells if (target != null) { CallScriptObjectTargetSelectHandlers(ref target, spellEffectInfo.EffectIndex, targetType); - if (target) + if (target != null) { SpellDestination dest = new(target); if (m_spellInfo.HasAttribute(SpellAttr4.UseFacingFromSpell)) @@ -684,7 +684,7 @@ namespace Game.Spells } CallScriptObjectTargetSelectHandlers(ref target, spellEffectInfo.EffectIndex, targetType); - if (!target) + if (target == null) { Log.outDebug(LogFilter.Spells, $"Spell.SelectImplicitNearbyTargets: OnObjectTargetSelect script hook for spell Id {m_spellInfo.Id} set NULL target, effect {spellEffectInfo.EffectIndex}"); SendCastResult(SpellCastResult.BadImplicitTargets); @@ -971,7 +971,7 @@ namespace Game.Spells { Log.outDebug(LogFilter.Spells, "SPELL: unknown target coordinates for spell ID {0}", m_spellInfo.Id); WorldObject target = m_targets.GetObjectTarget(); - if (target) + if (target != null) dest = new SpellDestination(target); } break; @@ -1286,7 +1286,7 @@ namespace Game.Spells CallScriptObjectTargetSelectHandlers(ref target, spellEffectInfo.EffectIndex, targetType); - if (target) + if (target != null) { if (target.IsUnit()) AddUnitTarget(target.ToUnit(), 1u << (int)spellEffectInfo.EffectIndex, checkIfValid); @@ -1324,7 +1324,7 @@ namespace Game.Spells { int maxTargets = spellEffectInfo.ChainTargets; Player modOwner = m_caster.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) modOwner.ApplySpellMod(m_spellInfo, SpellModOp.ChainTargets, ref maxTargets, this); if (maxTargets > 1) @@ -1347,7 +1347,7 @@ namespace Game.Spells foreach (var obj in targets) { Unit unitTarget = obj.ToUnit(); - if (unitTarget) + if (unitTarget != null) AddUnitTarget(unitTarget, effMask, false, true, losPosition); if (!m_spellInfo.HasAttribute(SpellAttr2.ChainFromCaster) && !spellEffectInfo.EffectAttributes.HasFlag(SpellEffectAttributes.ChainFromInitialTarget)) @@ -1407,15 +1407,15 @@ namespace Game.Spells continue; Unit unitTarget = obj.ToUnit(); - if (unitTarget) + if (unitTarget != null) { - if (unitCaster == obj || unitCaster.IsOnVehicle(unitTarget) || unitTarget.GetVehicle()) + if (unitCaster == obj || unitCaster.IsOnVehicle(unitTarget) || unitTarget.GetVehicle() != null) continue; Creature creatureTarget = unitTarget.ToCreature(); - if (creatureTarget) + if (creatureTarget != null) { - if (!creatureTarget.GetCreatureDifficulty().TypeFlags.HasFlag(CreatureTypeFlags.CollideWithMissiles)) + if (creatureTarget.GetCreatureDifficulty().TypeFlags.HasFlag(CreatureTypeFlags.CollideWithMissiles)) continue; } } @@ -1737,7 +1737,7 @@ namespace Game.Spells } Player modOwner = m_caster.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) modOwner.ApplySpellMod(m_spellInfo, SpellModOp.ChainJumpDistance, ref jumpRadius, this); float searchRadius; @@ -1908,7 +1908,7 @@ namespace Game.Spells targetInfo.IsAlive = target.IsAlive(); // Calculate hit result - WorldObject caster = m_originalCaster ? m_originalCaster : m_caster; + WorldObject caster = m_originalCaster != null ? m_originalCaster : m_caster; targetInfo.MissCondition = caster.SpellHitResult(target, m_spellInfo, m_canReflect && !(IsPositive() && m_caster.IsFriendlyTo(target))); // Spell have speed - need calculate incoming time @@ -2170,7 +2170,7 @@ namespace Game.Spells } Player casterPlayer = m_caster.ToPlayer(); - if (casterPlayer) + if (casterPlayer != null) { casterPlayer.StartCriteriaTimer(CriteriaStartEvent.CastSpell, m_spellInfo.Id); casterPlayer.UpdateCriteria(CriteriaType.LandTargetedSpellOnTarget, m_spellInfo.Id, 0, 0, unit); @@ -2201,7 +2201,7 @@ namespace Game.Spells } } - if (m_originalCaster && unit.IsInCombat() && m_spellInfo.HasInitialAggro()) + if (m_originalCaster != null && unit.IsInCombat() && m_spellInfo.HasInitialAggro()) { if (m_originalCaster.HasUnitFlag(UnitFlags.PlayerControlled)) // only do explicit combat forwarding for PvP enabled units m_originalCaster.GetCombatManager().InheritCombatStatesFrom(unit); // for creature v creature combat, the threat forward does it for us @@ -2212,7 +2212,7 @@ namespace Game.Spells // original caster for auras WorldObject origCaster = m_caster; - if (m_originalCaster) + if (m_originalCaster != null) origCaster = m_originalCaster; // check immunity due to diminishing returns @@ -2272,7 +2272,7 @@ namespace Game.Spells if (aura_effmask != 0) { WorldObject caster = m_caster; - if (m_originalCaster) + if (m_originalCaster != null) caster = m_originalCaster; if (caster != null) @@ -2495,7 +2495,7 @@ namespace Game.Spells m_castItemEntry = m_CastItem.GetEntry(); Player owner = m_CastItem.GetOwner(); - if (owner) + if (owner != null) m_castItemLevel = (int)m_CastItem.GetItemLevel(owner); else if (m_CastItem.GetOwnerGUID() == m_caster.GetGUID()) m_castItemLevel = (int)m_CastItem.GetItemLevel(m_caster.ToPlayer()); @@ -2595,7 +2595,7 @@ namespace Game.Spells { // Channeled spells and some triggered spells do not focus a cast target. They face their target later on via channel object guid and via spell attribute or not at all bool focusTarget = !m_spellInfo.IsChanneled() && !_triggeredCastFlags.HasFlag(TriggerCastFlags.IgnoreSetFacing); - if (focusTarget && m_targets.GetObjectTarget() && m_caster != m_targets.GetObjectTarget()) + if (focusTarget && m_targets.GetObjectTarget() != null && m_caster != m_targets.GetObjectTarget()) m_caster.ToCreature().SetSpellFocus(this, m_targets.GetObjectTarget()); else m_caster.ToCreature().SetSpellFocus(this, null); @@ -2719,7 +2719,7 @@ namespace Game.Spells { Player modOwner = m_caster.GetSpellModOwner(); Spell lastSpellMod = null; - if (modOwner) + if (modOwner != null) { lastSpellMod = modOwner.m_spellModTakingSpell; if (lastSpellMod != null) @@ -2798,7 +2798,7 @@ namespace Game.Spells SendCastResult(result, param1, param2); SendInterrupted(0); - if (modOwner) + if (modOwner != null) modOwner.SetSpellModTakingSpell(this, false); Finish(result); @@ -2817,7 +2817,7 @@ namespace Game.Spells // if trade not complete then remember it in trade data if (Convert.ToBoolean(m_targets.GetTargetMask() & SpellCastTargetFlags.TradeItem)) { - if (modOwner) + if (modOwner != null) { TradeData my_trade = modOwner.GetTradeData(); if (my_trade != null) @@ -2849,7 +2849,7 @@ namespace Game.Spells DiminishingReturnsType type = m_spellInfo.GetDiminishingReturnsGroupType(); if (type == DiminishingReturnsType.All || (type == DiminishingReturnsType.Player && target.IsAffectedByDiminishingReturns())) { - Unit caster1 = m_originalCaster ? m_originalCaster : m_caster.ToUnit(); + Unit caster1 = m_originalCaster != null ? m_originalCaster : m_caster.ToUnit(); if (caster1 != null) { if (target.HasStrongerAuraWithDR(m_spellInfo, caster1)) @@ -2868,7 +2868,7 @@ namespace Game.Spells Creature creatureCaster = m_caster.ToCreature(); if (creatureCaster != null) { - if (!creatureCaster.GetTarget().IsEmpty() && !creatureCaster.HasUnitFlag(UnitFlags.Possessed)) + if (creatureCaster.GetTarget().IsEmpty() && !creatureCaster.HasUnitFlag(UnitFlags.Possessed)) { WorldObject target = Global.ObjAccessor.GetUnit(creatureCaster, creatureCaster.GetTarget()); if (target != null) @@ -3008,7 +3008,7 @@ namespace Game.Spells SetExecutedCurrently(false); - if (!m_originalCaster) + if (m_originalCaster == null) return; // Handle procs on cast @@ -3052,7 +3052,7 @@ namespace Game.Spells // Call CreatureAI hook OnSpellCast Creature caster = m_originalCaster.ToCreature(); - if (caster) + if (caster != null) if (caster.IsAIEnabled()) caster.GetAI().OnSpellCast(GetSpellInfo()); } @@ -3223,7 +3223,7 @@ namespace Game.Spells FinishTargetProcessing(); - if (modOwner) + if (modOwner != null) modOwner.SetSpellModTakingSpell(this, false); // All targets passed - need finish phase @@ -3272,7 +3272,7 @@ namespace Game.Spells unitCaster.SetLastExtraAttackSpell(m_spellInfo.Id); // Handle procs on finish - if (!m_originalCaster) + if (m_originalCaster == null) return; ProcFlagsInit procAttacker = m_procAttacker; @@ -3310,7 +3310,7 @@ namespace Game.Spells if (!m_caster.IsUnit()) return; - if (m_CastItem) + if (m_CastItem != null) m_caster.ToUnit().GetSpellHistory().HandleCooldowns(m_spellInfo, m_CastItem, this); else m_caster.ToUnit().GetSpellHistory().HandleCooldowns(m_spellInfo, m_castItemEntry, this); @@ -3377,7 +3377,7 @@ namespace Game.Spells foreach (TargetInfo target in m_UniqueTargetInfo) { Unit unit = m_caster.GetGUID() == target.TargetGUID ? m_caster.ToUnit() : Global.ObjAccessor.GetUnit(m_caster, target.TargetGUID); - if (unit) + if (unit != null) unit.RemoveOwnedAura(m_spellInfo.Id, m_originalCasterGUID, 0, AuraRemoveMode.Cancel); } } @@ -3416,7 +3416,7 @@ namespace Game.Spells m_spellState = SpellState.Finished; - if (!m_caster) + if (m_caster == null) return; Unit unitCaster = m_caster.ToUnit(); @@ -3732,7 +3732,7 @@ namespace Game.Spells return; Unit owner = m_caster.GetCharmerOrOwner(); - if (!owner || !owner.IsTypeId(TypeId.Player)) + if (owner == null || !owner.IsTypeId(TypeId.Player)) return; if (_triggeredCastFlags.HasAnyFlag(TriggerCastFlags.DontReportCastError)) @@ -3804,7 +3804,7 @@ namespace Game.Spells SpellStart packet = new(); SpellCastData castData = packet.Cast; - if (m_CastItem) + if (m_CastItem != null) castData.CasterGUID = m_CastItem.GetGUID(); else castData.CasterGUID = m_caster.GetGUID(); @@ -3840,7 +3840,7 @@ namespace Game.Spells //The creature is the mover of a player, so HandleCastSpellOpcode uses it as the caster Player player = m_caster.ToPlayer(); - if (player) + if (player != null) { runeData.Start = m_runesState; // runes state before runeData.Count = player.GetRunesState(); // runes state after @@ -4020,7 +4020,7 @@ namespace Game.Spells if (playerCaster != null) { Item pItem = playerCaster.GetWeaponForAttack(WeaponAttackType.RangedAttack); - if (pItem) + if (pItem != null) { ammoInventoryType = pItem.GetTemplate().GetInventoryType(); if (ammoInventoryType == InventoryType.Thrown) @@ -4310,7 +4310,7 @@ namespace Game.Spells Creature creatureCaster = unitCaster.ToCreature(); if (creatureCaster != null) if (unitCaster.m_unitData.ChannelObjects.Size() == 1 && unitCaster.m_unitData.ChannelObjects[0].IsUnit()) - if (!creatureCaster.HasSpellFocus(this)) + if (creatureCaster.HasSpellFocus(this)) creatureCaster.SetSpellFocus(this, Global.ObjAccessor.GetWorldObject(creatureCaster, unitCaster.m_unitData.ChannelObjects[0])); unitCaster.SetChannelSpellId(m_spellInfo.Id); @@ -4333,7 +4333,7 @@ namespace Game.Spells resurrectRequest.UseTimer = !m_spellInfo.HasAttribute(SpellAttr3.NoResTimer); Pet pet = target.GetPet(); - if (pet) + if (pet != null) { CharmInfo charmInfo = pet.GetCharmInfo(); if (charmInfo != null) @@ -4416,7 +4416,7 @@ namespace Game.Spells { // GameObjects don't use power Unit unitCaster = m_caster.ToUnit(); - if (!unitCaster) + if (unitCaster == null) return; if (m_CastItem != null || m_triggeredByAuraSpell != null) @@ -4485,7 +4485,7 @@ namespace Game.Spells return SpellCastResult.SpellCastOk; Player player = m_caster.ToPlayer(); - if (!player) + if (player == null) return SpellCastResult.SpellCastOk; if (player.GetClass() != Class.Deathknight) @@ -4578,7 +4578,7 @@ namespace Game.Spells void HandleThreatSpells() { // wild GameObject spells don't cause threat - Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit()); + Unit unitCaster = (m_originalCaster != null ? m_originalCaster : m_caster.ToUnit()); if (unitCaster == null) return; @@ -4670,7 +4670,7 @@ namespace Game.Spells SpellCastResult castResult; // check death state - if (m_caster.ToUnit() && !m_caster.ToUnit().IsAlive() && !m_spellInfo.IsPassive() && !(m_spellInfo.HasAttribute(SpellAttr0.AllowCastWhileDead) || (IsTriggered() && m_triggeredByAuraSpell == null))) + if (m_caster.ToUnit() != null && !m_caster.ToUnit().IsAlive() && !m_spellInfo.IsPassive() && !(m_spellInfo.HasAttribute(SpellAttr0.AllowCastWhileDead) || (IsTriggered() && m_triggeredByAuraSpell == null))) return SpellCastResult.CasterDead; // Prevent cheating in case the player has an immunity effect and tries to interact with a non-allowed gameobject. The error message is handled by the client so we don't report anything here @@ -4716,7 +4716,7 @@ namespace Game.Spells } // check if we are using a potion in combat for the 2nd+ time. Cooldown is added only after caster gets out of combat - if (!IsIgnoringCooldowns() && playerCaster.GetLastPotionId() != 0 && m_CastItem && (m_CastItem.IsPotion() || m_spellInfo.IsCooldownStartedOnEvent())) + if (!IsIgnoringCooldowns() && playerCaster.GetLastPotionId() != 0 && m_CastItem != null && (m_CastItem.IsPotion() || m_spellInfo.IsCooldownStartedOnEvent())) return SpellCastResult.NotReady; } @@ -4749,7 +4749,7 @@ namespace Game.Spells if (!IsTriggered() && m_caster.IsTypeId(TypeId.Player)) { Battleground bg = m_caster.ToPlayer().GetBattleground(); - if (bg) + if (bg != null) if (bg.GetStatus() == BattlegroundStatus.WaitLeave) return SpellCastResult.DontReport; } @@ -4907,7 +4907,7 @@ namespace Game.Spells if (IsTriggered() && m_triggeredByAuraSpell != null) { DynamicObject dynObj = m_caster.ToUnit().GetDynObject(m_triggeredByAuraSpell.Id); - if (dynObj) + if (dynObj != null) losTarget = dynObj; } @@ -4989,7 +4989,7 @@ namespace Game.Spells if (!m_caster.IsUnit() || !m_caster.ToUnit().HasAuraTypeWithMiscvalue(AuraType.ProvideSpellFocus, (int)m_spellInfo.RequiresSpellFocus)) { focusObject = SearchSpellFocus(); - if (!focusObject) + if (focusObject == null) return SpellCastResult.RequiresSpellFocus; } } @@ -5172,11 +5172,11 @@ namespace Game.Spells return SpellCastResult.BadTargets; Item foodItem = m_targets.GetItemTarget(); - if (!foodItem) + if (foodItem == null) return SpellCastResult.BadTargets; Pet pet = m_caster.ToPlayer().GetPet(); - if (!pet) + if (pet == null) return SpellCastResult.NoPet; if (!pet.HaveInDiet(foodItem.GetTemplate())) @@ -5496,7 +5496,7 @@ namespace Game.Spells if (m_caster.IsTypeId(TypeId.Player)) { Battleground bg = m_caster.ToPlayer().GetBattleground(); - if (bg) + if (bg != null) if (bg.GetStatus() != BattlegroundStatus.InProgress) return SpellCastResult.TryAgain; } @@ -5537,7 +5537,7 @@ namespace Game.Spells { ChrSpecializationRecord spec = CliDB.ChrSpecializationStorage.LookupByKey(m_misc.SpecializationId); Player playerCaster = m_caster.ToPlayer(); - if (!playerCaster) + if (playerCaster == null) return SpellCastResult.TargetNotPlayer; if (spec == null || (spec.ClassID != (uint)player.GetClass() && !spec.IsPetSpecialization())) @@ -5546,13 +5546,13 @@ namespace Game.Spells if (spec.IsPetSpecialization()) { Pet pet = player.GetPet(); - if (!pet || pet.GetPetType() != PetType.Hunter || pet.GetCharmInfo() == null) + if (pet == null || pet.GetPetType() != PetType.Hunter || pet.GetCharmInfo() == null) return SpellCastResult.NoPet; } // can't change during already started arena/Battleground Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) if (bg.GetStatus() == BattlegroundStatus.InProgress) return SpellCastResult.NotInBattleground; break; @@ -5612,7 +5612,7 @@ namespace Game.Spells case SpellEffectName.GrantBattlepetExperience: { Player playerCaster = m_caster.ToPlayer(); - if (playerCaster == null || !m_targets.GetUnitTarget() || !m_targets.GetUnitTarget().IsCreature()) + if (playerCaster == null || m_targets.GetUnitTarget() == null || !m_targets.GetUnitTarget().IsCreature()) return SpellCastResult.BadTargets; var battlePetMgr = playerCaster.GetSession().GetBattlePetMgr(); @@ -5694,7 +5694,7 @@ namespace Game.Spells case AuraType.ModCharm: case AuraType.AoeCharm: { - Unit unitCaster1 = (m_originalCaster ? m_originalCaster : m_caster.ToUnit()); + Unit unitCaster1 = (m_originalCaster != null ? m_originalCaster : m_caster.ToUnit()); if (unitCaster1 == null) return SpellCastResult.BadTargets; @@ -5859,7 +5859,7 @@ namespace Game.Spells // cooldown Creature creatureCaster = m_caster.ToCreature(); - if (creatureCaster) + if (creatureCaster != null) if (creatureCaster.GetSpellHistory().HasCooldown(m_spellInfo.Id)) return SpellCastResult.NotReady; @@ -5873,7 +5873,7 @@ namespace Game.Spells SpellCastResult CheckCasterAuras(ref int param1) { - Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit()); + Unit unitCaster = (m_originalCaster != null ? m_originalCaster : m_caster.ToUnit()); if (unitCaster == null) return SpellCastResult.SpellCastOk; @@ -5899,7 +5899,7 @@ namespace Game.Spells /*if (!unitCaster.GetCharmerGUID().IsEmpty()) { Unit charmer = unitCaster.GetCharmer(); - if (charmer) + if (charmer != null) if (charmer.GetUnitBeingMoved() != unitCaster && !CheckSpellCancelsCharm(ref param1)) result = SpellCastResult.Charmed; }*/ @@ -6002,7 +6002,7 @@ namespace Game.Spells bool CheckSpellCancelsAuraEffect(AuraType auraType, ref int param1) { - Unit unitCaster = (m_originalCaster ? m_originalCaster : m_caster.ToUnit()); + Unit unitCaster = (m_originalCaster != null ? m_originalCaster : m_caster.ToUnit()); if (unitCaster == null) return false; @@ -6099,7 +6099,7 @@ namespace Game.Spells public bool CanAutoCast(Unit target) { - if (!target) + if (target == null) return (CheckPetCast(target) == SpellCastResult.SpellCastOk); ObjectGuid targetguid = target.GetGUID(); @@ -6171,7 +6171,7 @@ namespace Game.Spells maxRange *= maxRange; Unit target = m_targets.GetUnitTarget(); - if (target && target != m_caster) + if (target != null && target != m_caster) { if (m_caster.GetExactDistSq(target) > maxRange) return SpellCastResult.OutOfRange; @@ -6219,8 +6219,8 @@ namespace Game.Spells if (m_spellInfo.RangeEntry.Flags.HasAnyFlag(SpellRangeFlag.Melee)) { // when the target is not a unit, take the caster's combat reach as the target's combat reach. - if (unitCaster) - rangeMod = unitCaster.GetMeleeRange(target ? target : unitCaster); + if (unitCaster != null) + rangeMod = unitCaster.GetMeleeRange(target != null ? target : unitCaster); } else { @@ -6229,15 +6229,15 @@ namespace Game.Spells { // when the target is not a unit, take the caster's combat reach as the target's combat reach. if (unitCaster != null) - meleeRange = unitCaster.GetMeleeRange(target ? target : unitCaster); + meleeRange = unitCaster.GetMeleeRange(target != null ? target : unitCaster); } minRange = m_caster.GetSpellMinRangeForTarget(target, m_spellInfo) + meleeRange; maxRange = m_caster.GetSpellMaxRangeForTarget(target, m_spellInfo); - if (target || m_targets.GetCorpseTarget()) + if (target != null || m_targets.GetCorpseTarget() != null) { - rangeMod = m_caster.GetCombatReach() + (target ? target.GetCombatReach() : m_caster.GetCombatReach()); + rangeMod = m_caster.GetCombatReach() + (target != null ? target.GetCombatReach() : m_caster.GetCombatReach()); if (minRange > 0.0f && !m_spellInfo.RangeEntry.Flags.HasAnyFlag(SpellRangeFlag.Ranged)) minRange += rangeMod; @@ -6252,12 +6252,12 @@ namespace Game.Spells if (m_spellInfo.HasAttribute(SpellAttr0.UsesRangedSlot) && m_caster.IsTypeId(TypeId.Player)) { Item ranged = m_caster.ToPlayer().GetWeaponForAttack(WeaponAttackType.RangedAttack, true); - if (ranged) + if (ranged != null) maxRange *= ranged.GetTemplate().GetRangedModRange() * 0.01f; } Player modOwner = m_caster.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) modOwner.ApplySpellMod(m_spellInfo, SpellModOp.Range, ref maxRange, this); maxRange += rangeMod; @@ -6311,7 +6311,7 @@ namespace Game.Spells SpellCastResult CheckItems(ref int param1, ref int param2) { Player player = m_caster.ToPlayer(); - if (!player) + if (player == null) return SpellCastResult.SpellCastOk; if (m_CastItem == null) @@ -6675,7 +6675,7 @@ namespace Game.Spells case SpellEffectName.Disenchant: { Item item = m_targets.GetItemTarget(); - if (!item) + if (item == null) return SpellCastResult.CantBeSalvaged; // prevent disenchanting in trade slot @@ -6696,7 +6696,7 @@ namespace Game.Spells case SpellEffectName.Prospecting: { Item item = m_targets.GetItemTarget(); - if (!item) + if (item == null) return SpellCastResult.CantBeProspected; //ensure item is a prospectable ore if (!item.GetTemplate().HasFlag(ItemFlags.IsProspectable)) @@ -6724,7 +6724,7 @@ namespace Game.Spells case SpellEffectName.Milling: { Item item = m_targets.GetItemTarget(); - if (!item) + if (item == null) return SpellCastResult.CantBeMilled; //ensure item is a millable herb if (!item.GetTemplate().HasFlag(ItemFlags.IsMillable)) @@ -6839,7 +6839,7 @@ namespace Game.Spells Item item = player.ToPlayer().GetWeaponForAttack(attackType); // skip spell if no weapon in slot or broken - if (!item || item.IsBroken()) + if (item == null || item.IsBroken()) return SpellCastResult.EquippedItemClass; // skip spell if weapon not fit to triggered spell @@ -6992,7 +6992,7 @@ namespace Game.Spells m_CastItem = m_caster.ToPlayer().GetItemByGuid(m_castItemGUID); m_castItemLevel = -1; // cast item not found, somehow the item is no longer where we expected - if (!m_CastItem) + if (m_CastItem == null) return false; // check if the item is really the same, in case it has been wrapped for example @@ -7059,7 +7059,7 @@ namespace Game.Spells case AuraType.ModCharm: case AuraType.ModPossessPet: case AuraType.AoeCharm: - if (target.GetVehicleKit() && target.GetVehicleKit().IsControllableVehicle()) + if (target.GetVehicleKit() != null && target.GetVehicleKit().IsControllableVehicle()) return false; if (target.IsMounted()) return false; @@ -7103,7 +7103,7 @@ namespace Game.Spells } Corpse corpse = ObjectAccessor.GetCorpse(m_caster, m_targets.GetCorpseTargetGUID()); - if (!corpse) + if (corpse == null) return false; if (target.GetGUID() != corpse.GetOwnerGUID()) @@ -7125,7 +7125,7 @@ namespace Game.Spells WorldObject caster = null; if (m_originalCasterGUID.IsGameObject()) caster = m_caster.GetMap().GetGameObject(m_originalCasterGUID); - if (!caster) + if (caster == null) caster = m_caster; if (target != m_caster && !IsWithinLOS(caster, target, true, ModelIgnoreFlags.M2)) @@ -7250,7 +7250,7 @@ namespace Game.Spells return; // This will only cause combat - the target will engage once the projectile hits (in Spell::TargetInfo::PreprocessTarget) - if (m_originalCaster && targetInfo.MissCondition != SpellMissInfo.Evade && !m_originalCaster.IsFriendlyTo(targetUnit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel)) && (m_spellInfo.HasInitialAggro() || targetUnit.IsEngaged())) + if (m_originalCaster != null && targetInfo.MissCondition != SpellMissInfo.Evade && !m_originalCaster.IsFriendlyTo(targetUnit) && (!m_spellInfo.IsPositive() || m_spellInfo.HasEffect(SpellEffectName.Dispel)) && (m_spellInfo.HasInitialAggro() || targetUnit.IsEngaged())) m_originalCaster.SetInCombatWith(targetUnit, true); Unit unit = null; @@ -7264,7 +7264,7 @@ namespace Game.Spells return; float critChance = m_spellValue.CriticalChance; - if (m_originalCaster) + if (m_originalCaster != null) { if (critChance == 0) critChance = m_originalCaster.SpellCritChanceDone(this, null, m_spellSchoolMask, m_attackType); @@ -7284,7 +7284,7 @@ namespace Game.Spells else if (targetInfo.MissCondition == SpellMissInfo.Reflect && targetInfo.ReflectResult == SpellMissInfo.None) unit = m_caster.ToUnit(); - if (!unit) + if (unit == null) return; m_damage = 0; @@ -7315,7 +7315,7 @@ namespace Game.Spells } } - if (m_originalCaster && m_healing > 0) + if (m_originalCaster != null && m_healing > 0) { bool isAoeTarget = spellEffectInfo.IsTargetingArea() || spellEffectInfo.IsAreaAuraEffect() || spellEffectInfo.IsEffect(SpellEffectName.PersistentAreaAura); if (isAoeTarget || m_spellInfo.HasAttribute(SpellAttr5.TreatAsAreaEffect)) @@ -7370,7 +7370,7 @@ namespace Game.Spells { // check key item (many fit cases can be) case LockKeyType.Item: - if (lockInfo.Index[j] != 0 && m_CastItem && m_CastItem.GetEntry() == lockInfo.Index[j]) + if (lockInfo.Index[j] != 0 && m_CastItem != null && m_CastItem.GetEntry() == lockInfo.Index[j]) return SpellCastResult.SpellCastOk; reqKey = true; break; @@ -7391,7 +7391,7 @@ namespace Game.Spells // castitem check: rogue using skeleton keys. the skill values should not be added in this case. skillValue = 0; - if (!m_CastItem && unitCaster.IsTypeId(TypeId.Player)) + if (m_CastItem == null && unitCaster.IsTypeId(TypeId.Player)) skillValue = unitCaster.ToPlayer().GetSkillValue(skillId); else if (lockInfo.Index[j] == (uint)LockType.Lockpicking) skillValue = (int)unitCaster.GetLevel() * 5; @@ -7887,7 +7887,7 @@ namespace Game.Spells { // gcd modifier auras are applied only to own spells and only players have such mods Player modOwner = m_caster.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { int intGcd = (int)gcd.TotalMilliseconds; modOwner.ApplySpellMod(m_spellInfo, SpellModOp.StartCooldown, ref intGcd, this); @@ -8410,7 +8410,7 @@ namespace Game.Spells else if (MissCondition == SpellMissInfo.Reflect && ReflectResult == SpellMissInfo.None) _spellHitTarget = spell.GetCaster().ToUnit(); - if (spell.GetOriginalCaster() && MissCondition != SpellMissInfo.Evade && !spell.GetOriginalCaster().IsFriendlyTo(unit) && (!spell.m_spellInfo.IsPositive() || spell.m_spellInfo.HasEffect(SpellEffectName.Dispel)) && (spell.m_spellInfo.HasInitialAggro() || unit.IsEngaged())) + if (spell.GetOriginalCaster() != null && MissCondition != SpellMissInfo.Evade && !spell.GetOriginalCaster().IsFriendlyTo(unit) && (!spell.m_spellInfo.IsPositive() || spell.m_spellInfo.HasEffect(SpellEffectName.Dispel)) && (spell.m_spellInfo.HasInitialAggro() || unit.IsEngaged())) unit.SetInCombatWith(spell.GetOriginalCaster()); // if target is flagged for pvp also flag caster if a player @@ -8418,7 +8418,7 @@ namespace Game.Spells _enablePVP = (MissCondition == SpellMissInfo.None || spell.m_spellInfo.HasAttribute(SpellAttr3.PvpEnabling)) && unit.IsPvP() && (unit.IsInCombat() || unit.IsCharmedOwnedByPlayerOrPlayer()) && spell.GetCaster().IsPlayer(); // need to check PvP state before spell effects, but act on it afterwards - if (_spellHitTarget) + if (_spellHitTarget != null) { SpellMissInfo missInfo = spell.PreprocessSpellHit(_spellHitTarget, this); if (missInfo != SpellMissInfo.None) @@ -8459,7 +8459,7 @@ namespace Game.Spells if (spell.GetState() == SpellState.Delayed && !spell.IsPositive() && (GameTime.GetGameTimeMS() - TimeDelay) <= unit.LastSanctuaryTime) return; // No missinfo in that case - if (_spellHitTarget) + if (_spellHitTarget != null) spell.DoSpellEffectHit(_spellHitTarget, spellEffectInfo, this); // scripts can modify damage/healing for current target, save them @@ -8475,7 +8475,7 @@ namespace Game.Spells // other targets executed before this one changed pointer spell.unitTarget = unit; - if (_spellHitTarget) + if (_spellHitTarget != null) spell.unitTarget = _spellHitTarget; // Reset damage/healing counter @@ -8484,7 +8484,7 @@ namespace Game.Spells // Get original caster (if exist) and calculate damage/healing from him data // Skip if m_originalCaster not available - Unit caster = spell.GetOriginalCaster() ? spell.GetOriginalCaster() : spell.GetCaster().ToUnit(); + Unit caster = spell.GetOriginalCaster() != null ? spell.GetOriginalCaster() : spell.GetCaster().ToUnit(); if (caster != null) { // Fill base trigger info @@ -8684,7 +8684,7 @@ namespace Game.Spells spell.m_procSpellType |= procSpellType; // _spellHitTarget can be null if spell is missed in DoSpellHitOnUnit - if (MissCondition != SpellMissInfo.Evade && _spellHitTarget && !spell.GetCaster().IsFriendlyTo(unit) && (!spell.IsPositive() || spell.m_spellInfo.HasEffect(SpellEffectName.Dispel))) + if (MissCondition != SpellMissInfo.Evade && _spellHitTarget != null && !spell.GetCaster().IsFriendlyTo(unit) && (!spell.IsPositive() || spell.m_spellInfo.HasEffect(SpellEffectName.Dispel))) { Unit unitCaster = spell.GetCaster().ToUnit(); if (unitCaster != null) @@ -8708,7 +8708,7 @@ namespace Game.Spells caster.CastSpell(unit, 32747, new CastSpellExtraArgs(spell)); } - if (_spellHitTarget) + if (_spellHitTarget != null) { //AI functions Creature cHitTarget = _spellHitTarget.ToCreature(); @@ -8959,7 +8959,7 @@ namespace Game.Spells return false; break; case SpellTargetCheckTypes.RaidClass: - if (!refUnit) + if (refUnit == null) return false; if (refUnit.GetClass() != unitTarget.GetClass()) return false; @@ -9054,7 +9054,7 @@ namespace Game.Spells public override bool Invoke(WorldObject target) { - if (target.ToGameObject()) + if (target.ToGameObject() != null) { // isInRange including the dimension of the GO bool isInRange = target.ToGameObject().IsInRange(_position.GetPositionX(), _position.GetPositionY(), _position.GetPositionZ(), _range); @@ -9263,7 +9263,7 @@ namespace Game.Spells public override bool Execute(ulong e_time, uint p_time) { Unit caster = Global.ObjAccessor.GetUnit(_victim, _casterGuid); - if (!caster) + if (caster == null) return true; ProcFlags typeMaskActor = ProcFlags.None; diff --git a/Source/Game/Spells/SpellCastTargets.cs b/Source/Game/Spells/SpellCastTargets.cs index 9572606e2..989adad17 100644 --- a/Source/Game/Spells/SpellCastTargets.cs +++ b/Source/Game/Spells/SpellCastTargets.cs @@ -69,7 +69,7 @@ namespace Game.Spells if (m_targetMask.HasAnyFlag(SpellCastTargetFlags.Unit | SpellCastTargetFlags.CorpseAlly | SpellCastTargetFlags.Gameobject | SpellCastTargetFlags.CorpseEnemy | SpellCastTargetFlags.UnitMinipet)) data.Unit = m_objectTargetGUID; - if (m_targetMask.HasAnyFlag(SpellCastTargetFlags.Item | SpellCastTargetFlags.TradeItem) && m_itemTarget) + if (m_targetMask.HasAnyFlag(SpellCastTargetFlags.Item | SpellCastTargetFlags.TradeItem) && m_itemTarget != null) data.Item = m_itemTarget.GetGUID(); if (m_targetMask.HasAnyFlag(SpellCastTargetFlags.SourceLocation)) @@ -110,9 +110,7 @@ namespace Game.Spells public Unit GetUnitTarget() { - if (m_objectTarget) - return m_objectTarget.ToUnit(); - return null; + return m_objectTarget?.ToUnit(); } public void SetUnitTarget(Unit target) diff --git a/Source/Game/Spells/SpellEffects.cs b/Source/Game/Spells/SpellEffects.cs index a77cfbeb0..cbf7631b7 100644 --- a/Source/Game/Spells/SpellEffects.cs +++ b/Source/Game/Spells/SpellEffects.cs @@ -57,9 +57,9 @@ namespace Game.Spells Player player = null; - if (corpseTarget) + if (corpseTarget != null) player = Global.ObjAccessor.FindPlayer(corpseTarget.GetOwnerGUID()); - else if (unitTarget) + else if (unitTarget != null) player = unitTarget.ToPlayer(); if (player == null || player.IsAlive() || !player.IsInWorld) @@ -597,7 +597,7 @@ namespace Game.Spells if (targetDest.GetMapId() == 0xFFFFFFFF) targetDest.SetMapId(unitTarget.GetMapId()); - if (targetDest.GetOrientation() == 0 && m_targets.GetUnitTarget()) + if (targetDest.GetOrientation() == 0 && m_targets.GetUnitTarget() != null) targetDest.SetOrientation(m_targets.GetUnitTarget().GetOrientation()); Player player = unitTarget.ToPlayer(); @@ -624,7 +624,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; // If not exist data for dest location - return @@ -639,7 +639,7 @@ namespace Game.Spells if (targetDest.GetMapId() == 0xFFFFFFFF) targetDest.SetMapId(unitTarget.GetMapId()); - if (targetDest.GetOrientation() == 0 && m_targets.GetUnitTarget()) + if (targetDest.GetOrientation() == 0 && m_targets.GetUnitTarget() != null) targetDest.SetOrientation(m_targets.GetUnitTarget().GetOrientation()); if (effectInfo.MiscValueB != 0) @@ -852,7 +852,7 @@ namespace Game.Spells int heal = (int)unitTarget.CountPctFromMaxHealth(damage); Unit unitCaster = GetUnitCasterForEffectHandlers(); - if (unitCaster) + if (unitCaster != null) { heal = unitCaster.SpellHealingBonusDone(unitTarget, m_spellInfo, heal, DamageEffectType.Heal, effectInfo, 1, this); heal = unitTarget.SpellHealingBonusTaken(unitCaster, m_spellInfo, heal, DamageEffectType.Heal); @@ -872,11 +872,11 @@ namespace Game.Spells Unit unitCaster = GetUnitCasterForEffectHandlers(); int heal = damage; - if (unitCaster) + if (unitCaster != null) heal = unitCaster.SpellHealingBonusDone(unitTarget, m_spellInfo, heal, DamageEffectType.Heal, effectInfo, 1, this); heal += (int)(heal * variance); - if (unitCaster) + if (unitCaster != null) heal = unitTarget.SpellHealingBonusTaken(unitCaster, m_spellInfo, heal, DamageEffectType.Heal); m_healing += heal; @@ -1121,7 +1121,7 @@ namespace Game.Spells else return; - Cypher.Assert(dynObjAura.GetDynobjOwner()); + Cypher.Assert(dynObjAura.GetDynobjOwner() != null); dynObjAura._ApplyEffectForTargets(effectInfo.EffectIndex); } @@ -1228,7 +1228,7 @@ namespace Game.Spells //CanUseBattlegroundObject() already called in CheckCast() // in Battlegroundcheck Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) { bg.EventPlayerClickedOnFlag(player, gameObjTarget); return; @@ -1244,7 +1244,7 @@ namespace Game.Spells //CanUseBattlegroundObject() already called in CheckCast() // in Battlegroundcheck Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) { if (bg.GetTypeID() == BattlegroundTypeId.EY) bg.EventPlayerClickedOnFlag(player, gameObjTarget); @@ -1480,7 +1480,7 @@ namespace Game.Spells } WorldObject caster = m_caster; - if (m_originalCaster) + if (m_originalCaster != null) caster = m_originalCaster; ObjectGuid privateObjectOwner = caster.GetGUID(); @@ -1491,7 +1491,7 @@ namespace Game.Spells privateObjectOwner = caster.GetPrivateObjectOwner(); if (properties.GetFlags().HasFlag(SummonPropertiesFlags.OnlyVisibleToSummonerGroup)) - if (caster.IsPlayer() && m_originalCaster.ToPlayer().GetGroup()) + if (caster.IsPlayer() && m_originalCaster.ToPlayer().GetGroup() != null) privateObjectOwner = caster.ToPlayer().GetGroup().GetGUID(); TimeSpan duration = TimeSpan.FromMilliseconds(m_spellInfo.CalcDuration(caster)); @@ -2019,7 +2019,7 @@ namespace Game.Spells else { // do not increase skill if vellum used - if (!(m_CastItem && m_CastItem.GetTemplate().HasFlag(ItemFlags.NoReagentCost))) + if (!(m_CastItem != null && m_CastItem.GetTemplate().HasFlag(ItemFlags.NoReagentCost))) player.UpdateCraftSkill(m_spellInfo); uint enchant_id = (uint)effectInfo.MiscValue; @@ -2348,7 +2348,7 @@ namespace Game.Spells // this effect use before aura Taunt apply for prevent taunt already attacking target // for spell as marked "non effective at already attacking target" - if (!unitTarget || unitTarget.IsTotem()) + if (unitTarget == null || unitTarget.IsTotem()) { SendCastResult(SpellCastResult.DontReport); return; @@ -2613,7 +2613,7 @@ namespace Game.Spells Position pos = new(x, y, z, o); Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(o, 0.0f, 0.0f)); GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 255, GameObjectState.Ready); - if (!go) + if (go == null) return; PhasingHandler.InheritPhaseShift(go, m_caster); @@ -2634,13 +2634,13 @@ namespace Game.Spells if (player != null) { Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) bg.SetDroppedFlagGUID(go.GetGUID(), bg.GetPlayerTeam(player.GetGUID()) == Team.Alliance ? TeamId.Horde : TeamId.Alliance); } } GameObject linkedTrap = go.GetLinkedTrap(); - if (linkedTrap) + if (linkedTrap != null) { PhasingHandler.InheritPhaseShift(linkedTrap, m_caster); linkedTrap.SetRespawnTime(duration > 0 ? duration / Time.InMilliseconds : 0); @@ -2902,7 +2902,7 @@ namespace Game.Spells Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(pos.GetOrientation(), 0.0f, 0.0f)); GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 0, GameObjectState.Ready); - if (!go) + if (go == null) return; PhasingHandler.InheritPhaseShift(go, caster); @@ -3246,7 +3246,7 @@ namespace Game.Spells Position pos = new(x, y, z, o); Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(o, 0.0f, 0.0f)); GameObject go = GameObject.CreateGameObject((uint)effectInfo.MiscValue, map, pos, rotation, 255, GameObjectState.Ready); - if (!go) + if (go == null) return; PhasingHandler.InheritPhaseShift(go, m_caster); @@ -3276,9 +3276,9 @@ namespace Game.Spells Player player = null; - if (corpseTarget) + if (corpseTarget != null) player = Global.ObjAccessor.FindPlayer(corpseTarget.GetOwnerGUID()); - else if (unitTarget) + else if (unitTarget != null) player = unitTarget.ToPlayer(); if (player == null || player.IsAlive() || !player.IsInWorld) @@ -3302,7 +3302,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsAlive()) + if (unitTarget == null || !unitTarget.IsAlive()) return; unitTarget.AddExtraAttacks((uint)damage); @@ -3648,10 +3648,10 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; - if (m_caster.GetAffectingPlayer()) + if (m_caster.GetAffectingPlayer() != null) { Creature creatureTarget = unitTarget.ToCreature(); if (creatureTarget != null) @@ -3775,7 +3775,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; Position pos = m_caster.GetFirstCollisionPosition(m_caster.GetCombatReach(), m_caster.GetRelativeAngle(unitTarget)); @@ -3806,7 +3806,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; if (!m_targets.HasDst()) @@ -3844,11 +3844,11 @@ namespace Game.Spells return; Player player = m_caster.ToPlayer(); - if (!player || !m_targets.HasDst()) + if (player == null || !m_targets.HasDst()) return; Group group = player.GetGroup(); - if (!group || (group.IsRaidGroup() && !group.IsLeader(player.GetGUID()) && !group.IsAssistant(player.GetGUID()))) + if (group == null || (group.IsRaidGroup() && !group.IsLeader(player.GetGUID()) && !group.IsAssistant(player.GetGUID()))) return; float x, y, z; @@ -4136,7 +4136,7 @@ namespace Game.Spells Quaternion rotation = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(fo, 0.0f, 0.0f)); GameObject go = GameObject.CreateGameObject(name_id, cMap, pos, rotation, 255, GameObjectState.Ready); - if (!go) + if (go == null) return; PhasingHandler.InheritPhaseShift(go, m_caster); @@ -4475,11 +4475,11 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; Player player = unitTarget.ToPlayer(); - if (!player) + if (player == null) return; Quest quest = Global.ObjectMgr.GetQuestTemplate((uint)effectInfo.MiscValue); @@ -4639,7 +4639,7 @@ namespace Game.Spells if (summon.IsGuardian()) { // level of pet summoned using engineering item based at engineering skill level - if (m_CastItem && unitCaster.IsPlayer()) + if (m_CastItem != null && unitCaster.IsPlayer()) { ItemTemplate proto = m_CastItem.GetTemplate(); if (proto != null) @@ -4732,11 +4732,11 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; Player player = unitTarget.ToPlayer(); - if (!player) + if (player == null) return; switch (m_spellInfo.Id) @@ -4975,7 +4975,7 @@ namespace Game.Spells Quaternion rot = Quaternion.CreateFromRotationMatrix(Extensions.fromEulerAnglesZYX(o, 0.0f, 0.0f)); GameObject go = GameObject.CreateGameObject(goId, map, pos, rot, 255, GameObjectState.Ready); - if (!go) + if (go == null) { Log.outWarn(LogFilter.Spells, $"SpellEffect Failed to summon personal gameobject. SpellId {m_spellInfo.Id}, effect {effectInfo.EffectIndex}"); return; @@ -5062,7 +5062,7 @@ namespace Game.Spells if (talent == null) return; - Player player = unitTarget ? unitTarget.ToPlayer() : null; + Player player = unitTarget != null ? unitTarget.ToPlayer() : null; if (player == null) return; @@ -5076,12 +5076,12 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; Player player = unitTarget.ToPlayer(); Item item = player.GetItemByEntry(effectInfo.ItemType); - if (item) + if (item != null) player.DestroyItem(item.GetBagSlot(), item.GetSlot(), true); } @@ -5091,7 +5091,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; Garrison garrison = unitTarget.ToPlayer().GetGarrison(); @@ -5105,7 +5105,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; unitTarget.RemoveAppliedAuras(aurApp => aurApp.GetBase().GetSpellInfo().HasLabel((uint)effectInfo.MiscValue)); @@ -5117,7 +5117,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; unitTarget.ToPlayer().CreateGarrison((uint)effectInfo.MiscValue); @@ -5142,7 +5142,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget) + if (unitTarget == null) return; List objs = new(); @@ -5164,7 +5164,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; Garrison garrison = unitTarget.ToPlayer().GetGarrison(); @@ -5179,7 +5179,7 @@ namespace Game.Spells return; Player player = m_caster.ToPlayer(); - if (!player) + if (player == null) return; CollectionMgr collectionMgr = player.GetSession().GetCollectionMgr(); @@ -5199,7 +5199,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; Garrison garrison = unitTarget.ToPlayer().GetGarrison(); @@ -5230,7 +5230,7 @@ namespace Game.Spells return; Player playerTarget = unitTarget?.ToPlayer(); - if (!playerTarget) + if (playerTarget == null) return; uint xp = Quest.XPValue(playerTarget, (uint)effectInfo.MiscValue, (uint)effectInfo.MiscValueB); @@ -5244,7 +5244,7 @@ namespace Game.Spells return; Player playerTarget = unitTarget?.ToPlayer(); - if (!playerTarget) + if (playerTarget == null) return; // effect value is number of resting hours @@ -5257,7 +5257,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; BattlePetMgr battlePetMgr = unitTarget.ToPlayer().GetSession().GetBattlePetMgr(); @@ -5307,7 +5307,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsPlayer()) + if (unitTarget == null || !unitTarget.IsPlayer()) return; unitTarget.ToPlayer().SendPlayerChoice(GetCaster().GetGUID(), effectInfo.MiscValue); @@ -5319,7 +5319,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.Hit) return; - if (!m_CastItem || !m_caster || !m_caster.IsTypeId(TypeId.Player)) + if (m_CastItem == null || m_caster == null || !m_caster.IsTypeId(TypeId.Player)) return; uint speciesId = m_CastItem.GetModifier(ItemModifier.BattlePetSpeciesId); @@ -5366,7 +5366,7 @@ namespace Game.Spells return; Player player = m_caster.ToPlayer(); - if (player) + if (player != null) { CollectionMgr collectionMgr = player.GetSession().GetCollectionMgr(); if (collectionMgr != null) @@ -5380,11 +5380,11 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!itemTarget) + if (itemTarget == null) return; Player player = m_caster.ToPlayer(); - if (!player || player.GetGUID() != itemTarget.GetOwnerGUID()) + if (player == null || player.GetGUID() != itemTarget.GetOwnerGUID()) return; itemTarget.SetState(ItemUpdateState.Changed, player); @@ -5402,7 +5402,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; PhasingHandler.OnConditionChange(unitTarget); @@ -5414,7 +5414,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsTypeId(TypeId.Player)) + if (unitTarget == null || !unitTarget.IsTypeId(TypeId.Player)) return; unitTarget.ToPlayer().UpdateAreaDependentAuras(unitTarget.GetAreaId()); @@ -5434,7 +5434,7 @@ namespace Game.Spells if (artifactAura != null) { Item artifact = playerCaster.GetItemByGuid(artifactAura.GetCastItemGUID()); - if (artifact) + if (artifact != null) artifact.GiveArtifactXp((ulong)damage, m_CastItem, (ArtifactCategory)effectInfo.MiscValue); } } @@ -5445,14 +5445,14 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.LaunchTarget) return; - if (!unitTarget || !m_caster.IsTypeId(TypeId.Player)) + if (unitTarget == null || !m_caster.IsTypeId(TypeId.Player)) return; Aura artifactAura = unitTarget.GetAura(PlayerConst.ArtifactsAllWeaponsGeneralWeaponEquippedPassive); if (artifactAura != null) { Item artifact = unitTarget.ToPlayer().GetItemByGuid(artifactAura.GetCastItemGUID()); - if (artifact) + if (artifact != null) artifact.GiveArtifactXp((ulong)damage, m_CastItem, 0); } } @@ -5488,7 +5488,7 @@ namespace Game.Spells return; Unit unitCaster = GetUnitCasterForEffectHandlers(); - if (!unitCaster || !m_targets.HasDst()) + if (unitCaster == null || !m_targets.HasDst()) return; SceneObject sceneObject = SceneObject.CreateSceneObject((uint)effectInfo.MiscValue, unitCaster, destTarget.GetPosition(), ObjectGuid.Empty); @@ -5507,7 +5507,7 @@ namespace Game.Spells return; Unit unitCaster = GetUnitCasterForEffectHandlers(); - if (!unitCaster || !m_targets.HasDst()) + if (unitCaster == null || !m_targets.HasDst()) return; SceneObject sceneObject = SceneObject.CreateSceneObject((uint)effectInfo.MiscValue, unitCaster, destTarget.GetPosition(), unitCaster.GetGUID()); @@ -5537,7 +5537,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || unitTarget.GetTypeId() != TypeId.Player) + if (unitTarget == null || unitTarget.GetTypeId() != TypeId.Player) return; PvPCredit packet = new(); @@ -5600,7 +5600,7 @@ namespace Game.Spells if (effectHandleMode != SpellEffectHandleMode.HitTarget) return; - if (!unitTarget || !unitTarget.IsPlayer()) + if (unitTarget == null || !unitTarget.IsPlayer()) return; unitTarget.ToPlayer().GetSession().GetCollectionMgr().AddTransmogSet((uint)effectInfo.MiscValue); @@ -5613,7 +5613,7 @@ namespace Game.Spells return; Player playerTarget = unitTarget != null ? unitTarget.ToPlayer() : null; - if (!playerTarget) + if (playerTarget == null) return; Item heartOfAzeroth = playerTarget.GetItemByEntry(PlayerConst.ItemIdHeartOfAzeroth, ItemSearchLocation.Everywhere); @@ -5687,7 +5687,7 @@ namespace Game.Spells if (playerCaster == null) return; - if (!unitTarget || !unitTarget.IsCreature()) + if (unitTarget == null || !unitTarget.IsCreature()) return; playerCaster.GetSession().GetBattlePetMgr().GrantBattlePetExperience(unitTarget.GetBattlePetCompanionGUID(), (ushort)damage, BattlePetXpSource.SpellEffect); diff --git a/Source/Game/Spells/SpellHistory.cs b/Source/Game/Spells/SpellHistory.cs index a514bc2d0..732f88745 100644 --- a/Source/Game/Spells/SpellHistory.cs +++ b/Source/Game/Spells/SpellHistory.cs @@ -177,7 +177,7 @@ namespace Game.Spells public void HandleCooldowns(SpellInfo spellInfo, Item item, Spell spell = null) { - HandleCooldowns(spellInfo, item ? item.GetEntry() : 0u, spell); + HandleCooldowns(spellInfo, item != null ? item.GetEntry() : 0u, spell); } public void HandleCooldowns(SpellInfo spellInfo, uint itemId, Spell spell = null) @@ -189,7 +189,7 @@ namespace Game.Spells return; Player player = _owner.ToPlayer(); - if (player) + if (player != null) { // potions start cooldown until exiting combat ItemTemplate itemTemplate = Global.ObjectMgr.GetItemTemplate(itemId); @@ -353,7 +353,7 @@ namespace Game.Spells { // Now we have cooldown data (if found any), time to apply mods Player modOwner = _owner.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) { void applySpellMod(ref TimeSpan value) { @@ -386,7 +386,7 @@ namespace Game.Spells { // Apply SPELL_AURA_MOD_COOLDOWN only to own spells Player playerOwner = GetPlayerOwner(); - if (!playerOwner || playerOwner.HasSpell(spellInfo.Id)) + if (playerOwner == null || playerOwner.HasSpell(spellInfo.Id)) { needsCooldownPacket = true; cooldown += TimeSpan.FromMilliseconds(cooldownMod); // SPELL_AURA_MOD_COOLDOWN does not affect category cooldows, verified with shaman shocks @@ -438,7 +438,7 @@ namespace Game.Spells if (needsCooldownPacket) { Player playerOwner = GetPlayerOwner(); - if (playerOwner) + if (playerOwner != null) { SpellCooldownPkt spellCooldown = new(); spellCooldown.Caster = _owner.GetGUID(); @@ -453,7 +453,7 @@ namespace Game.Spells public void SendCooldownEvent(SpellInfo spellInfo, uint itemId = 0, Spell spell = null, bool startCooldown = true) { Player player = GetPlayerOwner(); - if (player) + if (player != null) { uint category = spellInfo.GetCategory(); GetCooldownDurations(spellInfo, itemId, ref category); @@ -526,7 +526,7 @@ namespace Game.Spells } Player playerOwner = GetPlayerOwner(); - if (playerOwner) + if (playerOwner != null) { ModifyCooldown modifyCooldown = new(); modifyCooldown.IsPet = _owner != playerOwner; @@ -579,7 +579,7 @@ namespace Game.Spells if (update) { Player playerOwner = GetPlayerOwner(); - if (playerOwner) + if (playerOwner != null) { ClearCooldown clearCooldown = new(); clearCooldown.IsPet = _owner != playerOwner; @@ -612,7 +612,7 @@ namespace Game.Spells public void ResetAllCooldowns() { Player playerOwner = GetPlayerOwner(); - if (playerOwner) + if (playerOwner != null) { List cooldowns = new(); foreach (var id in _spellCooldowns.Keys) @@ -708,7 +708,7 @@ namespace Game.Spells List knownSpells = new(); Player plrOwner = _owner.ToPlayer(); - if (plrOwner) + if (plrOwner != null) { foreach (var p in plrOwner.GetSpellMap()) if (p.Value.State != PlayerSpellState.Removed) @@ -752,7 +752,7 @@ namespace Game.Spells } Player player = GetPlayerOwner(); - if (player) + if (player != null) if (!spellCooldown.SpellCooldowns.Empty()) player.SendPacket(spellCooldown); } @@ -837,7 +837,7 @@ namespace Game.Spells _categoryCharges.Remove(chargeCategoryId); Player player = GetPlayerOwner(); - if (player) + if (player != null) { ClearSpellCharges clearSpellCharges = new(); clearSpellCharges.IsPet = _owner != player; @@ -852,7 +852,7 @@ namespace Game.Spells _categoryCharges.Clear(); Player player = GetPlayerOwner(); - if (player) + if (player != null) { ClearAllSpellCharges clearAllSpellCharges = new(); clearAllSpellCharges.IsPet = _owner != player; @@ -929,7 +929,7 @@ namespace Game.Spells public void SendClearCooldowns(List cooldowns) { Player playerOwner = GetPlayerOwner(); - if (playerOwner) + if (playerOwner != null) { ClearCooldowns clearCooldowns = new(); clearCooldowns.IsPet = _owner != playerOwner; @@ -1005,7 +1005,7 @@ namespace Game.Spells public void RestoreCooldownStateAfterDuel() { Player player = _owner.ToPlayer(); - if (player) + if (player != null) { // add all profession CDs created while in duel (if any) foreach (var c in _spellCooldowns) diff --git a/Source/Game/Spells/SpellInfo.cs b/Source/Game/Spells/SpellInfo.cs index 6fcb232a9..5a8194fa9 100644 --- a/Source/Game/Spells/SpellInfo.cs +++ b/Source/Game/Spells/SpellInfo.cs @@ -608,7 +608,7 @@ namespace Game.Spells return true; // item dependent spell - if (item && item.IsFitToSpellRequirements(this)) + if (item != null && item.IsFitToSpellRequirements(this)) return true; return false; @@ -839,7 +839,7 @@ namespace Game.Spells if (HasAttribute(SpellAttr4.OnlyFlyingAreas)) { AreaMountFlags mountFlags = 0; - if (player && player.HasAuraType(AuraType.MountRestrictions)) + if (player != null && player.HasAuraType(AuraType.MountRestrictions)) { foreach (AuraEffect auraEffect in player.GetAuraEffectsByType(AuraType.MountRestrictions)) mountFlags |= (AreaMountFlags)auraEffect.GetMiscValue(); @@ -853,7 +853,7 @@ namespace Game.Spells if (!mountFlags.HasFlag(AreaMountFlags.AllowFlyingMounts)) return SpellCastResult.IncorrectArea; - if (player) + if (player != null) { uint mapToCheck = map_id; MapRecord mapEntry1 = CliDB.MapStorage.LookupByKey(map_id); @@ -917,7 +917,7 @@ namespace Game.Spells return SpellCastResult.RequiresArea; Battleground bg = player.GetBattleground(); - return bg && bg.GetStatus() == BattlegroundStatus.WaitJoin ? SpellCastResult.SpellCastOk : SpellCastResult.RequiresArea; + return bg != null && bg.GetStatus() == BattlegroundStatus.WaitJoin ? SpellCastResult.SpellCastOk : SpellCastResult.RequiresArea; } case 32724: // Gold Team (Alliance) case 32725: // Green Team (Alliance) @@ -939,12 +939,12 @@ namespace Game.Spells return SpellCastResult.RequiresArea; Battleground bg = player.GetBattleground(); - return bg && bg.GetStatus() == BattlegroundStatus.WaitJoin ? SpellCastResult.SpellCastOk : SpellCastResult.RequiresArea; + return bg != null && bg.GetStatus() == BattlegroundStatus.WaitJoin ? SpellCastResult.SpellCastOk : SpellCastResult.RequiresArea; } } // aura limitations - if (player) + if (player != null) { foreach (var effectInfo in _effects) { @@ -1140,10 +1140,10 @@ namespace Game.Spells if (HasAttribute(SpellAttr8.BattleResurrection)) { Map map = caster.GetMap(); - if (map) + if (map != null) { InstanceMap iMap = map.ToInstanceMap(); - if (iMap) + if (iMap != null) { InstanceScript instance = iMap.GetInstanceScript(); if (instance != null) @@ -1203,7 +1203,7 @@ namespace Game.Spells return SpellCastResult.SpellCastOk; Vehicle vehicle = caster.GetVehicle(); - if (vehicle) + if (vehicle != null) { VehicleSeatFlags checkMask = 0; foreach (var effectInfo in _effects) @@ -2706,10 +2706,10 @@ namespace Game.Spells { int duration = GetDuration(); - if (caster) + if (caster != null) { Player modOwner = caster.GetSpellModOwner(); - if (modOwner) + if (modOwner != null) modOwner.ApplySpellMod(this, SpellModOp.Duration, ref duration); } @@ -2813,7 +2813,7 @@ namespace Game.Spells { // gameobject casts don't use power Unit unitCaster = caster.ToUnit(); - if (!unitCaster) + if (unitCaster == null) return null; if (power.RequiredAuraSpellID != 0 && !unitCaster.HasAura(power.RequiredAuraSpellID)) @@ -3128,7 +3128,7 @@ namespace Game.Spells public float CalcProcPPM(Unit caster, int itemLevel) { float ppm = ProcBasePPM; - if (!caster) + if (caster == null) return ppm; foreach (SpellProcsPerMinuteModRecord mod in ProcPPMMods) @@ -3154,7 +3154,7 @@ namespace Game.Spells case SpellProcsPerMinuteModType.Spec: { Player plrCaster = caster.ToPlayer(); - if (plrCaster) + if (plrCaster != null) if (plrCaster.GetPrimarySpecialization() == (ChrSpecialization)mod.Param) ppm *= 1.0f + mod.Coeff; break; @@ -3291,12 +3291,12 @@ namespace Game.Spells { var playerCondition = CliDB.PlayerConditionStorage.LookupByKey(visual.CasterPlayerConditionID); if (playerCondition != null) - if (!caster || !caster.IsPlayer() || !ConditionManager.IsPlayerMeetingCondition(caster.ToPlayer(), playerCondition)) + if (caster == null || !caster.IsPlayer() || !ConditionManager.IsPlayerMeetingCondition(caster.ToPlayer(), playerCondition)) continue; var unitCondition = CliDB.UnitConditionStorage.LookupByKey(visual.CasterUnitConditionID); if (unitCondition != null) - if (!caster || !caster.IsUnit() || !ConditionManager.IsUnitMeetingCondition(caster.ToUnit(), viewer?.ToUnit(), unitCondition)) + if (caster == null || !caster.IsUnit() || !ConditionManager.IsUnitMeetingCondition(caster.ToUnit(), viewer?.ToUnit(), unitCondition)) continue; return visual.Id; @@ -4245,7 +4245,7 @@ namespace Game.Spells if (Scaling.Coefficient != 0.0f) { uint level = _spellInfo.SpellLevel; - if (target && _spellInfo.IsPositiveEffect(EffectIndex) && (Effect == SpellEffectName.ApplyAura)) + if (target != null && _spellInfo.IsPositiveEffect(EffectIndex) && (Effect == SpellEffectName.ApplyAura)) level = target.GetLevel(); else if (caster != null && caster.IsUnit()) level = caster.ToUnit().GetLevel(); diff --git a/Source/Game/Spells/SpellManager.cs b/Source/Game/Spells/SpellManager.cs index 9e8413d87..eab81fd01 100644 --- a/Source/Game/Spells/SpellManager.cs +++ b/Source/Game/Spells/SpellManager.cs @@ -112,7 +112,7 @@ namespace Game.Entities { if (msg) { - if (player) + if (player != null) player.SendSysMessage("Craft spell {0} not have create item entry.", spellInfo.Id); else Log.outError(LogFilter.Spells, "Craft spell {0} not have create item entry.", spellInfo.Id); @@ -126,7 +126,7 @@ namespace Game.Entities { if (msg) { - if (player) + if (player != null) player.SendSysMessage("Craft spell {0} create not-exist in DB item (Entry: {1}) and then...", spellInfo.Id, spellEffectInfo.ItemType); else Log.outError(LogFilter.Spells, "Craft spell {0} create not-exist in DB item (Entry: {1}) and then...", spellInfo.Id, spellEffectInfo.ItemType); @@ -460,8 +460,8 @@ namespace Game.Entities if (((uint)procEntry.AttributesMask & 0x0000001) != 0) { Player actor = eventInfo.GetActor().ToPlayer(); - if (actor) - if (eventInfo.GetActionTarget() && !actor.IsHonorOrXPTarget(eventInfo.GetActionTarget())) + if (actor != null) + if (eventInfo.GetActionTarget() != null && !actor.IsHonorOrXPTarget(eventInfo.GetActionTarget())) return false; } @@ -4964,10 +4964,10 @@ namespace Game.Entities if (player == null || (auraSpell > 0 && !player.HasAura((uint)auraSpell)) || (auraSpell < 0 && player.HasAura((uint)-auraSpell))) return false; - if (player) + if (player != null) { Battleground bg = player.GetBattleground(); - if (bg) + if (bg != null) return bg.IsSpellAllowed(spellId, player); } @@ -4976,7 +4976,7 @@ namespace Game.Entities { case 91604: // No fly Zone - Wintergrasp { - if (!player) + if (player == null) return false; BattleField Bf = Global.BattleFieldMgr.GetBattlefieldToZoneId(player.GetMap(), player.GetZoneId()); @@ -4987,7 +4987,7 @@ namespace Game.Entities case 56618: // Horde Controls Factory Phase Shift case 56617: // Alliance Controls Factory Phase Shift { - if (!player) + if (player == null) return false; BattleField bf = Global.BattleFieldMgr.GetBattlefieldToZoneId(player.GetMap(), player.GetZoneId()); @@ -5007,7 +5007,7 @@ namespace Game.Entities case 57940: // Essence of Wintergrasp - Northrend case 58045: // Essence of Wintergrasp - Wintergrasp { - if (!player) + if (player == null) return false; BattleField battlefieldWG = Global.BattleFieldMgr.GetBattlefieldByBattleId(player.GetMap(), 1); @@ -5017,7 +5017,7 @@ namespace Game.Entities } case 74411: // Battleground- Dampening { - if (!player) + if (player == null) return false; BattleField bf = Global.BattleFieldMgr.GetBattlefieldToZoneId(player.GetMap(), player.GetZoneId()); diff --git a/Source/Game/Text/CreatureTextManager.cs b/Source/Game/Text/CreatureTextManager.cs index 547dd250c..21999e267 100644 --- a/Source/Game/Text/CreatureTextManager.cs +++ b/Source/Game/Text/CreatureTextManager.cs @@ -212,13 +212,13 @@ namespace Game SendSound(source, finalSound, finalType, whisperTarget, range, team, gmOnly, textEntry.BroadcastTextId, finalPlayType); Unit finalSource = source; - if (srcPlr) + if (srcPlr != null) finalSource = srcPlr; if (textEntry.emote != 0) SendEmote(finalSource, textEntry.emote); - if (srcPlr) + if (srcPlr != null) { PlayerTextBuilder builder = new(source, finalSource, finalSource.GetGender(), finalType, textEntry.groupId, textEntry.id, finalLang, whisperTarget); SendChatPacket(finalSource, builder, finalType, whisperTarget, range, team, gmOnly); @@ -254,7 +254,7 @@ namespace Game public void SendSound(Creature source, uint sound, ChatMsg msgType, WorldObject whisperTarget = null, CreatureTextRange range = CreatureTextRange.Normal, Team team = Team.Other, bool gmOnly = false, uint keyBroadcastTextId = 0, SoundKitPlayType playType = SoundKitPlayType.Normal) { - if (sound == 0 || !source) + if (sound == 0 || source == null) return; if (playType == SoundKitPlayType.ObjectSound) @@ -278,14 +278,14 @@ namespace Game switch (msgType) { case ChatMsg.MonsterParty: - if (!whisperTarget) + if (whisperTarget == null) return; Player whisperPlayer = whisperTarget.ToPlayer(); - if (whisperPlayer) + if (whisperPlayer != null) { Group group = whisperPlayer.GetGroup(); - if (group) + if (group != null) group.BroadcastWorker(player => player.SendPacket(data)); } return; @@ -294,7 +294,7 @@ namespace Game { if (range == CreatureTextRange.Normal)//ignores team and gmOnly { - if (!whisperTarget || !whisperTarget.IsTypeId(TypeId.Player)) + if (whisperTarget == null || !whisperTarget.IsTypeId(TypeId.Player)) return; whisperTarget.ToPlayer().SendPacket(data); @@ -362,7 +362,7 @@ namespace Game void SendEmote(Unit source, Emote emote) { - if (!source) + if (source == null) return; source.HandleEmoteCommand(emote); @@ -446,7 +446,7 @@ namespace Game { if (range == CreatureTextRange.Normal) //ignores team and gmOnly { - if (!whisperTarget || !whisperTarget.IsTypeId(TypeId.Player)) + if (whisperTarget == null || !whisperTarget.IsTypeId(TypeId.Player)) return; localizer.Invoke(whisperTarget.ToPlayer()); diff --git a/Source/Game/Warden/WardenWin.cs b/Source/Game/Warden/WardenWin.cs index cfd8d81c5..014e532db 100644 --- a/Source/Game/Warden/WardenWin.cs +++ b/Source/Game/Warden/WardenWin.cs @@ -167,7 +167,7 @@ namespace Game public override void RequestChecks() { - Log.outDebug(LogFilter.Warden, $"Request data from {_session.GetPlayerName()} (account {_session.GetAccountId()}) - loaded: {_session.GetPlayer() && !_session.PlayerLoading()}"); + Log.outDebug(LogFilter.Warden, $"Request data from {_session.GetPlayerName()} (account {_session.GetAccountId()}) - loaded: {_session.GetPlayer() != null && !_session.PlayerLoading()}"); // If all checks for a category are done, fill its todo list again foreach (WardenCheckCategory category in Enum.GetValues()) @@ -189,7 +189,7 @@ namespace Game foreach (var category in Enum.GetValues()) { - if (WardenCheckManager.IsWardenCategoryInWorldOnly(category) && !_session.GetPlayer()) + if (WardenCheckManager.IsWardenCategoryInWorldOnly(category) && _session.GetPlayer() == null) continue; var checks = _checks[(int)category]; diff --git a/Source/Game/World/WorldManager.cs b/Source/Game/World/WorldManager.cs index b83fa0f1e..a44394496 100644 --- a/Source/Game/World/WorldManager.cs +++ b/Source/Game/World/WorldManager.cs @@ -270,7 +270,7 @@ namespace Game key.Raw = linkInfo.Item2; WorldSession session = FindSession(key.AccountId); - if (!session || session.GetConnectToInstanceKey() != linkInfo.Item2) + if (session == null || session.GetConnectToInstanceKey() != linkInfo.Item2) { linkInfo.Item1.SendAuthResponseError(BattlenetRpcErrorCode.TimedOut); linkInfo.Item1.CloseSocket(); @@ -1550,7 +1550,7 @@ namespace Game var wt_do = new LocalizedDo(wt_builder); foreach (var session in m_sessions.Values) { - if (session == null || !session.GetPlayer() || !session.GetPlayer().IsInWorld) + if (session == null || session.GetPlayer() == null || !session.GetPlayer().IsInWorld) continue; wt_do.Invoke(session.GetPlayer()); @@ -1570,7 +1570,7 @@ namespace Game // Player should be in world Player player = session.GetPlayer(); - if (!player || !player.IsInWorld) + if (player == null || !player.IsInWorld) continue; wt_do.Invoke(player); @@ -1583,7 +1583,7 @@ namespace Game bool foundPlayerToSend = false; foreach (var session in m_sessions.Values) { - if (session != null && session.GetPlayer() && session.GetPlayer().IsInWorld && + if (session != null && session.GetPlayer() != null && session.GetPlayer().IsInWorld && session.GetPlayer().GetZoneId() == zone && session != self && (team == 0 || (uint)session.GetPlayer().GetTeam() == team)) { session.SendPacket(packet); @@ -1697,7 +1697,7 @@ namespace Game } WorldSession sess = FindSession(account); - if (sess) + if (sess != null) { if (sess.GetPlayerName() != author) sess.KickPlayer("World::BanAccount Banning account"); @@ -1751,7 +1751,7 @@ namespace Game ObjectGuid guid; // Pick a player to ban if not online - if (!pBanned) + if (pBanned == null) { guid = Global.CharacterCacheStorage.GetCharacterGuidByName(name); if (guid.IsEmpty()) @@ -1776,7 +1776,7 @@ namespace Game trans.Append(stmt); DB.Characters.CommitTransaction(trans); - if (pBanned) + if (pBanned != null) pBanned.GetSession().KickPlayer("World::BanCharacter Banning character"); return BanReturn.Success; @@ -1789,7 +1789,7 @@ namespace Game ObjectGuid guid; // Pick a player to ban if not online - if (!pBanned) + if (pBanned == null) { guid = Global.CharacterCacheStorage.GetCharacterGuidByName(name); if (guid.IsEmpty()) @@ -1907,7 +1907,7 @@ namespace Game if (messageID <= ServerMessageType.String) packet.StringParam = stringParam; - if (player) + if (player != null) player.SendPacket(packet); else SendGlobalMessage(packet); @@ -2254,7 +2254,7 @@ namespace Game DB.Characters.Execute(stmt); foreach (var session in m_sessions.Values) - if (session.GetPlayer()) + if (session.GetPlayer() != null) session.GetPlayer().SetRandomWinner(false); m_NextRandomBGReset += Time.Day; diff --git a/Source/Scripts/Spells/DemonHunter.cs b/Source/Scripts/Spells/DemonHunter.cs index 4bd41940d..a75e2130e 100644 --- a/Source/Scripts/Spells/DemonHunter.cs +++ b/Source/Scripts/Spells/DemonHunter.cs @@ -330,7 +330,7 @@ namespace Scripts.Spells.DemonHunter SpellCastResult CheckCast() { Unit caster = GetCaster(); - if (caster.IsMounted() || caster.GetVehicleBase()) + if (caster.IsMounted() || caster.GetVehicleBase() != null) return SpellCastResult.DontReport; if (!caster.IsFalling()) diff --git a/Source/Scripts/Spells/Druid.cs b/Source/Scripts/Spells/Druid.cs index 7992cf687..54a5cab80 100644 --- a/Source/Scripts/Spells/Druid.cs +++ b/Source/Scripts/Spells/Druid.cs @@ -1661,7 +1661,7 @@ namespace Scripts.Spells.Druid void FilterTargets(List targets) { - if (!GetCaster().ToPlayer().GetGroup()) + if (GetCaster().ToPlayer().GetGroup() == null) { targets.Clear(); targets.Add(GetCaster()); @@ -1715,7 +1715,7 @@ namespace Scripts.Spells.Druid if (caster == null) return false; - return caster.GetGroup() || caster != eventInfo.GetProcTarget(); + return caster.GetGroup() != null || caster != eventInfo.GetProcTarget(); } void HandleProc(AuraEffect aurEff, ProcEventInfo eventInfo) diff --git a/Source/Scripts/Spells/Paladin.cs b/Source/Scripts/Spells/Paladin.cs index b9255f7ae..6bc5166c1 100644 --- a/Source/Scripts/Spells/Paladin.cs +++ b/Source/Scripts/Spells/Paladin.cs @@ -266,7 +266,7 @@ namespace Scripts.Spells.Paladin SpellCastResult CheckForbearance() { Unit target = GetExplTargetUnit(); - if (!target || target.HasAura(SpellIds.Forbearance)) + if (target == null || target.HasAura(SpellIds.Forbearance)) return SpellCastResult.TargetAurastate; return SpellCastResult.SpellCastOk; @@ -321,7 +321,7 @@ namespace Scripts.Spells.Paladin void HandleEffectPeriodic(AuraEffect aurEff) { AreaTrigger at = GetTarget().GetAreaTrigger(SpellIds.Consecration); - if (at) + if (at != null) GetTarget().CastSpell(at.GetPosition(), SpellIds.ConsecrationDamage); } @@ -826,7 +826,7 @@ namespace Scripts.Spells.Paladin void HandleScript(uint effIndex) { Unit initialTarget = ObjAccessor.GetUnit(GetCaster(), _targetGUID); - if (initialTarget) + if (initialTarget != null) initialTarget.CastSpell(GetHitUnit(), SpellIds.HolyPrismAreaBeamVisual, true); } @@ -879,7 +879,7 @@ namespace Scripts.Spells.Paladin Unit caster = GetCaster(); Unit unitTarget = GetHitUnit(); - if (unitTarget) + if (unitTarget != null) { if (caster.IsFriendlyTo(unitTarget)) caster.CastSpell(unitTarget, SpellIds.HolyShockHealing, GetSpell()); @@ -1015,7 +1015,7 @@ namespace Scripts.Spells.Paladin SpellCastResult CheckForbearance() { Unit target = GetExplTargetUnit(); - if (!target || target.HasAura(SpellIds.Forbearance)) + if (target == null || target.HasAura(SpellIds.Forbearance)) return SpellCastResult.TargetAurastate; return SpellCastResult.SpellCastOk; @@ -1048,7 +1048,7 @@ namespace Scripts.Spells.Paladin bool CheckProc(ProcEventInfo eventInfo) { - if (!eventInfo.GetActionTarget()) + if (eventInfo.GetActionTarget() == null) return false; if (eventInfo.GetActionTarget().HasAura(SpellIds.BeaconOfLight, eventInfo.GetActor().GetGUID())) return false; @@ -1102,7 +1102,7 @@ namespace Scripts.Spells.Paladin foreach (var summonedObject in GetSpell().GetExecuteLogEffect(SpellEffectName.Summon).GenericVictimTargets) { Unit hammer = ObjAccessor.GetUnit(GetCaster(), summonedObject.Victim); - if (hammer) + if (hammer != null) { hammer.CastSpell(hammer, SpellIds.LightHammerCosmetic, new CastSpellExtraArgs(TriggerCastFlags.IgnoreCastInProgress).SetTriggeringSpell(GetSpell())); @@ -1130,7 +1130,7 @@ namespace Scripts.Spells.Paladin { Unit lightHammer = GetTarget(); Unit originalCaster = lightHammer.GetOwner(); - if (originalCaster) + if (originalCaster != null) { originalCaster.CastSpell(lightHammer.GetPosition(), SpellIds.LightHammerDamage, TriggerCastFlags.IgnoreCastInProgress); originalCaster.CastSpell(lightHammer.GetPosition(), SpellIds.LightHammerHealing, TriggerCastFlags.IgnoreCastInProgress); diff --git a/Source/Scripts/Spells/Quest.cs b/Source/Scripts/Spells/Quest.cs index 9391ed267..caab61b85 100644 --- a/Source/Scripts/Spells/Quest.cs +++ b/Source/Scripts/Spells/Quest.cs @@ -52,7 +52,7 @@ namespace Scripts.Spells.Azerite Creature creatureTarget = GetHitCreature(); if (creatureTarget != null) { - if (!creatureTarget.IsPet() && creatureTarget.GetEntry() == _originalEntry) + if (creatureTarget.IsPet() && creatureTarget.GetEntry() == _originalEntry) { creatureTarget.UpdateEntry(_newEntry); if (_shouldAttack) diff --git a/Source/Scripts/Spells/Rogue.cs b/Source/Scripts/Spells/Rogue.cs index 215d2a570..4c8d30bbf 100644 --- a/Source/Scripts/Spells/Rogue.cs +++ b/Source/Scripts/Spells/Rogue.cs @@ -87,7 +87,7 @@ namespace Scripts.Spells.Rogue void HandleHitDamage(uint effIndex) { Unit hitUnit = GetHitUnit(); - if (!hitUnit) + if (hitUnit == null) return; Unit caster = GetCaster(); @@ -208,7 +208,7 @@ namespace Scripts.Spells.Rogue public override bool Load() { // at this point CastItem must already be initialized - return GetCaster().IsPlayer() && GetCastItem(); + return GetCaster().IsPlayer() && GetCastItem() != null; } void HandleBeforeHit(SpellMissInfo missInfo) @@ -242,7 +242,7 @@ namespace Scripts.Spells.Rogue if (item == GetCastItem()) item = player.GetItemByPos(InventorySlots.Bag0, EquipmentSlot.OffHand); - if (!item) + if (item == null) return; // item combat enchantments @@ -446,7 +446,7 @@ namespace Scripts.Spells.Rogue { void FilterTargets(List targets) { - if (targets.Empty() || GetCaster().GetVehicleBase()) + if (targets.Empty() || GetCaster().GetVehicleBase() != null) FinishCast(SpellCastResult.OutOfRange); } @@ -492,7 +492,7 @@ namespace Scripts.Spells.Rogue bool HandleCheckProc(ProcEventInfo eventInfo) { - return eventInfo.GetDamageInfo()?.GetVictim(); + return eventInfo.GetDamageInfo()?.GetVictim() != null; } void HandleProc(AuraEffect aurEff, ProcEventInfo procInfo) @@ -514,7 +514,7 @@ namespace Scripts.Spells.Rogue { SpellCastResult CheckCast() { - if (!GetExplTargetUnit() || !GetCaster().IsValidAttackTarget(GetExplTargetUnit(), GetSpellInfo())) + if (GetExplTargetUnit() == null || !GetCaster().IsValidAttackTarget(GetExplTargetUnit(), GetSpellInfo())) return SpellCastResult.BadTargets; return SpellCastResult.SpellCastOk; @@ -902,7 +902,7 @@ namespace Scripts.Spells.Rogue if (script != null) { Unit explTarget = GetExplTargetUnit(); - if (explTarget) + if (explTarget != null) script.SetRedirectTarget(explTarget.GetGUID()); else script.SetRedirectTarget(ObjectGuid.Empty);