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 20:49:24 -03: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
src/server/maps/MapleHiredMerchant.java
+4 -3
View File
@@ -31,6 +31,7 @@ import client.inventory.manipulator.MapleInventoryManipulator;
import client.inventory.manipulator.MapleKarmaManipulator;
import client.processor.FredrickProcessor;
import com.mysql.jdbc.Statement;
import config.YamlConfig;
import constants.ServerConstants;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -232,7 +233,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
chr.announce(MaplePacketCreator.updateHiredMerchant(this, chr));
}
if (ServerConstants.USE_ENFORCE_MERCHANT_SAVE) {
if (YamlConfig.config.server.USE_ENFORCE_MERCHANT_SAVE) {
chr.saveCharToDB(false);
}
}
@@ -287,7 +288,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
pItem.setDoesExist(false);
}
if(ServerConstants.USE_ANNOUNCE_SHOPITEMSOLD) { // idea thanks to Vcoc
if(YamlConfig.config.server.USE_ANNOUNCE_SHOPITEMSOLD) { // idea thanks to Vcoc
announceItemSold(newItem, price, getQuantityLeft(pItem.getItem().getItemId()));
}
@@ -448,7 +449,7 @@ public class MapleHiredMerchant extends AbstractMapleMapObject {
e.printStackTrace();
}
if (ServerConstants.USE_ENFORCE_MERCHANT_SAVE) {
if (YamlConfig.config.server.USE_ENFORCE_MERCHANT_SAVE) {
c.getPlayer().saveCharToDB(false);
}