Merge branch 'master' into feature/eqemu-api-data-service-netstats-ws

utils/scripts/eqemu_server.pl

@@ -72,14 +72,6 @@ if (-e "eqemu_update.pl") {
     unlink("eqemu_update.pl");
 }
 
-if (-e "db_update") {
-    unlink("db_update");
-}
-
-if (-e "updates_staged") {
-    unlink("updates_staged");
-}
-
 print "[Info] For EQEmu Server management utilities - run eqemu_server.pl\n" if $ARGV[0] eq "ran_from_world";
 
 check_db_version_table();
@@ -652,6 +644,14 @@ sub do_self_update_check_routine {
         }
         else {
             print "[Update] No script update necessary...\n";
+
+            if (-e "db_update") {
+                unlink("db_update");
+            }
+
+            if (-e "updates_staged") {
+                unlink("updates_staged");
+            }
         }
 
         unlink("updates_staged/eqemu_server.pl");

utils/sql/git/bots/bots_db_update_manifest.txt

@@ -21,6 +21,7 @@
 9020|2018_08_13_bots_inventory_update.sql|SELECT * FROM `inventory_versions` WHERE `version` = 2 and `bot_step` = 0|not_empty|
 9021|2018_10_09_bots_owner_options.sql|SHOW TABLES LIKE 'bot_owner_options'|empty|
 9022|2019_02_07_bots_stance_type_update.sql|SELECT * FROM `bot_spell_casting_chances` WHERE `spell_type_index` = '255' AND `class_id` = '255' AND `stance_index` = '0'|not_empty|
+9023|2019_06_22_bots_owner_option_stats_update.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'stats_update'|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_06_22_bots_owner_option_stats_update.sql

@@ -0,0 +1 @@
+ALTER TABLE `bot_owner_options` ADD COLUMN `stats_update` SMALLINT(3) UNSIGNED NULL DEFAULT '0' AFTER `death_marquee`;