diff options
| author | md_5 <git@md-5.net> | 2015-05-31 12:11:56 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-05-31 12:11:56 +1000 |
| commit | d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07 (patch) | |
| tree | a167664a37cc52e3556405c21afccf7caf0bd6e2 /src | |
| parent | 6fe71f4c7fc6c0ab4e92879c58f2535f1929b4d2 (diff) | |
| download | craftbukkit-d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07.tar craftbukkit-d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07.tar.gz craftbukkit-d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07.tar.lz craftbukkit-d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07.tar.xz craftbukkit-d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07.zip | |
Remove unused bukkit.yml options and update links / info.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 4 | ||||
| -rw-r--r-- | src/main/resources/configurations/bukkit.yml | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 629e6b8b..88490873 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -553,10 +553,6 @@ public final class CraftServer implements Server { return new File((File) console.options.valueOf("plugins"), this.configuration.getString("settings.update-folder", "update")); } - public int getPingPacketLimit() { - return this.configuration.getInt("settings.ping-packet-limit", 100); - } - @Override public long getConnectionThrottle() { return this.configuration.getInt("settings.connection-throttle"); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml index a6c11786..8bbb835f 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -6,11 +6,10 @@ # If you need help on this file, feel free to join us on irc or leave a message # on the forums asking for advice. # -# IRC: #bukkit @ esper.net -# (If this means nothing to you, just go to http://webchat.esper.net/?channels=bukkit ) -# Forums: http://forums.bukkit.org/forums/bukkit-help.6/ -# Twitter: http://twitter.com/CraftBukkit -# Bug tracker: http://leaky.bukkit.org/ +# IRC: #spigot @ irc.spi.gt +# (If this means nothing to you, just go to http://www.spigotmc.org/pages/irc/ ) +# Forums: http://www.spigotmc.org/ +# Bug tracker: http://www.spigotmc.org/go/bugs settings: @@ -18,8 +17,6 @@ settings: warn-on-overload: true permissions-file: permissions.yml update-folder: update - ping-packet-limit: 100 - use-exact-login-location: false plugin-profiling: false connection-throttle: 4000 query-plugins: true |