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 9f356ddcc7487abf849f336e32efe87d3505f4c7 Mon Sep 17 00:00:00 2001
From 9fa22f91e7a72a105765b2a1b512d7c199b03980 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 18 Dec 2013 10:19:50 +1100
Subject: [PATCH] Allow for fallback commands to be removed.
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index c2f488a..9283b23 100644
index d178ad0..8dafd02 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -330,4 +330,18 @@ public class SimpleCommandMap implements CommandMap {
@@ -332,4 +332,18 @@ public class SimpleCommandMap implements CommandMap {
}
}
}