Upstream merge, nothing major.

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-21 19:13:39 +11:00
parent c14cb5a15b
commit 2c6428f4b1
13 changed files with 39 additions and 324 deletions

View File

@@ -1,14 +1,14 @@
From 13be8ff0ff998aff7a3e9d2502ae61cd82e7a8b1 Mon Sep 17 00:00:00 2001
From e11e68c3e8cc31ae9a98bf793fe1da82646c37ae Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 11f018b..04939af 100644
index 6a38465..4d77259 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1396,6 +1396,13 @@ public final class CraftServer implements Server {
@@ -1398,6 +1398,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {