74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From ee9faa9162c7b9f27b5b1072e016c288f54f8e6a Mon Sep 17 00:00:00 2001
|
|
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
|
|
index 89135b86..94ec8189 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
|
|
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;
|
|
@@ -1164,6 +1161,17 @@ public final class Bukkit {
|
|
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
|
|
index c81c073d..63624ff6 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -17,10 +17,7 @@ import org.bukkit.boss.BarColor;
|
|
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;
|
|
@@ -928,6 +925,14 @@ public interface Server extends PluginMessageRecipient {
|
|
public double[] getTPS();
|
|
// Paper end
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the active {@link CommandMap}
|
|
+ *
|
|
+ * @return the active command map
|
|
+ */
|
|
+ CommandMap getCommandMap();
|
|
+
|
|
/**
|
|
* Get the advancement specified by this key.
|
|
*
|
|
--
|
|
2.13.0
|
|
|