Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse Source 
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:
d70084e5 Remove unused seed in CustomChunkGenerator
8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c2dc19d3 Craftbukkit -> CraftBukkit
ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose
00980376 #618: Add method to remove a recipe by its key

Spigot Changes:
c574e08b Rebuild patches
13c24cc4 Rebuild patches
This commit is contained in:
Shane Freeder
2020-02-02 11:53:48 +00:00
parent 55b3a09dde
commit 77b05b9c8e
44 changed files with 268 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0046-Expose-server-CommandMap.patch
View File

@@ -1,14 +1,14 @@
From e9d95dfb7c49005ccf7726b8a13e3657aafc2f34 Mon Sep 17 00:00:00 2001
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 3fe8c34b8..20d454052 100644
index 50deb7187..37d3e2c80 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1591,6 +1591,7 @@ public final class CraftServer implements Server {
@@ -1607,6 +1607,7 @@ public final class CraftServer implements Server {
return helpMap;
}
@@ -17,5 +17,5 @@ index 3fe8c34b8..20d454052 100644
return commandMap;
}
--
2.25.0.windows.1
2.25.0