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

Core/Loot: Store references to Loot objects directly in players loot view map instead of guids of world objects holding that loot

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f19f32f2a49cf0eb235f1aa12106322bf9db2a15)
This commit is contained in:
hondacrx
2022-09-18 15:40:17 -04:00
parent 76dd5b94f0
commit bfdbcd7cbe
4 changed files with 49 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Fields.cs
+2 -1
View File
@@ -22,6 +22,7 @@ using Game.Chat;
using Game.DataStorage;
using Game.Garrisons;
using Game.Groups;
using Game.Loots;
using Game.Mails;
using Game.Maps;
using Game.Misc;
@@ -238,7 +239,7 @@ namespace Game.Entities
SceneMgr m_sceneMgr;
Dictionary<ObjectGuid /*LootObject*/, ObjectGuid /*WorldObject*/> m_AELootView = new();
Dictionary<ObjectGuid, Loot> m_AELootView = new();
CUFProfile[] _CUFProfiles = new CUFProfile[PlayerConst.MaxCUFProfiles];
float[] m_powerFraction = new float[(int)PowerType.MaxPerClass];
Source/Game/Entities/Player/Player.Items.cs
+10 -24
View File
@@ -2404,7 +2404,7 @@ namespace Game.Entities
Item bagItem = bag.GetItemByPos(i);
if (bagItem != null)
{
if (HasLootWorldObjectGUID(bagItem.GetGUID()))
if (GetLootByWorldObjectGUID(bagItem.GetGUID()) != null)
{
GetSession().DoLootReleaseAll();
released = true; // so we don't need to look at dstBag
@@ -2422,7 +2422,7 @@ namespace Game.Entities
Item bagItem = bag.GetItemByPos(i);
if (bagItem != null)
{
if (HasLootWorldObjectGUID(bagItem.GetGUID()))
if (GetLootByWorldObjectGUID(bagItem.GetGUID()) != null)
{
GetSession().DoLootReleaseAll();
break;
@@ -4096,25 +4096,12 @@ namespace Game.Entities
}
}
public ObjectGuid GetLootWorldObjectGUID(ObjectGuid lootObjectGuid)
public Loot GetLootByWorldObjectGUID(ObjectGuid lootWorldObjectGuid)
{
if (!m_AELootView.ContainsKey(lootObjectGuid))
return ObjectGuid.Empty;
if (m_AELootView.TryGetValue(lootWorldObjectGuid, out Loot lootView))
return lootView;
return m_AELootView[lootObjectGuid];
}
public void RemoveAELootedWorldObject(ObjectGuid lootWorldObjectGuid)
{
var itr = m_AELootView.FirstOrDefault(pair => pair.Value == lootWorldObjectGuid);
if (itr.Key != ObjectGuid.Empty)
m_AELootView.Remove(itr.Key);
}
public bool HasLootWorldObjectGUID(ObjectGuid lootWorldObjectGuid)
{
return m_AELootView.Any(lootView => lootView.Value == lootWorldObjectGuid);
return null;
}
//Inventory
@@ -6073,7 +6060,7 @@ namespace Game.Entities
SendEquipError(msg, null, null, item.itemid);
}
public Dictionary<ObjectGuid, ObjectGuid> GetAELootView() { return m_AELootView; }
public Dictionary<ObjectGuid, Loot> GetAELootView() { return m_AELootView; }
/// <summary>
/// if in a Battleground a player dies, and an enemy removes the insignia, the player's bones is lootable
@@ -6210,8 +6197,6 @@ namespace Game.Entities
if (lootid != 0)
{
loot.Clear();
Group group = GetGroup();
bool groupRules = (group && go.GetGoInfo().type == GameObjectTypes.Chest && go.GetGoInfo().Chest.usegrouplootrules != 0);
@@ -6373,8 +6358,9 @@ namespace Game.Entities
if (creature.CanGeneratePickPocketLoot())
{
creature.StartPickPocketRefillTimer();
loot.Clear();
loot = new Loot(GetMap(), creature.GetGUID(), LootType.Pickpocketing);
creature.loot = loot;
uint lootid = creature.GetCreatureTemplate().PickPocketId;
if (lootid != 0)
loot.FillLoot(lootid, LootStorage.Pickpocketing, this, true);
@@ -6510,7 +6496,7 @@ namespace Game.Entities
// add 'this' player as one of the players that are looting 'loot'
loot.AddLooter(GetGUID());
m_AELootView[loot.GetGUID()] = guid;
m_AELootView[loot.GetGUID()] = loot;
if (loot_type == LootType.Corpse && !guid.IsItem())
SetUnitFlag(UnitFlags.Looting);