From 9f235e1659167f2baa036156b06620c77eca6d85 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Fri, 8 May 2020 15:00:56 -0400
Subject: [PATCH] Misc Fixes

Port From (https://github.com/TrinityCore/TrinityCore)
---
 Source/Game/AuctionHouse/AuctionManager.cs        | 8 ++++----
 Source/Game/Entities/Unit/Unit.Combat.cs          | 2 +-
 Source/Game/Movement/Generators/TargetMovement.cs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/Game/AuctionHouse/AuctionManager.cs b/Source/Game/AuctionHouse/AuctionManager.cs
index a0464210e..b4941ec2f 100644
--- a/Source/Game/AuctionHouse/AuctionManager.cs
+++ b/Source/Game/AuctionHouse/AuctionManager.cs
@@ -276,7 +276,7 @@ namespace Game
             _itemsByGuid[item.GetGUID()] = item;
         }
 
-        public bool RemoveAItem(ObjectGuid guid, bool deleteItem = false)
+        public bool RemoveAItem(ObjectGuid guid, bool deleteItem = false, SQLTransaction trans = null)
         {
             var item = _itemsByGuid.LookupByKey(guid);
             if (item == null)
@@ -285,7 +285,7 @@ namespace Game
             if (deleteItem)
             {
                 item.FSetState(ItemUpdateState.Removed);
-                item.SaveToDB(null);
+                item.SaveToDB(trans);
             }
 
             _itemsByGuid.Remove(guid);
@@ -1418,7 +1418,7 @@ namespace Game
             {
                 // bidder doesn't exist, delete the item
                 foreach (Item item in auction.Items)
-                    Global.AuctionHouseMgr.RemoveAItem(item.GetGUID(), true);
+                    Global.AuctionHouseMgr.RemoveAItem(item.GetGUID(), true, trans);
             }
         }
 
@@ -1470,7 +1470,7 @@ namespace Game
             {
                 // owner doesn't exist, delete the item
                 foreach (Item item in auction.Items)
-                    Global.AuctionHouseMgr.RemoveAItem(item.GetGUID(), true);
+                    Global.AuctionHouseMgr.RemoveAItem(item.GetGUID(), true, trans);
             }
         }
 
diff --git a/Source/Game/Entities/Unit/Unit.Combat.cs b/Source/Game/Entities/Unit/Unit.Combat.cs
index 21f99c4aa..ea976d647 100644
--- a/Source/Game/Entities/Unit/Unit.Combat.cs
+++ b/Source/Game/Entities/Unit/Unit.Combat.cs
@@ -2426,7 +2426,7 @@ namespace Game.Entities
             victimResistance = Math.Max(victimResistance, 0.0f);
 
             // level-based resistance does not apply to binary spells, and cannot be overcome by spell penetration
-            if (!spellInfo.HasAttribute(SpellCustomAttributes.BinarySpell))
+            if (spellInfo == null || !spellInfo.HasAttribute(SpellCustomAttributes.BinarySpell))
                 victimResistance += Math.Max((victim.GetLevelForTarget(this) - GetLevelForTarget(victim)) * 5.0f, 0.0f);
 
             uint bossLevel = 83;
diff --git a/Source/Game/Movement/Generators/TargetMovement.cs b/Source/Game/Movement/Generators/TargetMovement.cs
index 24d8b5520..e6683fea5 100644
--- a/Source/Game/Movement/Generators/TargetMovement.cs
+++ b/Source/Game/Movement/Generators/TargetMovement.cs
@@ -97,7 +97,7 @@ namespace Game.Movement
             }
 
             if (targetMoved)
-                SetTargetLocation(owner, targetMoved);
+                SetTargetLocation(owner, true);
             else if (_speedChanged)
                 SetTargetLocation(owner, false);