mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
4d6f73449f
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
51 lines
No EOL
1.4 KiB
Diff
51 lines
No EOL
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Riley Park <rileysebastianpark@gmail.com>
|
|
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 9f87f333e..63e48ef3f 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -0,0 +0,0 @@ public final class Bukkit {
|
|
return server.getUnsafe();
|
|
}
|
|
|
|
+
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the active {@link org.bukkit.command.CommandMap}
|
|
+ *
|
|
+ * @return the active command map
|
|
+ */
|
|
+ @NotNull
|
|
+ public static org.bukkit.command.CommandMap getCommandMap() {
|
|
+ return server.getCommandMap();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@NotNull
|
|
public static Server.Spigot spigot()
|
|
{
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index e1dfa92a9..87300a5df 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
|
|
public double[] getTPS();
|
|
// Paper end
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Gets the active {@link org.bukkit.command.CommandMap}
|
|
+ *
|
|
+ * @return the active command map
|
|
+ */
|
|
+ @NotNull
|
|
+ org.bukkit.command.CommandMap getCommandMap();
|
|
+
|
|
/**
|
|
* Get the advancement specified by this key.
|
|
*
|
|
--
|