diff options
| -rw-r--r-- | sql/base/auth_database.sql | 5 | ||||
| -rw-r--r-- | sql/updates/auth/master/2022_12_17_01_auth.sql | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Item/Item.cpp | 2 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index ab30084c63c..ff0b8b0a19c 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -40,7 +40,7 @@ CREATE TABLE `account` ( `lock_country` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '00', `last_login` timestamp NULL DEFAULT NULL, `online` tinyint unsigned NOT NULL DEFAULT '0', - `expansion` tinyint unsigned NOT NULL DEFAULT '8', + `expansion` tinyint unsigned NOT NULL DEFAULT '9', `mutetime` bigint NOT NULL DEFAULT '0', `mutereason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', `muteby` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '', @@ -2634,7 +2634,8 @@ INSERT INTO `updates` VALUES ('2022_10_03_00_auth.sql','B956A37F71B42EB0289C2066A15D1F6C02F21E5A','ARCHIVED','2022-10-03 21:32:38',0), ('2022_11_20_00_auth.sql','37123D83589CFD96472D9187799C1F3FD67645DD','ARCHIVED','2022-11-20 11:05:20',0), ('2022_12_16_00_auth.sql','249B00480ACC8B67C908435748C202D8363C6EDE','RELEASED','2022-12-16 22:39:07',0), -('2022_12_17_00_auth.sql','0D3963AC2DBF74A4C8B88EA4A680C046FCCF8E70','RELEASED','2022-12-17 07:34:53',0); +('2022_12_17_00_auth.sql','0D3963AC2DBF74A4C8B88EA4A680C046FCCF8E70','RELEASED','2022-12-17 07:34:53',0), +('2022_12_17_01_auth.sql','5D1E2EA3C3CE087F7FB647CD0DE000979961863C','RELEASED','2022-12-17 13:09:19',0); /*!40000 ALTER TABLE `updates` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/auth/master/2022_12_17_01_auth.sql b/sql/updates/auth/master/2022_12_17_01_auth.sql new file mode 100644 index 00000000000..23ce1b5b4f9 --- /dev/null +++ b/sql/updates/auth/master/2022_12_17_01_auth.sql @@ -0,0 +1 @@ +ALTER TABLE `account` MODIFY `expansion` tinyint unsigned NOT NULL DEFAULT '9'; 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 |