Core/Loot: Corrected loot release logic on leaving world and swapping bags
Port From (https://github.com/TrinityCore/TrinityCore/commit/30ad7e3337f8da32cb567489f4203c7eb35d17a4)
This commit is contained in:
@@ -2393,7 +2393,7 @@ namespace Game.Entities
|
||||
|
||||
// if player is moving bags and is looting an item inside this bag
|
||||
// release the loot
|
||||
if (!GetLootGUID().IsEmpty())
|
||||
if (!GetAELootView().Empty())
|
||||
{
|
||||
bool released = false;
|
||||
if (IsBagPos(src))
|
||||
@@ -2404,9 +2404,9 @@ namespace Game.Entities
|
||||
Item bagItem = bag.GetItemByPos(i);
|
||||
if (bagItem != null)
|
||||
{
|
||||
if (bagItem.GetGUID() == GetLootGUID())
|
||||
if (HasLootWorldObjectGUID(bagItem.GetGUID()))
|
||||
{
|
||||
GetSession().DoLootRelease(GetLootGUID());
|
||||
GetSession().DoLootReleaseAll();
|
||||
released = true; // so we don't need to look at dstBag
|
||||
break;
|
||||
}
|
||||
@@ -2422,9 +2422,9 @@ namespace Game.Entities
|
||||
Item bagItem = bag.GetItemByPos(i);
|
||||
if (bagItem != null)
|
||||
{
|
||||
if (bagItem.GetGUID() == GetLootGUID())
|
||||
if (HasLootWorldObjectGUID(bagItem.GetGUID()))
|
||||
{
|
||||
GetSession().DoLootRelease(GetLootGUID());
|
||||
GetSession().DoLootReleaseAll();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -756,9 +756,7 @@ namespace Game.Entities
|
||||
StopCastingBindSight();
|
||||
UnsummonPetTemporaryIfAny();
|
||||
ClearComboPoints();
|
||||
ObjectGuid lootGuid = GetLootGUID();
|
||||
if (!lootGuid.IsEmpty())
|
||||
GetSession().DoLootRelease(lootGuid);
|
||||
GetSession().DoLootReleaseAll();
|
||||
Global.OutdoorPvPMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId);
|
||||
Global.BattleFieldMgr.HandlePlayerLeaveZone(this, m_zoneUpdateId);
|
||||
}
|
||||
|
||||
@@ -350,7 +350,8 @@ namespace Game
|
||||
player.SendLootRelease(lguid);
|
||||
player.RemoveAELootedWorldObject(lguid);
|
||||
|
||||
player.RemoveUnitFlag(UnitFlags.Looting);
|
||||
if (player.GetAELootView().Empty())
|
||||
player.RemoveUnitFlag(UnitFlags.Looting);
|
||||
|
||||
if (!player.IsInWorld)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user