PaperMC/Spigot-API-Patches/0014-Expose-server-CommandMap.patch

51 lines
1.6 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2016-03-01 00:09:49 +01: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
2020-06-26 18:20:03 +02:00
index 15543603c168623572b1a26e41eb20058770784d..b46222ed2822fea563585462e43ee73ba2bb9b37 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
2020-06-26 18:20:03 +02:00
@@ -1575,6 +1575,19 @@ public final class Bukkit {
2016-03-01 00:09:49 +01:00
return server.getUnsafe();
}
+
2016-03-01 00:09:49 +01:00
+ // Paper start
+ /**
+ * Gets the active {@link org.bukkit.command.CommandMap}
2016-03-01 00:09:49 +01:00
+ *
+ * @return the active command map
+ */
+ @NotNull
+ public static org.bukkit.command.CommandMap getCommandMap() {
2016-03-01 00:09:49 +01:00
+ return server.getCommandMap();
+ }
+ // Paper end
+
@NotNull
Updated Upstream (Bukkit/CraftBukkit/Spigot) 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 Bukkit Changes: 93e39ce1 Clarify documentation regarding getMaterial with legacyName = true c3aeaea0 Improve dependency tracker 14c9d275 Add support for transitive depends in load access warning c8afe560 SPIGOT-5526: Add EntityEnterBlockEvent 6bb6f07d SPIGOT-5548: Show error that hints towards plugins misusing reflection ed75537d SPIGOT-5546: Fix bad depend access using wrong provider in message 4e4c0ee9 Fix buggy classloader warning triggering for all classes 89586a4c Print warning when loading classes from depends that have not been specified d4fe9680 Fix bug where disablePlugin could remove ConfigurationSerializable classes from other plugins 85e683b7 Add additional checkstyle checks 612fd8e1 Correct max page count in BookMeta docs fa8a9781 Correct max title length in BookMeta docs CraftBukkit Changes: ab13a117 SPIGOT-5550: Cancelled ProjectileLaunchEvent still plays sound for eggs 44016b1d SPIGOT-5538: Using javaw to run GUI prints input error e653ae76 SPIGOT-5526: Call EntityEnterBlockEvent for bees trying to enter hives 6515ea49 SPIGOT-5537: Bee nests generated by growing trees near flower have no bees d82b3149 Remove unused CraftWorld.getId method 10763a88 Change some block == AIR checks to isAir to catch CAVE_AIR Spigot Changes: f2c1cd15 Rebuild patches bcd458ad Reformat patches
2020-01-28 20:43:57 +01:00
public static Server.Spigot spigot() {
return server.spigot();
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2020-06-26 18:20:03 +02:00
index 3af00d77f9015f2eccab3047676b70c1af68daa7..d3c498ad0e7681422ef2117be41c6603ebce0e0a 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
2020-06-26 18:20:03 +02:00
@@ -1186,6 +1186,15 @@ public interface Server extends PluginMessageRecipient {
2016-03-01 00:09:49 +01:00
public double[] getTPS();
2017-01-06 22:45:59 +01:00
// Paper end
2016-03-01 00:09:49 +01:00
+ // Paper start
+ /**
+ * Gets the active {@link org.bukkit.command.CommandMap}
2016-03-01 00:09:49 +01:00
+ *
+ * @return the active command map
+ */
+ @NotNull
+ org.bukkit.command.CommandMap getCommandMap();
2016-03-01 00:09:49 +01:00
+
/**
2017-05-14 15:46:44 +02:00
* Get the advancement specified by this key.
*