diff options
| author | Jake Potrebic <[email protected]> | 2023-11-11 12:25:45 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-11 12:25:45 -0800 |
| commit | d8847bc1f3a77be9edf69a6b5b71fbfd8292eb57 (patch) | |
| tree | 1ae03a5eaa4b4106a86df39097acb787f2ef059d /patches/server/0005-Paper-config-files.patch | |
| parent | 63e77b531da93e74fe08851aa8f3892984fdec44 (diff) | |
| download | Paper-d8847bc1f3a77be9edf69a6b5b71fbfd8292eb57.tar.gz Paper-d8847bc1f3a77be9edf69a6b5b71fbfd8292eb57.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#9922)
Upstream has released updates that appear 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:
fde5602a PR-927: Add PlayerRecipeBookSettingsChangeEvent
949ff217 PR-930: Add methods to get/set evoker fang attack delay
f6f7c79d SPIGOT-7514, PR-929: Add "Enchantment Roll" API to enchant items according to Minecraft mechanics
d40e22da PR-712: Add API to get full result of crafting items
CraftBukkit Changes:
c8feb0629 PR-1291: Improve precondition message in Entity#playEffect
482c56a00 PR-1285: Add PlayerRecipeBookSettingsChangeEvent
cdf798800 PR-1290: Add methods to get/set evoker fang attack delay
2c1b5f78f SPIGOT-7514, PR-1289: Add "Enchantment Roll" API to enchant items according to Minecraft mechanics
6aa644ae9 PR-992: Add API to get full result of crafting items
ffb1319bc PR-1287: Fix scoreboards not updating in Player#setStatistic
Diffstat (limited to 'patches/server/0005-Paper-config-files.patch')
| -rw-r--r-- | patches/server/0005-Paper-config-files.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index d0e878423f..f5537d6127 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -4900,10 +4900,10 @@ index 4dfb372f8c8f60b6aad18ea9b6334e1a7c9bc4ed..9f877007869ef984d2c95bd8e3d773a2 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b72a4c4e0d65646290545bf4bae99853c01f592e..b8844bc5fa43ad85230d9c80ae7602306cd22b27 100644 +index 811e31d2502cb6f7ed6b151d894dfceea63ac388..d1baf686c0a59584a4866490f4f4fe65b3ac6eed 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -918,6 +918,7 @@ public final class CraftServer implements Server { +@@ -919,6 +919,7 @@ public final class CraftServer implements Server { } org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot |