diff options
author | Shauren <shauren.trinity@gmail.com> | 2022-12-17 13:36:29 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-12-17 13:36:29 +0100 |
commit | caad5c36bda0b348e30f21981a29adbc2fc059e4 (patch) | |
tree | 63d0b24541bc83473a86f7339d64a14225be545f /src | |
parent | 13ab33f5b5afd1b8f801c8f8cab5820e35ea9c0a (diff) |
Core/Misc: Updated default expansion to 9
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 |