Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-07 17:16:57 +10:00
parent fe5a2d46bd
commit 3eb0f032f0
13 changed files with 48 additions and 55 deletions

View File

@@ -1,14 +1,14 @@
From 0609e78093f3d90c3cffe1c7592b3260b4283244 Mon Sep 17 00:00:00 2001
From 31f79e7e3a92d88ec1e3290104c71311d20b5d93 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 389f80e..267605b 100644
index c127f2a..0fa69ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1361,7 +1361,7 @@ public final class CraftServer implements Server {
@@ -1365,7 +1365,7 @@ public final class CraftServer implements Server {
public List<String> tabCompleteCommand(Player player, String message) {
List<String> completions = null;
try {