Upstream merge: Fix ender crystal stack overflow
This commit is contained in:
parent
dda042aca8
commit
e24ab2a11f
2
Bukkit
2
Bukkit
@ -1 +1 @@
|
|||||||
Subproject commit b9a0f9759d42f49f2ce23524f8f3d9d185fdb260
|
Subproject commit aa8336ec6a2981eb577fb07fc8102b8ab4d9987e
|
@ -1 +1 @@
|
|||||||
Subproject commit 8356f65daa8e01bbb33b4c6345b6724ee991502b
|
Subproject commit d550f2fc83405340bc1d3a03fadbef3b581c8a55
|
@ -1,14 +1,14 @@
|
|||||||
From 2b8d8eaeba2e003f64678371bfd50d10cdef2634 Mon Sep 17 00:00:00 2001
|
From 6032a32dff698ab5eee24a87c19aa6a0dc0f7dda Mon Sep 17 00:00:00 2001
|
||||||
From: md_5 <md_5@live.com.au>
|
From: md_5 <md_5@live.com.au>
|
||||||
Date: Fri, 21 Jun 2013 18:05:54 +1000
|
Date: Fri, 21 Jun 2013 18:05:54 +1000
|
||||||
Subject: [PATCH] Allow Disabling of Command TabComplete
|
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
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index f66f764..53be9ae 100644
|
index df0a5ac..2bd80ab 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -1598,6 +1598,13 @@ public final class CraftServer implements Server {
|
@@ -1602,6 +1602,13 @@ public final class CraftServer implements Server {
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> tabCompleteCommand(Player player, String message) {
|
public List<String> tabCompleteCommand(Player player, String message) {
|
||||||
|
Loading…
Reference in New Issue
Block a user