From 946309a6b847d9eeb2c46b59507a03cee2fbcb54 Mon Sep 17 00:00:00 2001 From: Timtech Date: Mon, 14 Sep 2015 17:57:45 -0400 Subject: [PATCH 1/3] Update readme.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently now LUNI is licensed under the CC BY-NC-SA 4.0 License, and in any case I added the part in about the GPL. All the LEGO representatives told us to put is "The LEGO® Group has not endorsed or authorized the operation of this game and is not liable for any safety issues in relation to the operation of this game." --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 2670d39..feb4025 100644 --- a/readme.md +++ b/readme.md @@ -43,4 +43,4 @@ There are different kinds of "crashes" that can happen, so please pay attention - The server displays an error in the log - The server does not recieve anything/shows nothing in the log -> The LEGO® Group has not endorsed or authorized the operation of this game and is not liable for any safety issues in relation to the operation of this game. All files are under the General Public License, version 3, and are only for use on a non-commercial basis. +> The LEGO® Group has not endorsed or authorized the operation of this game and is not liable for any safety issues in relation to the operation of this game. From 24287d014360e42c8fbd9c87e173e69ca0c86736 Mon Sep 17 00:00:00 2001 From: Timtech Date: Wed, 7 Oct 2015 19:04:42 -0400 Subject: [PATCH 2/3] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index feb4025..43102a5 100644 --- a/readme.md +++ b/readme.md @@ -7,7 +7,7 @@ You should be familiar with the setup of LUNI before working with this repositor 2. To configure the server to run correctly on your machine, you need to adjust the redirect_ip in the config.ini file. - The redirect IP there is used to tell the client where to find the char/world server i.e. it is the IP the server sends whenever it informs the client about a necessary redirect. - If you care about multiplayer, this IP needs to be one that is accessible for all PCs that want to connect, so for a LAN server this would be your local address (e.g. 192.168.0.9 for me) - - You could set it up to use your global IP but then you have to deal with port forwarding and the like. + - You could set it up to use your global IP but then you have to deal with port forwarding and the like. Ports 1001, 2002, 2003, and 2004 would be forwarded. - Finally if you only want to test it locally, you can simply put in 127.0.0.1 3. Open the project in Visual Studio - Please use the Debug mode for now to see where crashes come from From e1782a6444514254ef33a508bd07e7bf52f93578 Mon Sep 17 00:00:00 2001 From: Ness199X Date: Sat, 10 Oct 2015 02:55:02 -0700 Subject: [PATCH 3/3] Fix two no default errors that prevent account and character creation. Update outdated information in the Readme --- SQL/luni-2015-09-14.sql | 4 ++-- Source/AccountsDB.cpp | 2 +- readme.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SQL/luni-2015-09-14.sql b/SQL/luni-2015-09-14.sql index d5f3523..1004e15 100644 --- a/SQL/luni-2015-09-14.sql +++ b/SQL/luni-2015-09-14.sql @@ -80,8 +80,8 @@ CREATE TABLE IF NOT EXISTS `characters` ( `faction` tinyint(1) NOT NULL DEFAULT '0', `worldID` int(11) NOT NULL DEFAULT '0', `lastZoneId` int(11) NOT NULL, - `mapInstance` int(11) NOT NULL, - `mapClone` int(11) NOT NULL, + `mapInstance` int(11) NOT NULL DEFAULT '0', + `mapClone` int(11) NOT NULL DEFAULT '0', `x` double NOT NULL DEFAULT '0', `y` double NOT NULL DEFAULT '0', `z` double NOT NULL DEFAULT '0', diff --git a/Source/AccountsDB.cpp b/Source/AccountsDB.cpp index acb1938..66c471c 100644 --- a/Source/AccountsDB.cpp +++ b/Source/AccountsDB.cpp @@ -23,7 +23,7 @@ unsigned long long AccountsTable::addAccount(std::string name, std::string passw unsigned int id = AccountsTable::getAccountID(name); if (id > 0) return 0; //Account name already exists std::string hpw = hashPassword(password); //Hash password - Database::Query("INSERT INTO `accounts` (`id`, `name`, `password`, `email`, `ip`, `rank`, `numChars`, `frontChar`, `lastLog`, `activeSub`, `subTime`, `legoClub`, `locked`, `banned`, `loginTries`) VALUES (NULL, '" + name + "', '" + hpw + "', '', '127.0.0.1', '0', '0', '0', CURRENT_TIMESTAMP, '0', '', '', '0', '0', '0');"); + Database::Query("INSERT INTO `accounts` (`id`, `name`, `password`, `email`, `ip`, `rank`, `numChars`, `frontChar`, `lastLog`, `activeSub`, `subTime`, `legoClub`, `locked`, `banned`, `loginTries`) VALUES (NULL, '" + name + "', '" + hpw + "', '', '127.0.0.1', '0', '0', '0', CURRENT_TIMESTAMP, '0', '0', '0', '0', '0', '0');"); unsigned long long accountid = mysql_insert_id(Database::getConnection()); return accountid; } diff --git a/readme.md b/readme.md index 2670d39..877428a 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ ## Setup Instructions You should be familiar with the setup of LUNI before working with this repository. -1. Setup xampp with mysql and import luni.sql +1. Setup xampp with mysql and import SQL/luni-2015-09-14.sql 2. To configure the server to run correctly on your machine, you need to adjust the redirect_ip in the config.ini file. - The redirect IP there is used to tell the client where to find the char/world server i.e. it is the IP the server sends whenever it informs the client about a necessary redirect. - If you care about multiplayer, this IP needs to be one that is accessible for all PCs that want to connect, so for a LAN server this would be your local address (e.g. 192.168.0.9 for me)