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

Core/Loot: Removed unneccessary field from Loot class and pass it as parameter everywhere

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ba251da7c3615100cba60511a60cfa4f6b3bf0e2)
This commit is contained in:
hondacrx
2022-08-25 13:58:35 -04:00
parent 8407227e63
commit e3323e5640
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Loot/Loot.cs
-3
View File
@@ -171,7 +171,6 @@ namespace Game.Loots
unlootedCount = 0;
loot_type = LootType.None;
maxDuplicates = 1;
containerID = ObjectGuid.Empty;
}
// Inserts the item into the loot (called by LootTemplate processors)
@@ -852,8 +851,6 @@ namespace Game.Loots
public LootType loot_type; // required for achievement system
public byte maxDuplicates; // Max amount of items with the same entry that can drop (default is 1; on 25 man raid mode 3)
public ObjectGuid containerID;
List<ObjectGuid> PlayersLooting = new();
MultiMap<ObjectGuid, NotNormalLootItem> PlayerQuestItems = new();
MultiMap<ObjectGuid, NotNormalLootItem> PlayerFFAItems = new();
Source/Game/Loot/LootItemStorage.cs
+8 -8
View File
@@ -100,10 +100,10 @@ namespace Game.Loots
public bool LoadStoredLoot(Item item, Player player)
{
Loot loot = item.loot;
if (!_lootItemStorage.ContainsKey(loot.containerID.GetCounter()))
if (!_lootItemStorage.ContainsKey(item.GetGUID().GetCounter()))
return false;
var container = _lootItemStorage[loot.containerID.GetCounter()];
var container = _lootItemStorage[item.GetGUID().GetCounter()];
loot.gold = container.GetMoney();
LootTemplate lt = LootStorage.Items.GetLootFor(item.GetEntry());
@@ -177,26 +177,26 @@ namespace Game.Loots
_lootItemStorage[containerId].RemoveItem(itemId, count, itemIndex);
}
public void AddNewStoredLoot(Loot loot, Player player)
public void AddNewStoredLoot(ulong containerId, Loot loot, Player player)
{
// Saves the money and item loot associated with an openable item to the DB
if (loot.IsLooted()) // no money and no loot
return;
if (_lootItemStorage.ContainsKey(loot.containerID.GetCounter()))
if (_lootItemStorage.ContainsKey(containerId))
{
Log.outError(LogFilter.Misc, $"Trying to store item loot by player: {player.GetGUID()} for container id: {loot.containerID.GetCounter()} that is already in storage!");
Log.outError(LogFilter.Misc, $"Trying to store item loot by player: {player.GetGUID()} for container id: {containerId} that is already in storage!");
return;
}
StoredLootContainer container = new(loot.containerID.GetCounter());
StoredLootContainer container = new(containerId);
SQLTransaction trans = new();
if (loot.gold != 0)
container.AddMoney(loot.gold, trans);
PreparedStatement stmt = DB.Characters.GetPreparedStatement(CharStatements.DEL_ITEMCONTAINER_ITEMS);
stmt.AddValue(0, loot.containerID.GetCounter());
stmt.AddValue(0, containerId);
trans.Append(stmt);
foreach (LootItem li in loot.items)
@@ -219,7 +219,7 @@ namespace Game.Loots
DB.Characters.CommitTransaction(trans);
_lootItemStorage.TryAdd(loot.containerID.GetCounter(), container);
_lootItemStorage.TryAdd(containerId, container);
}
ConcurrentDictionary<ulong, StoredLootContainer> _lootItemStorage = new();