From 08bd335cdb96524da69bde8f30b9c397f7d4fa2b Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sun, 9 Sep 2018 00:03:07 -0500 Subject: [PATCH 1/4] Update install.sh [skip ci] --- utils/scripts/linux_installer/install.sh | 50 ++++++++++++------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/utils/scripts/linux_installer/install.sh b/utils/scripts/linux_installer/install.sh index 8f6f2f4d4..64c376bb3 100644 --- a/utils/scripts/linux_installer/install.sh +++ b/utils/scripts/linux_installer/install.sh @@ -54,36 +54,38 @@ export apt_options="-y -qq" # Set autoconfirm and silent install ################################################################ +if [ ! -f ./install_variables.txt ]; then + read -n1 -r -p "Press any key to continue..." key + #::: Setting up user environment (eqemu) + echo "First, we need to set your passwords..." + echo "Make sure that you remember these and keep them somewhere" + echo "" + echo "" + groupadd eqemu + useradd -g eqemu -d $eqemu_server_directory eqemu + passwd eqemu -#::: Setting up user environment (eqemu) -echo "First, we need to set your passwords..." -echo "Make sure that you remember these and keep them somewhere" -echo "" -echo "" -groupadd eqemu -useradd -g eqemu -d $eqemu_server_directory eqemu -passwd eqemu + #::: Make server directory and go to it + mkdir $eqemu_server_directory + cd $eqemu_server_directory -#::: Make server directory and go to it -mkdir $eqemu_server_directory -cd $eqemu_server_directory + #::: Setup MySQL root user PW + read -p "Enter MySQL root (Database) password: " eqemu_db_root_password -#::: Setup MySQL root user PW -read -p "Enter MySQL root (Database) password: " eqemu_db_root_password + #::: Write install variables (later use) + echo "mysql_root:$eqemu_db_root_password" > install_variables.txt -#::: Write install variables (later use) -echo "mysql_root:$eqemu_db_root_password" > install_variables.txt + #::: Setup MySQL server + read -p "Enter Database Name (single word, no special characters, lower case):" eqemu_db_name + read -p "Enter (Database) MySQL EQEmu Server username: " eqemu_db_username + read -p "Enter (Database) MySQL EQEmu Server password: " eqemu_db_password -#::: Setup MySQL server -read -p "Enter Database Name (single word, no special characters, lower case):" eqemu_db_name -read -p "Enter (Database) MySQL EQEmu Server username: " eqemu_db_username -read -p "Enter (Database) MySQL EQEmu Server password: " eqemu_db_password - -#::: Write install variables (later use) -echo "mysql_eqemu_db_name:$eqemu_db_name" >> install_variables.txt -echo "mysql_eqemu_user:$eqemu_db_username" >> install_variables.txt -echo "mysql_eqemu_password:$eqemu_db_password" >> install_variables.txt + #::: Write install variables (later use) + echo "mysql_eqemu_db_name:$eqemu_db_name" >> install_variables.txt + echo "mysql_eqemu_user:$eqemu_db_username" >> install_variables.txt + echo "mysql_eqemu_password:$eqemu_db_password" >> install_variables.txt +fi if [[ "$OS" == "Debian" ]]; then # Install pre-req packages From 92eb64b51ceb650e033bbaf32c9ea0596a850065 Mon Sep 17 00:00:00 2001 From: Chris Miles Date: Sun, 9 Sep 2018 00:04:16 -0500 Subject: [PATCH 2/4] Update install.sh [skip ci] --- utils/scripts/linux_installer/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/scripts/linux_installer/install.sh b/utils/scripts/linux_installer/install.sh index 64c376bb3..386503119 100644 --- a/utils/scripts/linux_installer/install.sh +++ b/utils/scripts/linux_installer/install.sh @@ -56,7 +56,8 @@ export apt_options="-y -qq" # Set autoconfirm and silent install if [ ! -f ./install_variables.txt ]; then -read -n1 -r -p "Press any key to continue..." key + read -n1 -r -p "Press any key to continue..." key + #::: Setting up user environment (eqemu) echo "First, we need to set your passwords..." echo "Make sure that you remember these and keep them somewhere" From 55c0cc02a1c6567329f8397b14f5656dbcbe5edb Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 9 Sep 2018 02:27:04 -0500 Subject: [PATCH 3/4] Update eqemu_server.pl [skip ci] --- utils/scripts/eqemu_server.pl | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl index eed4a767e..29a8142a6 100644 --- a/utils/scripts/eqemu_server.pl +++ b/utils/scripts/eqemu_server.pl @@ -172,19 +172,19 @@ sub show_install_summary_info { if (-e "install_variables.txt") { $file_to_open = "install_variables.txt"; } - elsif(-e "../install_variables.txt"){ + elsif (-e "../install_variables.txt") { $file_to_open = "../install_variables.txt"; } - open (INSTALL_VARS, $file_to_open); - while (){ + open(INSTALL_VARS, $file_to_open); + while () { chomp; $o = $_; @data = split(":", $o); print " - " . $data[0] . "\t" . $data[1] . "\n"; } - close (INSTALL_VARS); - - if($OS eq "Windows"){ + close(INSTALL_VARS); + + if ($OS eq "Windows") { print "[Install] Windows Utility Scripts:\n"; print " - t_start_server.bat Starts EQEmu server with 30 dynamic zones, UCS & Queryserv, dynamic zones\n"; print " - t_start_server_with_loginserver.bat Starts EQEmu server with 30 zones with loginserver\n"; @@ -192,16 +192,16 @@ sub show_install_summary_info { print " - t_database_backup.bat Backs up the Database to backups/ folder - do not run during server is online\n"; print " - t_server_crash_report.pl Will parse any zone crashes for reporting to developers\n"; } - if($OS eq "Linux"){ + if ($OS eq "Linux") { print "[Install] Linux Utility Scripts:\n"; print " - server_start.sh Starts EQEmu server (Quiet) with 30 dynamic zones, UCS & Queryserv, dynamic zones\n"; print " - server_start_dev.sh Starts EQEmu server with 10 dynamic zones, UCS & Queryserv, dynamic zones all verbose\n"; print " - server_stop.sh Stops EQEmu Server (No warning)\n"; print " - server_status.sh Prints the status of the EQEmu Server processes\n"; } - + print "[Configure] eqemu_config.xml Edit to change server settings and name\n"; - + analytics_insertion("install_complete", "null"); } @@ -831,6 +831,7 @@ sub show_menu_prompt { elsif($input eq "setup_bots"){ setup_bots(); $dc = 1; } elsif($input eq "linux_login_server_setup"){ do_linux_login_server_setup(); $dc = 1; } elsif($input eq "quest_heading_convert"){ quest_heading_convert(); $dc = 1; } + elsif($input eq "source_peq_db"){ fetch_peq_db_full(); $dc = 1; } elsif($input eq "exit"){ exit; } From 953bee6c215417178532fba77c7e168008499be3 Mon Sep 17 00:00:00 2001 From: Uleat Date: Tue, 11 Sep 2018 20:05:43 -0400 Subject: [PATCH 4/4] Fix for crash when dropping items (c != python) --- zone/inventory.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 902268e2c..d4604852d 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -610,15 +610,15 @@ void Client::DropItem(int16 slot_id, bool recurse) if (LogSys.log_settings[Logs::Inventory].is_category_enabled) { Log(Logs::General, Logs::Inventory, "DropItem() Hack detected - full item parse:"); Log(Logs::General, Logs::Inventory, "depth: 0, Item: '%s' (id: %u), IsDroppable: %s", - (invalid_drop->GetItem() ? invalid_drop->GetItem()->Name : "null data"), invalid_drop->GetID(), invalid_drop->IsDroppable(false)); + (invalid_drop->GetItem() ? invalid_drop->GetItem()->Name : "null data"), invalid_drop->GetID(), (invalid_drop->IsDroppable(false) ? "true" : "false")); for (auto iter1 : *invalid_drop->GetContents()) { // depth 1 Log(Logs::General, Logs::Inventory, "-depth: 1, Item: '%s' (id: %u), IsDroppable: %s", - (iter1.second->GetItem() ? iter1.second->GetItem()->Name : "null data"), iter1.second->GetID(), iter1.second->IsDroppable(false)); + (iter1.second->GetItem() ? iter1.second->GetItem()->Name : "null data"), iter1.second->GetID(), (iter1.second->IsDroppable(false) ? "true" : "false")); for (auto iter2 : *iter1.second->GetContents()) { // depth 2 Log(Logs::General, Logs::Inventory, "--depth: 2, Item: '%s' (id: %u), IsDroppable: %s", - (iter2.second->GetItem() ? iter2.second->GetItem()->Name : "null data"), iter2.second->GetID(), iter2.second->IsDroppable(false)); + (iter2.second->GetItem() ? iter2.second->GetItem()->Name : "null data"), iter2.second->GetID(), (iter2.second->IsDroppable(false) ? "true" : "false")); } } } @@ -636,21 +636,21 @@ void Client::DropItem(int16 slot_id, bool recurse) if (LogSys.log_settings[Logs::Inventory].is_category_enabled) { Log(Logs::General, Logs::Inventory, "DropItem() Processing - full item parse:"); Log(Logs::General, Logs::Inventory, "depth: 0, Item: '%s' (id: %u), IsDroppable: %s", - (inst->GetItem() ? inst->GetItem()->Name : "null data"), inst->GetID(), inst->IsDroppable(false)); + (inst->GetItem() ? inst->GetItem()->Name : "null data"), inst->GetID(), (inst->IsDroppable(false) ? "true" : "false")); if (!inst->IsDroppable(false)) Log(Logs::General, Logs::Error, "Non-droppable item being processed for drop by '%s'", GetCleanName()); for (auto iter1 : *inst->GetContents()) { // depth 1 Log(Logs::General, Logs::Inventory, "-depth: 1, Item: '%s' (id: %u), IsDroppable: %s", - (iter1.second->GetItem() ? iter1.second->GetItem()->Name : "null data"), iter1.second->GetID(), iter1.second->IsDroppable(false)); + (iter1.second->GetItem() ? iter1.second->GetItem()->Name : "null data"), iter1.second->GetID(), (iter1.second->IsDroppable(false) ? "true" : "false")); if (!iter1.second->IsDroppable(false)) Log(Logs::General, Logs::Error, "Non-droppable item being processed for drop by '%s'", GetCleanName()); for (auto iter2 : *iter1.second->GetContents()) { // depth 2 Log(Logs::General, Logs::Inventory, "--depth: 2, Item: '%s' (id: %u), IsDroppable: %s", - (iter2.second->GetItem() ? iter2.second->GetItem()->Name : "null data"), iter2.second->GetID(), iter2.second->IsDroppable(false)); + (iter2.second->GetItem() ? iter2.second->GetItem()->Name : "null data"), iter2.second->GetID(), (iter2.second->IsDroppable(false) ? "true" : "false")); if (!iter2.second->IsDroppable(false)) Log(Logs::General, Logs::Error, "Non-droppable item being processed for drop by '%s'", GetCleanName());