Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Made bukkit settings reload on reload().

Browse Source
This commit is contained in:
sunkid 2011-06-23 11:06:09 -07:00 committed by EvilSeph
parent ebfd973d09
commit 6e746ef79a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -85,14 +85,13 @@ public final class CraftServer implements Server {
Logger.getLogger("Minecraft").log(Level.INFO, "This server is running " + getName() + " version " + getVersion()); Logger.getLogger("Minecraft").log(Level.INFO, "This server is running " + getName() + " version " + getVersion());
configuration = new Configuration((File) console.options.valueOf("bukkit-settings")); configuration = new Configuration((File) console.options.valueOf("bukkit-settings"));
configuration.load(); loadConfig();
loadConfigDefaults();
configuration.save();
loadPlugins(); loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP); enablePlugins(PluginLoadOrder.STARTUP);
} }
private void loadConfigDefaults() { private void loadConfig() {
configuration.load();
configuration.getString("database.url", "jdbc:sqlite:{DIR}{NAME}.db"); configuration.getString("database.url", "jdbc:sqlite:{DIR}{NAME}.db");
configuration.getString("database.username", "bukkit"); configuration.getString("database.username", "bukkit");
configuration.getString("database.password", "walrus"); configuration.getString("database.password", "walrus");
@ -107,6 +106,7 @@ public final class CraftServer implements Server {
icanhasbukkit.add("version"); icanhasbukkit.add("version");
configuration.setProperty("aliases.icanhasbukkit", icanhasbukkit); configuration.setProperty("aliases.icanhasbukkit", icanhasbukkit);
} }
configuration.save();
} }
public void loadPlugins() { public void loadPlugins() {
@ -311,6 +311,7 @@ public final class CraftServer implements Server {
} }
public void reload() { public void reload() {
loadConfig();
PropertyManager config = new PropertyManager(console.options); PropertyManager config = new PropertyManager(console.options);
console.propertyManager = config; console.propertyManager = config;