From d33f0dd3baaa1e3f63775bae97eba9b6a0c98e07 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 31 May 2015 12:11:56 +1000
Subject: Remove unused bukkit.yml options and update links / info.

---
 src/main/java/org/bukkit/craftbukkit/CraftServer.java |  4 ----
 src/main/resources/configurations/bukkit.yml          | 11 ++++-------
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/main')

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
-- 
cgit v1.2.3