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/Entities/Unit/Unit.Combat.cs
+19 -19
View File
@@ -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<Player> 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();