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

Misc Fixes

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore)
This commit is contained in:
hondacrx
2020-05-08 15:00:56 -04:00
parent 1d23f6bc0e
commit 9f235e1659
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AuctionHouse/AuctionManager.cs
+4 -4
View File
@@ -276,7 +276,7 @@ namespace Game
_itemsByGuid[item.GetGUID()] = item; _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); var item = _itemsByGuid.LookupByKey(guid);
if (item == null) if (item == null)
@@ -285,7 +285,7 @@ namespace Game
if (deleteItem) if (deleteItem)
{ {
item.FSetState(ItemUpdateState.Removed); item.FSetState(ItemUpdateState.Removed);
item.SaveToDB(null); item.SaveToDB(trans);
} }
_itemsByGuid.Remove(guid); _itemsByGuid.Remove(guid);
@@ -1418,7 +1418,7 @@ namespace Game
{ {
// bidder doesn't exist, delete the item // bidder doesn't exist, delete the item
foreach (Item item in auction.Items) 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 // owner doesn't exist, delete the item
foreach (Item item in auction.Items) foreach (Item item in auction.Items)
Global.AuctionHouseMgr.RemoveAItem(item.GetGUID(), true); Global.AuctionHouseMgr.RemoveAItem(item.GetGUID(), true, trans);
} }
} }
Source/Game/Entities/Unit/Unit.Combat.cs
+1 -1
View File
@@ -2426,7 +2426,7 @@ namespace Game.Entities
victimResistance = Math.Max(victimResistance, 0.0f); victimResistance = Math.Max(victimResistance, 0.0f);
// level-based resistance does not apply to binary spells, and cannot be overcome by spell penetration // 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); victimResistance += Math.Max((victim.GetLevelForTarget(this) - GetLevelForTarget(victim)) * 5.0f, 0.0f);
uint bossLevel = 83; uint bossLevel = 83;
Source/Game/Movement/Generators/TargetMovement.cs
+1 -1
View File
@@ -97,7 +97,7 @@ namespace Game.Movement
} }
if (targetMoved) if (targetMoved)
SetTargetLocation(owner, targetMoved); SetTargetLocation(owner, true);
else if (_speedChanged) else if (_speedChanged)
SetTargetLocation(owner, false); SetTargetLocation(owner, false);