mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
c29c36e782
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: 3284612a SPIGOT-5853: Add DragonBattle#generateEndPortal() e4db04ae SPIGOT-5841: New map colours broken CraftBukkit Changes:d4243510SPIGOT-5853: DragonBattle#getEndPortalLocation() throws NPE on new world1601ec31SPIGOT-5845: ChatColor.RESET does not work in ItemMeta to reset italics4d92db6fCraftChatMessageTest does not need AbstractTestingBase71045d3dSPIGOT-5828: Unlock worlds on unloaddbc347b9SPIGOT-5841: New map colours broken14053c70SPIGOT-5847: BlockFadeEvent cannot be triggered asynchronously from another thread Spigot Changes: 6f4ff1b6 SPIGOT-5851: ChatColor (HEX) doesn't appear correctly in the ActionBar d94a518a SPIGOT-5848: PlayerSpawnLocationEvent throws NPE when setting a location of another world
19 lines
749 B
Diff
19 lines
749 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: kashike <kashike@vq.lc>
|
|
Date: Thu, 3 Mar 2016 02:15:57 -0600
|
|
Subject: [PATCH] Expose server CommandMap
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 5ff0456b781b6a6fbc674e2c532b73f3245f5fd5..3a0e0139db61405e8307abb3d17d1836f45bd8a3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1699,6 +1699,7 @@ public final class CraftServer implements Server {
|
|
return helpMap;
|
|
}
|
|
|
|
+ @Override // Paper - add override
|
|
public SimpleCommandMap getCommandMap() {
|
|
return commandMap;
|
|
}
|