diff options
| author | H31IX <effectsdude@gmail.com> | 2012-06-09 13:59:52 -0400 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2012-06-20 12:40:12 -0500 |
| commit | 0095add08c4ca77f8e236a464eadeae4620f577a (patch) | |
| tree | a8a7b4578ba11520cf18c79deaeac68909289d3f /src/main | |
| parent | 6bbae461d5cf6fb508201633c1c9776808f1af7c (diff) | |
| download | craftbukkit-0095add08c4ca77f8e236a464eadeae4620f577a.tar craftbukkit-0095add08c4ca77f8e236a464eadeae4620f577a.tar.gz craftbukkit-0095add08c4ca77f8e236a464eadeae4620f577a.tar.lz craftbukkit-0095add08c4ca77f8e236a464eadeae4620f577a.tar.xz craftbukkit-0095add08c4ca77f8e236a464eadeae4620f577a.zip | |
Add query-plugins setting. Addresses BUKKIT-1781
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 4 | ||||
| -rw-r--r-- | src/main/resources/configurations/bukkit.yml | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 687932f5..e6c7ec13 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -728,7 +728,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe result.append(" on Bukkit "); result.append(server.getBukkitVersion()); - if (plugins.length > 0) { + if (plugins.length > 0 && this.server.getQueryPlugins()) { result.append(": "); for (int i = 0; i < plugins.length; i++) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index f695b833..f73a1e50 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -399,6 +399,10 @@ public final class CraftServer implements Server { public boolean getWarnOnOverload() { return this.configuration.getBoolean("settings.warn-on-overload"); } + + public boolean getQueryPlugins() { + return this.configuration.getBoolean("settings.query-plugins"); + } public boolean hasWhitelist() { return this.getConfigBoolean("white-list", false); diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml index ebd6d02a..5d250118 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml @@ -23,6 +23,7 @@ settings: use-exact-login-location: false plugin-profiling: false connection-throttle: 4000 + query-plugins: true spawn-limits: monsters: 70 animals: 15 |