mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 12:11:47 +01:00
77b05b9c8e
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: 6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE 9c1fa040 #467: Add method to remove a recipe by its key 3961d1aa Add nb-configuration.xml to .gitignore CraftBukkit Changes:d70084e5Remove unused seed in CustomChunkGenerator8a66d4c7#619: Allow delegation of certain elements to Vanilla when using a custom ChunkGeneratorc2dc19d3Craftbukkit -> CraftBukkitae45e092SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose00980376#618: Add method to remove a recipe by its key Spigot Changes: c574e08b Rebuild patches 13c24cc4 Rebuild patches
21 lines
699 B
Diff
21 lines
699 B
Diff
From 9a80933d548ed314930de177c6c441af7cdb69bf 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 50deb7187..37d3e2c80 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -1607,6 +1607,7 @@ public final class CraftServer implements Server {
|
|
return helpMap;
|
|
}
|
|
|
|
+ @Override // Paper - add override
|
|
public SimpleCommandMap getCommandMap() {
|
|
return commandMap;
|
|
}
|
|
--
|
|
2.25.0
|
|
|