a8c28e1920
This branch/commit is only useful to those who purely use a clean Bukkit/Spigot/Paper API and does not use NMS/OBC references. This will let you start updating your plugin to the latest 1.13 builds of Bukkit Preview (4 as of now) Note that this release is not final!!! API breakages may occur! It is up to you if you find use out of this work.
74 lines
2.3 KiB
Diff
74 lines
2.3 KiB
Diff
From 4c420ccc71dd397e1a2de5a060165442d05a2a94 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 f3252e20..a291ebd6 100644
|
|
--- 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;
|
|
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;
|
|
@@ -1237,6 +1234,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 eb98c600..2b43ac1f 100644
|
|
--- 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;
|
|
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;
|
|
@@ -930,6 +927,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.18.0
|
|
|