Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-01-15 20:28:26 +11:00
parent e4f2987e65
commit 1180c5cc83
15 changed files with 47 additions and 47 deletions

View File

@@ -1,14 +1,14 @@
From 70929539b9364e87555da91424d189d0e70949d2 Mon Sep 17 00:00:00 2001
From 8db8936f36c119edbf0ed957948978d6b4a8e4aa 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 6a38465..0633516 100644
index b60ca66..4f03183 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1398,6 +1398,13 @@ public final class CraftServer implements Server {
@@ -1400,6 +1400,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message) {