summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/MinecraftServer.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-15 11:11:25 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-15 11:11:41 +0100
commitd7cec38c385e83c155a47fa970e223361de3d9a9 (patch)
treef3b1ebc4b2bb9ead0bfca2d4670ae738778f7d8e /src/main/java/net/minecraft/server/MinecraftServer.java
parent25050e38eb02c93b32fc9b1eaf2de82992a7ff3a (diff)
downloadcraftbukkit-d7cec38c385e83c155a47fa970e223361de3d9a9.tar
craftbukkit-d7cec38c385e83c155a47fa970e223361de3d9a9.tar.gz
craftbukkit-d7cec38c385e83c155a47fa970e223361de3d9a9.tar.lz
craftbukkit-d7cec38c385e83c155a47fa970e223361de3d9a9.tar.xz
craftbukkit-d7cec38c385e83c155a47fa970e223361de3d9a9.zip
Adding the option to suppress overload warnings as a bukkit.yml option. Thanks oloflarsson for the PR.
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 94ab57fc..fc844a3a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -412,6 +412,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
long l = k - i;
if (l > 2000L) {
+ if (this.server.getWarnOnOverload()) // CraftBukkit - Adding an option to suppress these warning messages
log.warning("Can\'t keep up! Did the system time change, or is the server overloaded?");
l = 2000L;
}