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

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
@@ -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);
}
@@ -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
@@ -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));
}
}
@@ -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();
@@ -589,7 +589,7 @@ namespace Game.Networking.Packets
if (characterInfo == null)
return false;
if (player)
if (player != null)
{
Cypher.Assert(player.GetGUID() == guid);
@@ -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);