summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java4
-rw-r--r--src/main/resources/configurations/bukkit.yml1
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