From a52c1f21a6cbdd225bfae11321561ac1af0b7735 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 11 Jan 2023 00:40:16 -0500 Subject: [PATCH] Core/Loot: Added loot slot check to Loot::LootItemInSlot (client sent-value) Port From (https://github.com/TrinityCore/TrinityCore/commit/2eea58f26e8fe88f3294dca3d4a38d6a20d68e07) --- Source/Game/Entities/Player/Player.cs | 2 +- Source/Game/Loot/Loot.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 025749320..a17670cdc 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -1905,7 +1905,7 @@ namespace Game.Entities } else if (playerClass == Class.DemonHunter) startLevel = Math.Max(WorldConfig.GetUIntValue(WorldCfg.StartDemonHunterPlayerLevel), startLevel); - else if (playerClass == CLASS_EVOKER) + else if (playerClass == Class.Evoker) startLevel = Math.Max(WorldConfig.GetUIntValue(WorldCfg.StartEvokerPlayerLevel), startLevel); if (characterTemplateId.HasValue) diff --git a/Source/Game/Loot/Loot.cs b/Source/Game/Loot/Loot.cs index 4d7190f13..0a3d55404 100644 --- a/Source/Game/Loot/Loot.cs +++ b/Source/Game/Loot/Loot.cs @@ -956,10 +956,14 @@ namespace Game.Loots { return LootItemInSlot(lootSlot, player, out _); } + public LootItem LootItemInSlot(uint lootListId, Player player, out NotNormalLootItem ffaItem) { ffaItem = null; + if (lootListId >= items.Count) + return null; + LootItem item = items[(int)lootListId]; bool is_looted = item.is_looted;