Merge branch 'master' of https://github.com/EQEmu/Server into lsid

# Conflicts:
#	common/ruletypes.h
#	world/net.cpp
#	zone/bot_command.cpp
#	zone/command.cpp
#	zone/zonedb.cpp

utils/sql/git/bots/bots_db_update_manifest.txt

@@ -24,6 +24,7 @@
 9023|2019_06_22_bots_owner_option_stats_update.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'stats_update'|empty|
 9024|2019_06_27_bots_pet_get_lost.sql|SELECT `bot_command` FROM `bot_command_settings` WHERE `bot_command` LIKE 'petgetlost'|empty|
 9025|2019_08_26_bots_owner_option_spawn_message.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'spawn_message_enabled'|empty|
+9026|2019_09_09_bots_owner_options_rework.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'option_type'|empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not

utils/sql/git/bots/required/2019_09_09_bots_owner_options_rework.sql

@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS `bot_owner_options`;
+
+CREATE TABLE `bot_owner_options` (
+	`owner_id` INT(11) UNSIGNED NOT NULL,
+	`option_type` SMALLINT(3) UNSIGNED NOT NULL,
+	`option_value` SMALLINT(3) UNSIGNED NULL DEFAULT '0',
+	PRIMARY KEY (`owner_id`, `option_type`)
+)
+COLLATE='latin1_swedish_ci'
+ENGINE=InnoDB;