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
@@ -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)