diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2012-02-10 13:56:16 -0600 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-29 10:00:49 -0500 |
| commit | 257fd162423825bcdc7375b790df00a81cedee7c (patch) | |
| tree | 9b8885b5d2a08b0ae7a389f58cf66b2f97c6f3ee | |
| parent | 92dfb2500b68de14bc9b873f7d5821090af9bac0 (diff) | |
| download | craftbukkit-257fd162423825bcdc7375b790df00a81cedee7c.tar craftbukkit-257fd162423825bcdc7375b790df00a81cedee7c.tar.gz craftbukkit-257fd162423825bcdc7375b790df00a81cedee7c.tar.lz craftbukkit-257fd162423825bcdc7375b790df00a81cedee7c.tar.xz craftbukkit-257fd162423825bcdc7375b790df00a81cedee7c.zip | |
Added plugin-profiling setting to bukkit.yml.
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 | ||||
| -rw-r--r-- | src/main/resources/configurations/bukkit.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 413e1a74..7589fe26 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -155,7 +155,7 @@ public final class CraftServer implements Server { configuration.options().copyDefaults(true); configuration.setDefaults(YamlConfiguration.loadConfiguration(getClass().getClassLoader().getResourceAsStream("configurations/bukkit.yml"))); saveConfig(); - ((SimplePluginManager) pluginManager).useTimings(configuration.getBoolean("settings.plugin-profiling", false)); + ((SimplePluginManager) pluginManager).useTimings(configuration.getBoolean("settings.plugin-profiling")); updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel")); updater.setEnabled(configuration.getBoolean("auto-updater.enabled")); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml index 55c9407d..2a93eb9d 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -21,6 +21,7 @@ settings: update-folder: update ping-packet-limit: 100 use-exact-login-location: false + plugin-profiling: false ticks-per: animal-spawns: 400 monster-spawns: 1 |