testserver/Spigot-API-Patches/0013-Expose-server-CommandM...

75 lines
2.3 KiB
Diff
Raw Normal View History

2018-07-25 23:05:07 +00:00
From a16608e4c4b20cad5477b8be0c935581a1d0895f Mon Sep 17 00:00:00 2001
2016-02-29 23:09:49 +00:00
From: kashike <kashike@vq.lc>
Date: Mon, 29 Feb 2016 19:48:59 -0600
Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
2018-07-25 23:05:07 +00:00
index 477a5833..73c85063 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
2016-02-29 23:09:49 +00:00
import org.bukkit.boss.BarFlag;
import org.bukkit.boss.BarStyle;
import org.bukkit.boss.BossBar;
-import org.bukkit.command.CommandException;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.command.PluginCommand;
+import org.bukkit.command.*;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
2018-07-25 23:05:07 +00:00
@@ -1263,6 +1260,17 @@ public final class Bukkit {
2016-02-29 23:09:49 +00:00
return server.getUnsafe();
}
+ // Paper start
+ /**
+ * Gets the active {@link CommandMap}
+ *
+ * @return the active command map
+ */
+ public static CommandMap getCommandMap() {
+ return server.getCommandMap();
+ }
+ // Paper end
+
public static Server.Spigot spigot()
{
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2018-07-25 23:05:07 +00:00
index 1fa6f53e..70e19580 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -19,10 +19,7 @@ import org.bukkit.boss.BarColor;
2016-02-29 23:09:49 +00:00
import org.bukkit.boss.BarFlag;
import org.bukkit.boss.BarStyle;
import org.bukkit.boss.BossBar;
-import org.bukkit.command.CommandException;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.command.PluginCommand;
+import org.bukkit.command.*;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
2018-07-25 23:05:07 +00:00
@@ -956,6 +953,14 @@ public interface Server extends PluginMessageRecipient {
2016-02-29 23:09:49 +00:00
public double[] getTPS();
2017-01-06 21:45:59 +00:00
// Paper end
2016-02-29 23:09:49 +00:00
+ // Paper start
+ /**
+ * Gets the active {@link CommandMap}
+ *
+ * @return the active command map
+ */
+ CommandMap getCommandMap();
+
/**
2017-05-14 13:46:44 +00:00
* Get the advancement specified by this key.
*
2016-02-29 23:09:49 +00:00
--
2.18.0
2016-02-29 23:09:49 +00:00