Sweetgum/sweetgum-server
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Riizade/config file (#520)

Browse Source 
* added POJO + yaml file

* made config members public

* switched to yaml

* modified files to use YamlConfig over ServerConstants

* removed constants from ServerConstants

* removed unused imports

* removed unused import

* removed world ini

* removed now unused .ini files

* fixed docker-launch.sh

* added jackson dependency JARs

* fixed errors

* removed unused server config values, added world defaults

* don't use env variables for docker

* fixed package imports/specifiers for js files
This commit is contained in:
Adam James-Liebau Johnson
2019-09-20 16:49:24 -07:00
committed by Ronan Lana
parent e169971384
commit 181573dc74
163 changed files with 1531 additions and 1113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/MapleClient.java
View File

@@ -44,6 +44,7 @@ import java.util.Set;
import java.util.concurrent.Semaphore;
import java.util.concurrent.locks.Lock;
import config.YamlConfig;
import jdk.nashorn.api.scripting.NashornScriptEngine;
import tools.*;
@@ -489,7 +490,7 @@ public class MapleClient {
}
public boolean checkPin(String other) {
if (!(ServerConstants.ENABLE_PIN && !canBypassPin())) {
if (!(YamlConfig.config.server.ENABLE_PIN && !canBypassPin())) {
return true;
}
@@ -526,7 +527,7 @@ public class MapleClient {
}
public boolean checkPic(String other) {
if (!(ServerConstants.ENABLE_PIC && !canBypassPic())) {
if (!(YamlConfig.config.server.ENABLE_PIC && !canBypassPic())) {
return true;
}
@@ -592,7 +593,7 @@ public class MapleClient {
loginok = (tos == 0) ? 23 : 0;
} else if (pwd.equals(passhash) || checkHash(passhash, "SHA-1", pwd) || checkHash(passhash, "SHA-512", pwd)) {
// thanks GabrielSin for detecting some no-bcrypt inconsistencies here
loginok = (tos == 0) ? (!ServerConstants.BCRYPT_MIGRATION ? 23 : -23) : (!ServerConstants.BCRYPT_MIGRATION ? 0 : -10); // migrate to bcrypt
loginok = (tos == 0) ? (!YamlConfig.config.server.BCRYPT_MIGRATION ? 23 : -23) : (!YamlConfig.config.server.BCRYPT_MIGRATION ? 0 : -10); // migrate to bcrypt
} else {
loggedIn = false;
loginok = 4;
@@ -1036,7 +1037,7 @@ public class MapleClient {
player.saveCharToDB(true);
player.logOff();
if(ServerConstants.INSTANT_NAME_CHANGE) player.doPendingNameChange();
if(YamlConfig.config.server.INSTANT_NAME_CHANGE) player.doPendingNameChange();
clear();
} else {
getChannelServer().removePlayer(player);