Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-12 18:17:59 +10:00
parent bfb1eb0a65
commit d7732f5871
3 changed files with 10 additions and 18 deletions

View File

@@ -1,14 +1,14 @@
From ebcb0fc76e2b4cb6978aae5ca4d8adbb47212ca3 Mon Sep 17 00:00:00 2001
From bec9ec4cdc1f74c2811c3a53d8ce1c6b845da231 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 7c5db94..4cb78fd 100644
index 9abb380..2b6b9fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1583,6 +1583,13 @@ public final class CraftServer implements Server {
@@ -1591,6 +1591,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {