From 9dfd0d0bd5bdd734a97d75a800870b1b4c208638 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 4 Jan 2023 02:54:41 -0500 Subject: [PATCH] Core/Misc: Updated default expansion to 9 Port From (https://github.com/TrinityCore/TrinityCore/commit/caad5c36bda0b348e30f21981a29adbc2fc059e4) --- Source/Game/Entities/Item/Item.cs | 6 +++--- Source/WorldServer/WorldServer.conf.dist | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/Game/Entities/Item/Item.cs b/Source/Game/Entities/Item/Item.cs index edfd484a0..a3504211a 100644 --- a/Source/Game/Entities/Item/Item.cs +++ b/Source/Game/Entities/Item/Item.cs @@ -804,11 +804,11 @@ namespace Game.Entities public bool IsEquipped() { - return !IsInBag() && ((m_slot >= EquipmentSlot.Start && m_slot < EquipmentSlot.End) + return !IsInBag() && (m_slot < EquipmentSlot.End || (m_slot >= ProfessionSlots.Start && m_slot < ProfessionSlots.End)); } - - public bool CanBeTraded(bool mail = false, bool trade = false) + + public bool CanBeTraded(bool mail = false, bool trade = false) { if (m_lootGenerated) return false; diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist index 8c952672e..c959badea 100644 --- a/Source/WorldServer/WorldServer.conf.dist +++ b/Source/WorldServer/WorldServer.conf.dist @@ -671,7 +671,8 @@ DeclinedNames = 0 # Expansion # Description: Allow server to use content from expansions. Checks for expansion-related # map files, client compatibility and class/race character creation. -# Default: 8 - (Expansion 8) +# Default: 9 - (Expansion 9) +# 8 - (Expansion 8) # 7 - (Expansion 7) # 6 - (Expansion 6) # 5 - (Expansion 5) @@ -681,7 +682,7 @@ DeclinedNames = 0 # 1 - (Expansion 1) # 0 - (Disabled, Ignore and disable expansion content (maps, races, classes) -Expansion = 8 +Expansion = 9 # # MinPlayerName