diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 2 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/game/Entities/Item/Item.cpp b/src/server/game/Entities/Item/Item.cpp index 3a2e55bb412..2a3766fd02f 100644 --- a/src/server/game/Entities/Item/Item.cpp +++ b/src/server/game/Entities/Item/Item.cpp @@ -1242,7 +1242,7 @@ uint8 Item::GetBagSlot() const bool Item::IsEquipped() const { - return !IsInBag() && ((m_slot >= EQUIPMENT_SLOT_START && m_slot < EQUIPMENT_SLOT_END) + return !IsInBag() && (m_slot < EQUIPMENT_SLOT_END || (m_slot >= PROFESSION_SLOT_START && m_slot < PROFESSION_SLOT_END)); } diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index cb30a7eb96b..fe03a29dfed 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -699,7 +699,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) @@ -709,7 +710,7 @@ DeclinedNames = 0 # 1 - (Expansion 1) # 0 - (Disabled, Ignore and disable expansion content (maps, races, classes) -Expansion = 8 +Expansion = 9 # # MinPlayerName |