From d89923f6428f163f1cbc3a9d08e3073786c04fbf Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 2 Feb 2022 21:10:07 -0600 Subject: [PATCH] Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432) Pufferfish Changes: pufferfish-gg/Pufferfish@d549dda Improve vanilla parity of suffocation patch pufferfish-gg/Pufferfish@17b3430 Updated Upstream (Paper) pufferfish-gg/Pufferfish@bcbaf3e Fix div by zero --- gradle.properties | 2 +- patches/api/0004-Purpur-config-files.patch | 4 ++-- patches/api/0011-Bring-back-server-name.patch | 8 +++---- patches/api/0014-Lagging-threshold.patch | 8 +++---- ...oc-warnings-missing-param-and-return.patch | 4 ++-- ...on-change-for-adventure-deprecations.patch | 24 +++++++++---------- ...the-ability-to-add-combustible-items.patch | 8 +++---- .../0001-Pufferfish-Server-Changes.patch | 21 +++++++++++----- patches/server/0003-Purpur-config-files.patch | 6 ++--- .../server/0012-Bring-back-server-name.patch | 4 ++-- patches/server/0015-Lagging-threshold.patch | 8 +++---- ...x-vanilla-command-permission-handler.patch | 4 ++-- ...0066-Add-5-second-tps-average-in-tps.patch | 6 ++--- 13 files changed, 58 insertions(+), 49 deletions(-) diff --git a/gradle.properties b/gradle.properties index 70a93ab67..108de3ed9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.18.1-R0.1-SNAPSHOT mcVersion = 1.18.1 packageVersion = 1_18_R1 -paperCommit = 8e84c2585d25d647709fb26d4ed2b893aa60ec7f +paperCommit = 9b50bbb2c8aec7b77ba1ab827e77984c638b46ac org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0004-Purpur-config-files.patch index a8e54ebe5..56b69de66 100644 --- a/patches/api/0004-Purpur-config-files.patch +++ b/patches/api/0004-Purpur-config-files.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e48af3822e9f118399c3a1c9358c56efae12e0da..090ea732a000f7f668abe303437245b99fc9e4c6 100644 +index 73446141e8c50b71a17ff6f0c528a62d5c75751b..85b6174f9ede8929e6931a125de03922755997f5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1778,6 +1778,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1790,6 +1790,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch index 479fdb0ec..afcc2ae2e 100644 --- a/patches/api/0011-Bring-back-server-name.patch +++ b/patches/api/0011-Bring-back-server-name.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 53c4e5ca208ee17c7c244e416c537c7b63edf194..fdebfab6bdb74756c1bee4b7f03a27c2056388c9 100644 +index 3a8326735b62521f8fb95c51a0909d8b7bac83d1..5d76861b8745c7b5d7a67391c110ca12c0533966 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2181,4 +2181,15 @@ public final class Bukkit { +@@ -2195,4 +2195,15 @@ public final class Bukkit { public static Server.Spigot spigot() { return server.spigot(); } @@ -25,10 +25,10 @@ index 53c4e5ca208ee17c7c244e416c537c7b63edf194..fdebfab6bdb74756c1bee4b7f03a27c2 + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 090ea732a000f7f668abe303437245b99fc9e4c6..3773a4e1c6bdc020b7dbfb967192d17ad08c3813 100644 +index 85b6174f9ede8929e6931a125de03922755997f5..eaabd077d1a819cf074fbae40bccc9364b1a49d3 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1900,4 +1900,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1912,4 +1912,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull io.papermc.paper.datapack.DatapackManager getDatapackManager(); // Paper end diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch index d28019ad9..40f2439cc 100644 --- a/patches/api/0014-Lagging-threshold.patch +++ b/patches/api/0014-Lagging-threshold.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index fdebfab6bdb74756c1bee4b7f03a27c2056388c9..7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f 100644 +index 5d76861b8745c7b5d7a67391c110ca12c0533966..1c24ef085669d7d0cc8d67b661e900b172f4b99a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2191,5 +2191,14 @@ public final class Bukkit { +@@ -2205,5 +2205,14 @@ public final class Bukkit { public static String getServerName() { return server.getServerName(); } @@ -24,10 +24,10 @@ index fdebfab6bdb74756c1bee4b7f03a27c2056388c9..7d9d0bb3001fd6f0fd0f1c7ddca5964e // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 3773a4e1c6bdc020b7dbfb967192d17ad08c3813..fa2a5c8ed947cd2beed01df82fcc5e450e3e5782 100644 +index eaabd077d1a819cf074fbae40bccc9364b1a49d3..fc5b0ebb0d71dc4728b95297a50ac61e2f2d58bf 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1908,5 +1908,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1920,5 +1920,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull String getServerName(); diff --git a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch index 539305aa7..65a104b5e 100644 --- a/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch +++ b/patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch @@ -489,10 +489,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index fa2a5c8ed947cd2beed01df82fcc5e450e3e5782..d5e7538f7c7f288e1710fb383b57683f08ee0e57 100644 +index fc5b0ebb0d71dc4728b95297a50ac61e2f2d58bf..6e4ef6de10442f73ca7bd1c48496d920c3ef3899 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1751,6 +1751,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1763,6 +1763,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi UnsafeValues getUnsafe(); // Spigot start diff --git a/patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch index c6bec90b6..29a4a8981 100644 --- a/patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch +++ b/patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102b92be020 100644 +index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a84912e0f5f0b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -413,7 +413,7 @@ public final class Bukkit { @@ -26,7 +26,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102 public static int broadcast(@NotNull String message, @NotNull String permission) { return server.broadcast(message, permission); } -@@ -1421,7 +1421,7 @@ public final class Bukkit { +@@ -1435,7 +1435,7 @@ public final class Bukkit { * * @see InventoryType#isCreatable() */ @@ -35,7 +35,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102 @NotNull public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { return server.createInventory(owner, type, title); -@@ -1471,7 +1471,7 @@ public final class Bukkit { +@@ -1485,7 +1485,7 @@ public final class Bukkit { * @throws IllegalArgumentException if the size is not a multiple of 9 * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)} */ @@ -44,7 +44,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102 @NotNull public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException { return server.createInventory(owner, size, title); -@@ -1498,7 +1498,7 @@ public final class Bukkit { +@@ -1512,7 +1512,7 @@ public final class Bukkit { * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} */ @NotNull @@ -53,7 +53,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102 public static Merchant createMerchant(@Nullable String title) { return server.createMerchant(title); } -@@ -1596,7 +1596,7 @@ public final class Bukkit { +@@ -1610,7 +1610,7 @@ public final class Bukkit { * @deprecated in favour of {@link #motd()} */ @NotNull @@ -62,7 +62,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102 public static String getMotd() { return server.getMotd(); } -@@ -1618,7 +1618,7 @@ public final class Bukkit { +@@ -1632,7 +1632,7 @@ public final class Bukkit { * @deprecated in favour of {@link #shutdownMessage()} */ @Nullable @@ -72,7 +72,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102 return server.getShutdownMessage(); } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd6bf0a290 100644 +index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5a123a551 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -325,7 +325,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -93,7 +93,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd public int broadcast(@NotNull String message, @NotNull String permission); // Paper start /** -@@ -1190,7 +1190,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1202,7 +1202,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @see InventoryType#isCreatable() */ @@ -102,7 +102,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); -@@ -1234,7 +1234,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1246,7 +1246,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @throws IllegalArgumentException if the size is not a multiple of 9 * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)} */ @@ -111,7 +111,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd @NotNull Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException; -@@ -1257,7 +1257,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1269,7 +1269,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} */ @NotNull @@ -120,7 +120,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd Merchant createMerchant(@Nullable String title); /** -@@ -1337,7 +1337,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1349,7 +1349,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #motd()} */ @NotNull @@ -129,7 +129,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd String getMotd(); // Paper start -@@ -1355,7 +1355,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1367,7 +1367,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #shutdownMessage()} */ @Nullable diff --git a/patches/api/0043-Added-the-ability-to-add-combustible-items.patch b/patches/api/0043-Added-the-ability-to-add-combustible-items.patch index a5a87544b..e0d87a84b 100644 --- a/patches/api/0043-Added-the-ability-to-add-combustible-items.patch +++ b/patches/api/0043-Added-the-ability-to-add-combustible-items.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 4234d01ed793390ec3fb5fb69cf26102b92be020..91c1d04b77929438bb5c79d8829e14b161b4f2d9 100644 +index a046ba83697ef7e3b9dd0034920a84912e0f5f0b..c6d9a42f02cb538ee3739cd01f0a22203c9ceb41 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2200,5 +2200,24 @@ public final class Bukkit { +@@ -2214,5 +2214,24 @@ public final class Bukkit { public static boolean isLagging() { return server.isLagging(); } @@ -34,10 +34,10 @@ index 4234d01ed793390ec3fb5fb69cf26102b92be020..91c1d04b77929438bb5c79d8829e14b1 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index fee029f0a4b5cbd2b5ab9315a53c03bd6bf0a290..2c4dfcf909c0214d25232a14635b96f92d4d974a 100644 +index 3d9cbd6b37ee932f0b9908e4410107f5a123a551..1a38b9e616c6096d8d64c8abaa7178bc5f84e8d4 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1918,5 +1918,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1930,5 +1930,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return True if lagging */ boolean isLagging(); diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index 599e08745..d9d9e32a9 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -617,10 +617,10 @@ index 0000000000000000000000000000000000000000..020368da69b9a492155f6de6297f7473 +} diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..284f9eb542b686833ec54d4de6493d7dac5aa6b8 +index 0000000000000000000000000000000000000000..889561a6b0cb46405398d94fa071d33d3f02c3df --- /dev/null +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -@@ -0,0 +1,266 @@ +@@ -0,0 +1,275 @@ +package gg.pufferfish.pufferfish; + +import java.io.File; @@ -789,6 +789,15 @@ index 0000000000000000000000000000000000000000..284f9eb542b686833ec54d4de6493d7d + "This can be overridden per-player with the permission pufferfish.usebooks"); + } + ++ public static boolean enableSuffocationOptimization; ++ private static void suffocationOptimization() { ++ enableSuffocationOptimization = getBoolean("enable-suffocation-optimization", true, ++ "Optimizes the suffocation check by selectively skipping", ++ "the check in a way that still appears vanilla. This should", ++ "be left enabled on most servers, but is provided as a", ++ "configuration option if the vanilla deviation is undesirable."); ++ } ++ + public static boolean enableAsyncMobSpawning; + public static boolean asyncMobSpawningInitialized; + private static void asyncMobSpawning() { @@ -2728,7 +2737,7 @@ index 419a7e9614af2328ed401fc954196056243a984c..9bc568a2b0df13f55ee8670839b9e6a6 public final String id; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 25338fe4cfdc683ca4c01487e166a1649c6f640b..a6681690e1e556440320c492bf2a8e617008baa1 100644 +index 25338fe4cfdc683ca4c01487e166a1649c6f640b..3236a1dc51c394b784d3f42b78e76bf7c2f69c37 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -139,7 +139,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -2745,7 +2754,7 @@ index 25338fe4cfdc683ca4c01487e166a1649c6f640b..a6681690e1e556440320c492bf2a8e61 boolean flag = this instanceof net.minecraft.world.entity.player.Player; - - if (this.isInWall()) { -+ if (tickCount % 20 == 0 && couldPossiblyBeHurt(1.0F) && this.isInWall()) { // Pufferfish - optimize suffocation ++ if ((!gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F))) && this.isInWall()) { // Pufferfish - optimize suffocation this.hurt(DamageSource.IN_WALL, 1.0F); } else if (flag && !this.level.getWorldBorder().isWithinBounds(this.getBoundingBox())) { double d0 = this.level.getWorldBorder().getDistanceToBorder(this) + this.level.getWorldBorder().getDamageSafeZone(); @@ -3526,7 +3535,7 @@ index 89bc9f452556bafdcd8b76668639ee33c383596e..a98d115b7dccd836fa2c0f50333730db } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index c6bddf5e08376f1f254a27fc38647587eefcb00a..4ae9717b9ee77b3c28282e6560fc42081b6188ae 100644 +index 29b27f31080204c9cf33c9eeb8f48bf7928e0371..656b7e07ce6294f4b56b99b928cf37da41ea167d 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -431,12 +431,12 @@ public final class NaturalSpawner { @@ -4099,7 +4108,7 @@ index e387de8adc480eac27b58b6f3f0d331ffc4382f1..6dba9d6bb7b81fe176cc0fabbb60b554 @Nullable diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 54e8f0f367645f3aa8af5b1cb69c39c0cec9381f..868e148e6a8cd85ef89b79ad539dd5f3bce0a7c7 100644 +index 1a1f5c8f9a049d65043f12374fe694068f7d08cf..4bfae47b8163d2737ba796827be8557166db84d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -254,7 +254,7 @@ import javax.annotation.Nullable; // Paper diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index d62e81e4a..193c341ef 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -84,7 +84,7 @@ index 9c31e5d653f2027cf5b028f9fb9268f1469cb1e0..d58e5357f9cb45d9b5ddeaed4ec76aa3 io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc. io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 90aa1d75b5c23e5ee27ceae9f6ef90de913a6601..37884e05689288d56ef0efe92296b80ef6093b3c 100644 +index a98d115b7dccd836fa2c0f50333730db6f388aff..7f71a6fe6087630987ae1815ce45dfa45e52f684 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -169,6 +169,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -105,7 +105,7 @@ index 90aa1d75b5c23e5ee27ceae9f6ef90de913a6601..37884e05689288d56ef0efe92296b80e this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ebcfbfbe8569525640ddb1d0a35724e920592aa8..4839fd36286c20f11d6bcd737ffdffb5289fc1ad 100644 +index 486b0a9a19ac5025125f3bf253cad5ed7d053bf0..11278953cffbb2fd0b74ccd561bcbd22af7f6e63 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -952,6 +952,7 @@ public final class CraftServer implements Server { @@ -132,7 +132,7 @@ index ebcfbfbe8569525640ddb1d0a35724e920592aa8..4839fd36286c20f11d6bcd737ffdffb5 this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); -@@ -2667,6 +2670,18 @@ public final class CraftServer implements Server { +@@ -2674,6 +2677,18 @@ public final class CraftServer implements Server { return com.destroystokyo.paper.PaperConfig.config; } diff --git a/patches/server/0012-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch index b0be76926..cc5054c98 100644 --- a/patches/server/0012-Bring-back-server-name.patch +++ b/patches/server/0012-Bring-back-server-name.patch @@ -17,10 +17,10 @@ index f944e6beafc7876ed9c6923a22f58d82967b77cb..e1c7b7a659e56fa5b3a1f52cb2ccc99b public final boolean spawnNpcs = this.get("spawn-npcs", true); public final boolean pvp = this.get("pvp", true); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f69516d01a634a08b75744bfe26e5d9f6831c8f3..2551044b41483dd719e5944e5536888acc3a1968 100644 +index 11278953cffbb2fd0b74ccd561bcbd22af7f6e63..87f433d8ed3731a60ff3ec0198c96d401ae1af82 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2836,4 +2836,11 @@ public final class CraftServer implements Server { +@@ -2843,4 +2843,11 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0015-Lagging-threshold.patch b/patches/server/0015-Lagging-threshold.patch index 94b8c9a9f..3a7a4416d 100644 --- a/patches/server/0015-Lagging-threshold.patch +++ b/patches/server/0015-Lagging-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9d28c613cacc050ac62c89f6f742ee99cdb99649..17f0167cd38a7f2e0dbef42738f03f2f92944f1a 100644 +index 0eed0dc8aa52a8ea16e47f7183ba7b4235ce362a..0c7355902448b444c360259a84a7e8a10ad96f46 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -304,6 +304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop vanillaCommand) { diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch index 4ceffce5e..a6a06b0df 100644 --- a/patches/server/0066-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0066-Add-5-second-tps-average-in-tps.patch @@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216 setListData(vector); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ec2edb4b62f692aa39652845e81daf5de2798607..6a1863e815d3330d4619309630e447f601ea0136 100644 +index 5e2d1e31722791f879f09705ebd491dedc6ac1da..20fd8a043ea8e8221aab94479ffb73c4fba290e5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -303,7 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop