Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some cleanups. (might break build for scripts as they are a WIP)

Browse Source
This commit is contained in:
hondacrx
2023-10-08 10:35:31 -04:00
parent fa10b981bd
commit cda53c8e7f
208 changed files with 2266 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Spell.cs
+95 -95
View File
@@ -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;