diff --git a/patches/api/0015-Expose-server-build-information.patch b/patches/api/0015-Expose-server-build-information.patch new file mode 100644 index 0000000000..23aa937bfd --- /dev/null +++ b/patches/api/0015-Expose-server-build-information.patch @@ -0,0 +1,528 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Mon, 27 May 2019 01:10:06 -0500 +Subject: [PATCH] Expose server build information + +Co-authored-by: Professor Bloodstone +Co-authored-by: Mark Vainomaa +Co-authored-by: masmc05 +Co-authored-by: Riley Park + +diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java +new file mode 100644 +index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java +@@ -0,0 +1,45 @@ ++package com.destroystokyo.paper.util; ++ ++import net.kyori.adventure.text.Component; ++import net.kyori.adventure.text.format.NamedTextColor; ++import org.bukkit.Bukkit; ++import org.jetbrains.annotations.NotNull; ++ ++public interface VersionFetcher { ++ /** ++ * Amount of time to cache results for in milliseconds ++ *

++ * Negative values will never cache. ++ * ++ * @return cache time ++ */ ++ long getCacheTime(); ++ ++ /** ++ * Gets the version message to cache and show to command senders. ++ * ++ *

NOTE: This is run in a new thread separate from that of the command processing thread

++ * ++ * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()}) ++ * @return the message to show when requesting a version ++ */ ++ @NotNull ++ Component getVersionMessage(@NotNull String serverVersion); ++ ++ class DummyVersionFetcher implements VersionFetcher { ++ ++ @Override ++ public long getCacheTime() { ++ return -1; ++ } ++ ++ @NotNull ++ @Override ++ public Component getVersionMessage(@NotNull String serverVersion) { ++ Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!"); ++ Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()"); ++ new Throwable().printStackTrace(); ++ return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED); ++ } ++ } ++} +diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java +new file mode 100644 +index 0000000000000000000000000000000000000000..9df9d09aa477d4cd3c496ba0933c816df1ef0964 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java +@@ -0,0 +1,121 @@ ++package io.papermc.paper; ++ ++import java.time.Instant; ++import java.util.Optional; ++import java.util.OptionalInt; ++import net.kyori.adventure.key.Key; ++import net.kyori.adventure.util.Services; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.NotNull; ++ ++/** ++ * Information about the current server build. ++ */ ++@ApiStatus.NonExtendable ++public interface ServerBuildInfo { ++ /** ++ * The brand id for Paper. ++ */ ++ Key BRAND_PAPER_ID = Key.key("papermc", "paper"); ++ ++ /** ++ * Gets the {@code ServerBuildInfo}. ++ * ++ * @return the {@code ServerBuildInfo} ++ */ ++ static @NotNull ServerBuildInfo buildInfo() { ++ // ++ final class Holder { ++ static final Optional INSTANCE = Services.service(ServerBuildInfo.class); ++ } ++ // ++ return Holder.INSTANCE.orElseThrow(); ++ } ++ ++ /** ++ * Gets the brand id of the server. ++ * ++ * @return the brand id of the server (e.g. "papermc:paper") ++ */ ++ @NotNull Key brandId(); ++ ++ /** ++ * Checks if the current server supports the specified brand. ++ * ++ * @param brandId the brand to check (e.g. "papermc:folia") ++ * @return {@code true} if the server supports the specified brand ++ */ ++ @ApiStatus.Experimental ++ boolean isBrandCompatible(final @NotNull Key brandId); ++ ++ /** ++ * Gets the brand name of the server. ++ * ++ * @return the brand name of the server (e.g. "Paper") ++ */ ++ @NotNull String brandName(); ++ ++ /** ++ * Gets the Minecraft version id. ++ * ++ * @return the Minecraft version id (e.g. "1.20.4", "1.20.2-pre2", "23w31a") ++ */ ++ @NotNull String minecraftVersionId(); ++ ++ /** ++ * Gets the Minecraft version name. ++ * ++ * @return the Minecraft version name (e.g. "1.20.4", "1.20.2 Pre-release 2", "23w31a") ++ */ ++ @NotNull String minecraftVersionName(); ++ ++ /** ++ * Gets the build number. ++ * ++ * @return the build number ++ */ ++ @NotNull OptionalInt buildNumber(); ++ ++ /** ++ * Gets the build time. ++ * ++ * @return the build time ++ */ ++ @NotNull Instant buildTime(); ++ ++ /** ++ * Gets the git commit branch. ++ * ++ * @return the git commit branch ++ */ ++ @NotNull Optional gitBranch(); ++ ++ /** ++ * Gets the git commit hash. ++ * ++ * @return the git commit hash ++ */ ++ @NotNull Optional gitCommit(); ++ ++ /** ++ * Creates a string representation of the server build information. ++ * ++ * @param representation the type of representation ++ * @return a string ++ */ ++ @NotNull String asString(final @NotNull StringRepresentation representation); ++ ++ /** ++ * String representation types. ++ */ ++ enum StringRepresentation { ++ /** ++ * A simple version string, in format {@code --}. ++ */ ++ VERSION_SIMPLE, ++ /** ++ * A simple version string, in format {@code --@ ()}. ++ */ ++ VERSION_FULL, ++ } ++} +diff --git a/src/main/java/io/papermc/paper/util/JarManifests.java b/src/main/java/io/papermc/paper/util/JarManifests.java +new file mode 100644 +index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b306076343 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/util/JarManifests.java +@@ -0,0 +1,37 @@ ++package io.papermc.paper.util; ++ ++import java.io.IOException; ++import java.io.InputStream; ++import java.net.URL; ++import java.util.Collections; ++import java.util.Map; ++import java.util.WeakHashMap; ++import java.util.jar.Manifest; ++import org.jetbrains.annotations.ApiStatus; ++import org.jetbrains.annotations.NotNull; ++import org.jetbrains.annotations.Nullable; ++ ++@ApiStatus.Internal ++public final class JarManifests { ++ private JarManifests() { ++ } ++ ++ private static final Map MANIFESTS = Collections.synchronizedMap(new WeakHashMap<>()); ++ ++ public static @Nullable Manifest manifest(final @NotNull Class clazz) { ++ return MANIFESTS.computeIfAbsent(clazz.getClassLoader(), classLoader -> { ++ final String classLocation = "/" + clazz.getName().replace(".", "/") + ".class"; ++ final URL resource = clazz.getResource(classLocation); ++ if (resource == null) { ++ return null; ++ } ++ final String classFilePath = resource.toString().replace("\\", "/"); ++ final String archivePath = classFilePath.substring(0, classFilePath.length() - classLocation.length()); ++ try (final InputStream stream = new URL(archivePath + "/META-INF/MANIFEST.MF").openStream()) { ++ return new Manifest(stream); ++ } catch (final IOException ex) { ++ return null; ++ } ++ }); ++ } ++} +diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java +index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d7569d644b25 100644 +--- a/src/main/java/org/bukkit/Bukkit.java ++++ b/src/main/java/org/bukkit/Bukkit.java +@@ -109,13 +109,26 @@ public final class Bukkit { + } + + Bukkit.server = server; +- server.getLogger().info("This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ")"); ++ // Paper start - add git information ++ server.getLogger().info(getVersionMessage()); ++ } ++ /** ++ * Gets message describing the version server is running. ++ * ++ * @return message describing the version server is running ++ */ ++ @NotNull ++ public static String getVersionMessage() { ++ final io.papermc.paper.ServerBuildInfo version = io.papermc.paper.ServerBuildInfo.buildInfo(); ++ return "This server is running " + getName() + " version " + version.asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL) + " (Implementing API version " + getBukkitVersion() + ")"; ++ // Paper end + } + + /** + * Gets the name of this server implementation. + * + * @return name of this server implementation ++ * @see io.papermc.paper.ServerBuildInfo#brandName() + */ + @NotNull + public static String getName() { +@@ -126,6 +139,7 @@ public final class Bukkit { + * Gets the version string of this server implementation. + * + * @return version of this server implementation ++ * @see io.papermc.paper.ServerBuildInfo + */ + @NotNull + public static String getVersion() { +@@ -142,6 +156,20 @@ public final class Bukkit { + return server.getBukkitVersion(); + } + ++ // Paper start - expose game version ++ /** ++ * Gets the version of game this server implements ++ * ++ * @return version of game ++ * @see io.papermc.paper.ServerBuildInfo#minecraftVersionId() ++ * @see io.papermc.paper.ServerBuildInfo#minecraftVersionName() ++ */ ++ @NotNull ++ public static String getMinecraftVersion() { ++ return server.getMinecraftVersion(); ++ } ++ // Paper end ++ + /** + * Gets a view of all currently logged in players. This {@linkplain + * Collections#unmodifiableCollection(Collection) view} is a reused +diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java +index e37649ce4b3981f2cff96b64ed3bd4093c015346..7c646d1bb8b011c156b0688f9396bbcbba43d077 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + @NotNull + public String getBukkitVersion(); + ++ // Paper start - expose game version ++ /** ++ * Gets the version of game this server implements ++ * ++ * @return version of game ++ */ ++ @NotNull ++ String getMinecraftVersion(); ++ // Paper end ++ + /** + * Gets a view of all currently logged in players. This {@linkplain + * Collections#unmodifiableCollection(Collection) view} is a reused +diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java +index 9082e67324f810857db26bb89ecea7e9f866f80d..da997507b96908027c49dabc6daf7c787dcad95d 100644 +--- a/src/main/java/org/bukkit/UnsafeValues.java ++++ b/src/main/java/org/bukkit/UnsafeValues.java +@@ -155,5 +155,12 @@ public interface UnsafeValues { + * @return name + */ + String getTimingsServerName(); ++ ++ /** ++ * Called once by the version command on first use, then cached. ++ */ ++ default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { ++ return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher(); ++ } + // Paper end + } +diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java +index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..fd5d9881abfd930bb883120f018f76dc78b62b14 100644 +--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java ++++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java +@@ -24,8 +24,25 @@ import org.bukkit.plugin.Plugin; + import org.bukkit.plugin.PluginDescriptionFile; + import org.bukkit.util.StringUtil; + import org.jetbrains.annotations.NotNull; ++// Paper start - version command 2.0 ++import com.destroystokyo.paper.util.VersionFetcher; ++import net.kyori.adventure.text.Component; ++import net.kyori.adventure.text.format.NamedTextColor; ++import net.kyori.adventure.text.event.ClickEvent; ++import net.kyori.adventure.text.format.TextDecoration; ++import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; ++// Paper end - version command 2.0 + + public class VersionCommand extends BukkitCommand { ++ private VersionFetcher versionFetcher; // Paper - version command 2.0 ++ private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration ++ if (versionFetcher == null) { ++ versionFetcher = Bukkit.getUnsafe().getVersionFetcher(); ++ } ++ ++ return versionFetcher; ++ } ++ + public VersionCommand(@NotNull String name) { + super(name); + +@@ -40,7 +57,7 @@ public class VersionCommand extends BukkitCommand { + if (!testPermission(sender)) return true; + + if (args.length == 0) { +- sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); ++ //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage + sendVersion(sender); + } else { + StringBuilder name = new StringBuilder(); +@@ -79,8 +96,17 @@ public class VersionCommand extends BukkitCommand { + + private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) { + PluginDescriptionFile desc = plugin.getDescription(); +- sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion()); +- ++ // Paper start - version command 2.0 ++ sender.sendMessage( ++ Component.text() ++ .append(Component.text(desc.getName(), NamedTextColor.GREEN)) ++ .append(Component.text(" version ")) ++ .append(Component.text(desc.getVersion(), NamedTextColor.GREEN) ++ .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE)) ++ .clickEvent(ClickEvent.copyToClipboard(desc.getVersion())) ++ ) ++ ); ++ // Paper end - version command 2.0 + if (desc.getDescription() != null) { + sender.sendMessage(desc.getDescription()); + } +@@ -146,14 +172,14 @@ public class VersionCommand extends BukkitCommand { + + private final ReentrantLock versionLock = new ReentrantLock(); + private boolean hasVersion = false; +- private String versionMessage = null; ++ private Component versionMessage = null; // Paper + private final Set versionWaiters = new HashSet(); + private boolean versionTaskStarted = false; + private long lastCheck = 0; + + private void sendVersion(@NotNull CommandSender sender) { + if (hasVersion) { +- if (System.currentTimeMillis() - lastCheck > 21600000) { ++ if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier + lastCheck = System.currentTimeMillis(); + hasVersion = false; + } else { +@@ -168,7 +194,7 @@ public class VersionCommand extends BukkitCommand { + return; + } + versionWaiters.add(sender); +- sender.sendMessage("Checking version, please wait..."); ++ sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper + if (!versionTaskStarted) { + versionTaskStarted = true; + new Thread(new Runnable() { +@@ -186,6 +212,13 @@ public class VersionCommand extends BukkitCommand { + + private void obtainVersion() { + String version = Bukkit.getVersion(); ++ // Paper start ++ if (version.startsWith("null")) { // running from ide? ++ setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW)); ++ return; ++ } ++ setVersionMessage(getVersionFetcher().getVersionMessage(version)); ++ /* + if (version == null) version = "Custom"; + String[] parts = version.substring(0, version.indexOf(' ')).split("-"); + if (parts.length == 4) { +@@ -215,11 +248,24 @@ public class VersionCommand extends BukkitCommand { + } else { + setVersionMessage("Unknown version, custom build?"); + } ++ */ ++ // Paper end + } + +- private void setVersionMessage(@NotNull String msg) { ++ // Paper start ++ private void setVersionMessage(final @NotNull Component msg) { + lastCheck = System.currentTimeMillis(); +- versionMessage = msg; ++ final Component message = Component.textOfChildren( ++ Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE), ++ Component.newline(), ++ msg ++ ); ++ this.versionMessage = Component.text() ++ .append(message) ++ .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE)) ++ .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message))) ++ .build(); ++ // Paper end + versionLock.lock(); + try { + hasVersion = true; +diff --git a/src/test/java/io/papermc/paper/TestServerBuildInfo.java b/src/test/java/io/papermc/paper/TestServerBuildInfo.java +new file mode 100644 +index 0000000000000000000000000000000000000000..17be27a869c1047a7a9440fb8f3717260d4abbd0 +--- /dev/null ++++ b/src/test/java/io/papermc/paper/TestServerBuildInfo.java +@@ -0,0 +1,59 @@ ++package io.papermc.paper; ++ ++import java.time.Instant; ++import java.util.Optional; ++import java.util.OptionalInt; ++import net.kyori.adventure.key.Key; ++import org.jetbrains.annotations.NotNull; ++ ++public class TestServerBuildInfo implements ServerBuildInfo { ++ @Override ++ public @NotNull Key brandId() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public boolean isBrandCompatible(final @NotNull Key brandId) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull String brandName() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull String minecraftVersionId() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull String minecraftVersionName() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull OptionalInt buildNumber() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull Instant buildTime() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull Optional gitBranch() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull Optional gitCommit() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public @NotNull String asString(final @NotNull StringRepresentation representation) { ++ return ""; ++ } ++} +diff --git a/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo b/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo +new file mode 100644 +index 0000000000000000000000000000000000000000..64e2f8559b9c5a52e0a3229d3d12f65e9af145b3 +--- /dev/null ++++ b/src/test/resources/META-INF/services/io.papermc.paper.ServerBuildInfo +@@ -0,0 +1 @@ ++io.papermc.paper.TestServerBuildInfo diff --git a/patches/api/0015-Version-Command-2.0.patch b/patches/api/0015-Version-Command-2.0.patch deleted file mode 100644 index 500312dc32..0000000000 --- a/patches/api/0015-Version-Command-2.0.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Mon, 27 May 2019 01:10:06 -0500 -Subject: [PATCH] Version Command 2.0 - - -diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java -new file mode 100644 -index 0000000000000000000000000000000000000000..a736d7bcdc5861a01b66ba36158db1c716339346 ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java -@@ -0,0 +1,45 @@ -+package com.destroystokyo.paper.util; -+ -+import net.kyori.adventure.text.Component; -+import net.kyori.adventure.text.format.NamedTextColor; -+import org.bukkit.Bukkit; -+import org.jetbrains.annotations.NotNull; -+ -+public interface VersionFetcher { -+ /** -+ * Amount of time to cache results for in milliseconds -+ *

-+ * Negative values will never cache. -+ * -+ * @return cache time -+ */ -+ long getCacheTime(); -+ -+ /** -+ * Gets the version message to cache and show to command senders. -+ * -+ *

NOTE: This is run in a new thread separate from that of the command processing thread

-+ * -+ * @param serverVersion the current version of the server (will match {@link Bukkit#getVersion()}) -+ * @return the message to show when requesting a version -+ */ -+ @NotNull -+ Component getVersionMessage(@NotNull String serverVersion); -+ -+ class DummyVersionFetcher implements VersionFetcher { -+ -+ @Override -+ public long getCacheTime() { -+ return -1; -+ } -+ -+ @NotNull -+ @Override -+ public Component getVersionMessage(@NotNull String serverVersion) { -+ Bukkit.getLogger().warning("Version provider has not been set, cannot check for updates!"); -+ Bukkit.getLogger().info("Override the default implementation of org.bukkit.UnsafeValues#getVersionFetcher()"); -+ new Throwable().printStackTrace(); -+ return Component.text("Unable to check for updates. No version provider set.", NamedTextColor.RED); -+ } -+ } -+} -diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 9082e67324f810857db26bb89ecea7e9f866f80d..da997507b96908027c49dabc6daf7c787dcad95d 100644 ---- a/src/main/java/org/bukkit/UnsafeValues.java -+++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -155,5 +155,12 @@ public interface UnsafeValues { - * @return name - */ - String getTimingsServerName(); -+ -+ /** -+ * Called once by the version command on first use, then cached. -+ */ -+ default com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { -+ return new com.destroystokyo.paper.util.VersionFetcher.DummyVersionFetcher(); -+ } - // Paper end - } -diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index 04b4fb6859df0221f8f9f92c5a7ac2dda1073355..b437cf212a63aa96a9492db8d01d5d37061aee23 100644 ---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java -+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -@@ -24,8 +24,25 @@ import org.bukkit.plugin.Plugin; - import org.bukkit.plugin.PluginDescriptionFile; - import org.bukkit.util.StringUtil; - import org.jetbrains.annotations.NotNull; -+// Paper start - version command 2.0 -+import com.destroystokyo.paper.util.VersionFetcher; -+import net.kyori.adventure.text.Component; -+import net.kyori.adventure.text.format.NamedTextColor; -+import net.kyori.adventure.text.event.ClickEvent; -+import net.kyori.adventure.text.format.TextDecoration; -+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -+// Paper end - version command 2.0 - - public class VersionCommand extends BukkitCommand { -+ private VersionFetcher versionFetcher; // Paper - version command 2.0 -+ private VersionFetcher getVersionFetcher() { // lazy load because unsafe isn't available at command registration -+ if (versionFetcher == null) { -+ versionFetcher = Bukkit.getUnsafe().getVersionFetcher(); -+ } -+ -+ return versionFetcher; -+ } -+ - public VersionCommand(@NotNull String name) { - super(name); - -@@ -40,7 +57,7 @@ public class VersionCommand extends BukkitCommand { - if (!testPermission(sender)) return true; - - if (args.length == 0) { -- sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); -+ //sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); // Paper - moved to setVersionMessage - sendVersion(sender); - } else { - StringBuilder name = new StringBuilder(); -@@ -79,8 +96,17 @@ public class VersionCommand extends BukkitCommand { - - private void describeToSender(@NotNull Plugin plugin, @NotNull CommandSender sender) { - PluginDescriptionFile desc = plugin.getDescription(); -- sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion()); -- -+ // Paper start - version command 2.0 -+ sender.sendMessage( -+ Component.text() -+ .append(Component.text(desc.getName(), NamedTextColor.GREEN)) -+ .append(Component.text(" version ")) -+ .append(Component.text(desc.getVersion(), NamedTextColor.GREEN) -+ .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE)) -+ .clickEvent(ClickEvent.copyToClipboard(desc.getVersion())) -+ ) -+ ); -+ // Paper end - version command 2.0 - if (desc.getDescription() != null) { - sender.sendMessage(desc.getDescription()); - } -@@ -146,14 +172,14 @@ public class VersionCommand extends BukkitCommand { - - private final ReentrantLock versionLock = new ReentrantLock(); - private boolean hasVersion = false; -- private String versionMessage = null; -+ private Component versionMessage = null; // Paper - private final Set versionWaiters = new HashSet(); - private boolean versionTaskStarted = false; - private long lastCheck = 0; - - private void sendVersion(@NotNull CommandSender sender) { - if (hasVersion) { -- if (System.currentTimeMillis() - lastCheck > 21600000) { -+ if (System.currentTimeMillis() - lastCheck > getVersionFetcher().getCacheTime()) { // Paper - use version supplier - lastCheck = System.currentTimeMillis(); - hasVersion = false; - } else { -@@ -168,7 +194,7 @@ public class VersionCommand extends BukkitCommand { - return; - } - versionWaiters.add(sender); -- sender.sendMessage("Checking version, please wait..."); -+ sender.sendMessage(Component.text("Checking version, please wait...", NamedTextColor.WHITE, TextDecoration.ITALIC)); // Paper - if (!versionTaskStarted) { - versionTaskStarted = true; - new Thread(new Runnable() { -@@ -186,6 +212,13 @@ public class VersionCommand extends BukkitCommand { - - private void obtainVersion() { - String version = Bukkit.getVersion(); -+ // Paper start -+ if (version.startsWith("null")) { // running from ide? -+ setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW)); -+ return; -+ } -+ setVersionMessage(getVersionFetcher().getVersionMessage(version)); -+ /* - if (version == null) version = "Custom"; - String[] parts = version.substring(0, version.indexOf(' ')).split("-"); - if (parts.length == 4) { -@@ -215,11 +248,24 @@ public class VersionCommand extends BukkitCommand { - } else { - setVersionMessage("Unknown version, custom build?"); - } -+ */ -+ // Paper end - } - -- private void setVersionMessage(@NotNull String msg) { -+ // Paper start -+ private void setVersionMessage(final @NotNull Component msg) { - lastCheck = System.currentTimeMillis(); -- versionMessage = msg; -+ final Component message = Component.textOfChildren( -+ Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", NamedTextColor.WHITE), -+ Component.newline(), -+ msg -+ ); -+ this.versionMessage = Component.text() -+ .append(message) -+ .hoverEvent(Component.text("Click to copy to clipboard", NamedTextColor.WHITE)) -+ .clickEvent(ClickEvent.copyToClipboard(PlainTextComponentSerializer.plainText().serialize(message))) -+ .build(); -+ // Paper end - versionLock.lock(); - try { - hasVersion = true; diff --git a/patches/api/0021-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch index b57f0c2eff..bf07484451 100644 --- a/patches/api/0021-Expose-server-CommandMap.patch +++ b/patches/api/0021-Expose-server-CommandMap.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..c427d9dd916db6fe5078fb570eb57cfbd0766080 100644 +index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d86f363cc 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2294,6 +2294,19 @@ public final class Bukkit { +@@ -2322,6 +2322,19 @@ public final class Bukkit { return server.getUnsafe(); } @@ -29,10 +29,10 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..c427d9dd916db6fe5078fb570eb57cfb public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e37649ce4b3981f2cff96b64ed3bd4093c015346..fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81 100644 +index 7c646d1bb8b011c156b0688f9396bbcbba43d077..69153de6847bb8740803e5f731a0586d41a0eed3 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1794,6 +1794,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1804,6 +1804,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi public double[] getTPS(); // Paper end diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index b1812dae36..635d6c4fd5 100644 --- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c427d9dd916db6fe5078fb570eb57cfbd0766080..19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083 100644 +index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff3ffd6cd5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -443,6 +443,30 @@ public final class Bukkit { +@@ -471,6 +471,30 @@ public final class Bukkit { return server.broadcastMessage(message); } @@ -41,10 +41,10 @@ index c427d9dd916db6fe5078fb570eb57cfbd0766080..19efe5cb6a8c2dcc5b293ff24caa58c9 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index fbe2f6e349f242a2c4e64e63aa8ffdff7fa7dc81..4c9c14b60eb6fd1d9845632c2c2fa765d882a741 100644 +index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961ddf312509 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -372,6 +372,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -382,6 +382,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Deprecated // Paper public int broadcastMessage(@NotNull String message); diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch index e0fa8b2dd0..dab051a99c 100644 --- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083..c9be84560ee18ffe1bb84f159b2ed61c79f9e971 100644 +index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec243e59983 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2329,6 +2329,13 @@ public final class Bukkit { +@@ -2357,6 +2357,13 @@ public final class Bukkit { public static org.bukkit.command.CommandMap getCommandMap() { return server.getCommandMap(); } @@ -24,10 +24,10 @@ index 19efe5cb6a8c2dcc5b293ff24caa58c9a57fc083..c9be84560ee18ffe1bb84f159b2ed61c @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 4c9c14b60eb6fd1d9845632c2c2fa765d882a741..c0c61a29ba8d3c95ff76c36e4333740320302b4a 100644 +index 65d68716e1ff8277c534399621cf961ddf312509..47766c5312a402e3329a1d4bc5e5e0c05f2b007f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2055,4 +2055,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2065,4 +2065,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull Spigot spigot(); // Spigot end diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch index d0b3ec2335..a6fac69663 100644 --- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch +++ b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c9be84560ee18ffe1bb84f159b2ed61c79f9e971..2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5 100644 +index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa03371bb7c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2336,6 +2336,15 @@ public final class Bukkit { +@@ -2364,6 +2364,15 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } @@ -26,10 +26,10 @@ index c9be84560ee18ffe1bb84f159b2ed61c79f9e971..2dfd0080a0b0f05c5e5defa4326e0da9 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c0c61a29ba8d3c95ff76c36e4333740320302b4a..422a000ec33163f2f07502a05302b5d8851b2318 100644 +index 47766c5312a402e3329a1d4bc5e5e0c05f2b007f..08141d729809132ed36d6088f37543e792395768 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2057,4 +2057,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2067,4 +2067,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi // Spigot end void reloadPermissions(); // Paper diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch index 39e334dd8c..4d5786df14 100644 --- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5..6b3a332f556e7c49796a62f20fd33241bbcde09e 100644 +index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62ddfc078c8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2345,6 +2345,16 @@ public final class Bukkit { +@@ -2373,6 +2373,16 @@ public final class Bukkit { public static boolean reloadCommandAliases() { return server.reloadCommandAliases(); } @@ -27,10 +27,10 @@ index 2dfd0080a0b0f05c5e5defa4326e0da9b85c2df5..6b3a332f556e7c49796a62f20fd33241 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 422a000ec33163f2f07502a05302b5d8851b2318..9088bd9dfb515381d5df1c255ae3319f9cdde81e 100644 +index 08141d729809132ed36d6088f37543e792395768..1f039a3609a5a1208af408b0565f07664558a23f 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2059,4 +2059,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2069,4 +2069,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi void reloadPermissions(); // Paper boolean reloadCommandAliases(); // Paper diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch index 3e5ba4ab0e..dbf318927e 100644 --- a/patches/api/0056-Fix-upstream-javadocs.patch +++ b/patches/api/0056-Fix-upstream-javadocs.patch @@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093 * @param target the target to remove from this list */ diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6b3a332f556e7c49796a62f20fd33241bbcde09e..3b7087d5c71a498f513f67514db9e118780363c7 100644 +index fbddd654b4ba7b2613884fdd22f3e62ddfc078c8..53f56d95bdf484caed9effbedfe507f6745bb8c0 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1506,6 +1506,8 @@ public final class Bukkit { +@@ -1534,6 +1534,8 @@ public final class Bukkit { /** * Gets every player that has ever played on this server. @@ -127,10 +127,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6 * @param statePredicate The predicate which should get used to test if a block should be set or not. * @return true if the tree was created successfully, otherwise false diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 9088bd9dfb515381d5df1c255ae3319f9cdde81e..012b5954a2f9dc61fb8ad29c4b8bce2648ddc681 100644 +index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24e86031c7 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -570,13 +570,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -580,13 +580,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * *

* Note: If set to 0, {@link SpawnCategory} mobs spawning will be disabled. @@ -145,7 +145,7 @@ index 9088bd9dfb515381d5df1c255ae3319f9cdde81e..012b5954a2f9dc61fb8ad29c4b8bce26 */ public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory); -@@ -1284,6 +1281,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1294,6 +1291,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi /** * Gets every player that has ever played on this server. diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch index 41fef215b1..55bf31edcc 100644 --- a/patches/api/0060-Basic-PlayerProfile-API.patch +++ b/patches/api/0060-Basic-PlayerProfile-API.patch @@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3b7087d5c71a498f513f67514db9e118780363c7..b165a4f99802ced243f1fb56af2bcf2c2ab7abf1 100644 +index 53f56d95bdf484caed9effbedfe507f6745bb8c0..5aa1aafddd28a5aa52274f37c09bf0fda75f7ea3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2357,6 +2357,83 @@ public final class Bukkit { +@@ -2385,6 +2385,83 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -415,10 +415,10 @@ index 3b7087d5c71a498f513f67514db9e118780363c7..b165a4f99802ced243f1fb56af2bcf2c @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 012b5954a2f9dc61fb8ad29c4b8bce2648ddc681..f7a9756d3e3cd337b72b406ca862b81c27d4e44e 100644 +index b0734f8253ed540916db7bc75cd7dd24e86031c7..c2cf0e547137b8a023ea009c7a5d0080def5f5f8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2067,5 +2067,76 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2077,5 +2077,76 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch index c821f93d0d..9b98f823e5 100644 --- a/patches/api/0092-Player.setPlayerProfile-API.patch +++ b/patches/api/0092-Player.setPlayerProfile-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e488e006d 100644 +index 5aa1aafddd28a5aa52274f37c09bf0fda75f7ea3..8521ef27d1e6c06e7228acb47388b02c50dc0e84 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1348,8 +1348,10 @@ public final class Bukkit { +@@ -1376,8 +1376,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank @@ -20,7 +20,7 @@ index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) { return server.createPlayerProfile(uniqueId, name); } -@@ -1360,8 +1362,10 @@ public final class Bukkit { +@@ -1388,8 +1390,10 @@ public final class Bukkit { * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null @@ -31,7 +31,7 @@ index b165a4f99802ced243f1fb56af2bcf2c2ab7abf1..3ea17583766a462317a6a609ac693b5e public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) { return server.createPlayerProfile(uniqueId); } -@@ -1373,8 +1377,10 @@ public final class Bukkit { +@@ -1401,8 +1405,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank @@ -56,10 +56,10 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46 /** * Checks if this player has had their profile banned. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1db452ad9 100644 +index c2cf0e547137b8a023ea009c7a5d0080def5f5f8..e4b42323e8d168f9daee3d1b38f3591b45bc6a1b 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1153,8 +1153,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1163,8 +1163,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank @@ -70,7 +70,7 @@ index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1 PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name); /** -@@ -1163,8 +1165,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1173,8 +1175,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null @@ -81,7 +81,7 @@ index 8e4bf531c0a2f7101c2a3733fe33733d31c611fd..427b49836becbb0c9e1cb2e94fab7eb1 PlayerProfile createPlayerProfile(@NotNull UUID uniqueId); /** -@@ -1174,8 +1178,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1184,8 +1188,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch index cc120a8b1a..bcce62b587 100644 --- a/patches/api/0093-getPlayerUniqueId-API.patch +++ b/patches/api/0093-getPlayerUniqueId-API.patch @@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3ea17583766a462317a6a609ac693b5e488e006d..3e32a6bbf593b269f1af23c7e2fdafaccc0d2110 100644 +index 8521ef27d1e6c06e7228acb47388b02c50dc0e84..7bf662bd0eafcec46bb12cae78628e5045cbc299 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -721,6 +721,20 @@ public final class Bukkit { +@@ -749,6 +749,20 @@ public final class Bukkit { return server.getPlayer(id); } @@ -34,10 +34,10 @@ index 3ea17583766a462317a6a609ac693b5e488e006d..3e32a6bbf593b269f1af23c7e2fdafac * Gets the plugin manager for interfacing with plugins. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 427b49836becbb0c9e1cb2e94fab7eb1db452ad9..19e6cee94caabfe93c841da783c86a3c283ebcb9 100644 +index e4b42323e8d168f9daee3d1b38f3591b45bc6a1b..f352b10ad81ee21ddbf9d09ccbc6e919cb670bf9 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -619,6 +619,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -629,6 +629,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Nullable public Player getPlayer(@NotNull UUID id); diff --git a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch deleted file mode 100644 index 6c3f8d857b..0000000000 --- a/patches/api/0147-Add-Git-information-to-version-command-on-startup.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Professor Bloodstone -Date: Sun, 20 Jun 2021 01:48:31 +0200 -Subject: [PATCH] Add Git information to version command/on startup - - -diff --git a/src/main/java/io/papermc/paper/util/JarManifests.java b/src/main/java/io/papermc/paper/util/JarManifests.java -new file mode 100644 -index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b306076343 ---- /dev/null -+++ b/src/main/java/io/papermc/paper/util/JarManifests.java -@@ -0,0 +1,37 @@ -+package io.papermc.paper.util; -+ -+import java.io.IOException; -+import java.io.InputStream; -+import java.net.URL; -+import java.util.Collections; -+import java.util.Map; -+import java.util.WeakHashMap; -+import java.util.jar.Manifest; -+import org.jetbrains.annotations.ApiStatus; -+import org.jetbrains.annotations.NotNull; -+import org.jetbrains.annotations.Nullable; -+ -+@ApiStatus.Internal -+public final class JarManifests { -+ private JarManifests() { -+ } -+ -+ private static final Map MANIFESTS = Collections.synchronizedMap(new WeakHashMap<>()); -+ -+ public static @Nullable Manifest manifest(final @NotNull Class clazz) { -+ return MANIFESTS.computeIfAbsent(clazz.getClassLoader(), classLoader -> { -+ final String classLocation = "/" + clazz.getName().replace(".", "/") + ".class"; -+ final URL resource = clazz.getResource(classLocation); -+ if (resource == null) { -+ return null; -+ } -+ final String classFilePath = resource.toString().replace("\\", "/"); -+ final String archivePath = classFilePath.substring(0, classFilePath.length() - classLocation.length()); -+ try (final InputStream stream = new URL(archivePath + "/META-INF/MANIFEST.MF").openStream()) { -+ return new Manifest(stream); -+ } catch (final IOException ex) { -+ return null; -+ } -+ }); -+ } -+} -diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 3e32a6bbf593b269f1af23c7e2fdafaccc0d2110..d60780a26e10f5f9c80446693552384281327b51 100644 ---- a/src/main/java/org/bukkit/Bukkit.java -+++ b/src/main/java/org/bukkit/Bukkit.java -@@ -60,6 +60,7 @@ import org.bukkit.util.CachedServerIcon; - import org.jetbrains.annotations.Contract; - import org.jetbrains.annotations.NotNull; - import org.jetbrains.annotations.Nullable; -+import io.papermc.paper.util.JarManifests; // Paper - - /** - * Represents the Bukkit core, for version and Server singleton handling -@@ -109,7 +110,25 @@ public final class Bukkit { - } - - Bukkit.server = server; -- server.getLogger().info("This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ")"); -+ // Paper start - add git information -+ server.getLogger().info(getVersionMessage()); -+ } -+ /** -+ * Gets message describing the version server is running. -+ * -+ * @return message describing the version server is running -+ */ -+ @NotNull -+ public static String getVersionMessage() { -+ final var manifest = JarManifests.manifest(Bukkit.getServer().getClass()); -+ final String gitBranch = manifest == null ? null : manifest.getMainAttributes().getValue("Git-Branch"); -+ final String gitCommit = manifest == null ? null : manifest.getMainAttributes().getValue("Git-Commit"); -+ String branchMsg = " on " + gitBranch; -+ if ("master".equals(gitBranch) || "main".equals(gitBranch)) { -+ branchMsg = ""; // Don't show branch on main/master -+ } -+ return "This server is running " + getName() + " version " + getVersion() + " (Implementing API version " + getBukkitVersion() + ") (Git: " + gitCommit + branchMsg + ")"; -+ // Paper end - } - - /** -diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index b437cf212a63aa96a9492db8d01d5d37061aee23..fd5d9881abfd930bb883120f018f76dc78b62b14 100644 ---- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java -+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -@@ -256,7 +256,7 @@ public class VersionCommand extends BukkitCommand { - private void setVersionMessage(final @NotNull Component msg) { - lastCheck = System.currentTimeMillis(); - final Component message = Component.textOfChildren( -- Component.text("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")", NamedTextColor.WHITE), -+ Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE), - Component.newline(), - msg - ); diff --git a/patches/api/0148-Mob-Pathfinding-API.patch b/patches/api/0147-Mob-Pathfinding-API.patch similarity index 100% rename from patches/api/0148-Mob-Pathfinding-API.patch rename to patches/api/0147-Mob-Pathfinding-API.patch diff --git a/patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0148-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0149-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0148-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0150-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0149-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0150-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0151-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0150-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0152-Material-API-additions.patch b/patches/api/0151-Material-API-additions.patch similarity index 100% rename from patches/api/0152-Material-API-additions.patch rename to patches/api/0151-Material-API-additions.patch diff --git a/patches/api/0153-Add-Material-Tags.patch b/patches/api/0152-Add-Material-Tags.patch similarity index 99% rename from patches/api/0153-Add-Material-Tags.patch rename to patches/api/0152-Add-Material-Tags.patch index 9c8781e5b6..00b8a36df3 100644 --- a/patches/api/0153-Add-Material-Tags.patch +++ b/patches/api/0152-Add-Material-Tags.patch @@ -1132,7 +1132,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 1be862110e94654be12fcef5980388abf242ac7f..298ae1294a122705bca6bd74ea540185839d1ed5 100644 +index 54861b283e82f0a9789eda508356c8a8accb0545..33c75db0fcbbd771a59764c5d90484cee27b60cf 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0154-PreSpawnerSpawnEvent.patch b/patches/api/0153-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0154-PreSpawnerSpawnEvent.patch rename to patches/api/0153-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0155-Add-LivingEntity-getTargetEntity.patch b/patches/api/0154-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0155-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0154-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0156-Add-sun-related-API.patch b/patches/api/0155-Add-sun-related-API.patch similarity index 100% rename from patches/api/0156-Add-sun-related-API.patch rename to patches/api/0155-Add-sun-related-API.patch diff --git a/patches/api/0157-Turtle-API.patch b/patches/api/0156-Turtle-API.patch similarity index 100% rename from patches/api/0157-Turtle-API.patch rename to patches/api/0156-Turtle-API.patch diff --git a/patches/api/0158-Add-spectator-target-events.patch b/patches/api/0157-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0158-Add-spectator-target-events.patch rename to patches/api/0157-Add-spectator-target-events.patch diff --git a/patches/api/0159-Add-more-Witch-API.patch b/patches/api/0158-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0159-Add-more-Witch-API.patch rename to patches/api/0158-Add-more-Witch-API.patch diff --git a/patches/api/0160-Make-the-default-permission-message-configurable.patch b/patches/api/0159-Make-the-default-permission-message-configurable.patch similarity index 91% rename from patches/api/0160-Make-the-default-permission-message-configurable.patch rename to patches/api/0159-Make-the-default-permission-message-configurable.patch index 8dac5d0ae4..3718459df1 100644 --- a/patches/api/0160-Make-the-default-permission-message-configurable.patch +++ b/patches/api/0159-Make-the-default-permission-message-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43addfd122d 100644 +index 7bf662bd0eafcec46bb12cae78628e5045cbc299..de678fa681fbd94efa8fd85568ee092ae26fca85 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2397,6 +2397,28 @@ public final class Bukkit { +@@ -2406,6 +2406,28 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -38,10 +38,10 @@ index d60780a26e10f5f9c80446693552384281327b51..f248515862c3bc418b42b8e197feb43a * Creates a PlayerProfile for the specified uuid, with name as null. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 19e6cee94caabfe93c841da783c86a3c283ebcb9..69f236d965c631510b008a7eb38aa1b62a4e196a 100644 +index f352b10ad81ee21ddbf9d09ccbc6e919cb670bf9..a7a04a4e9c94cc43ccf84abb3b7956b60c79e8fe 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2086,6 +2086,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2096,6 +2096,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0160-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0161-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0160-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0162-Add-more-Zombie-API.patch b/patches/api/0161-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0162-Add-more-Zombie-API.patch rename to patches/api/0161-Add-more-Zombie-API.patch diff --git a/patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0162-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0163-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0162-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0164-Add-PlayerConnectionCloseEvent.patch b/patches/api/0163-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0164-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0163-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0165-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0165-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0166-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0165-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0167-BlockDestroyEvent.patch b/patches/api/0166-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0167-BlockDestroyEvent.patch rename to patches/api/0166-BlockDestroyEvent.patch diff --git a/patches/api/0168-Add-WhitelistToggleEvent.patch b/patches/api/0167-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0168-Add-WhitelistToggleEvent.patch rename to patches/api/0167-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0169-Add-GS4-Query-event.patch b/patches/api/0168-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0169-Add-GS4-Query-event.patch rename to patches/api/0168-Add-GS4-Query-event.patch diff --git a/patches/api/0170-Add-PlayerPostRespawnEvent.patch b/patches/api/0169-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0170-Add-PlayerPostRespawnEvent.patch rename to patches/api/0169-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0171-Entity-getEntitySpawnReason.patch b/patches/api/0170-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0171-Entity-getEntitySpawnReason.patch rename to patches/api/0170-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch similarity index 99% rename from patches/api/0172-Fix-Spigot-annotation-mistakes.patch rename to patches/api/0171-Fix-Spigot-annotation-mistakes.patch index 74b42863cd..8229de10af 100644 --- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch @@ -40,10 +40,10 @@ index ac420f0059fc50d3e1294f85df7515c9e17ff78f..24daba85ce4129fb0babe67570059ca8 public static Art getById(int id) { return BY_ID.get(id); diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949574f3f59 100644 +index de678fa681fbd94efa8fd85568ee092ae26fca85..cddf3250c4a7efe239248b5e9662f33f5c0b702f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -870,9 +870,8 @@ public final class Bukkit { +@@ -879,9 +879,8 @@ public final class Bukkit { * * @param id the id of the map to get * @return a map view if it exists, or null otherwise @@ -54,7 +54,7 @@ index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949 @Nullable public static MapView getMap(int id) { return server.getMap(id); -@@ -951,8 +950,14 @@ public final class Bukkit { +@@ -960,8 +959,14 @@ public final class Bukkit { * Returns the primary logger associated with this server instance. * * @return Logger associated with this server @@ -69,7 +69,7 @@ index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949 public static Logger getLogger() { return server.getLogger(); } -@@ -1349,10 +1354,8 @@ public final class Bukkit { +@@ -1358,10 +1363,8 @@ public final class Bukkit { * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) @@ -81,7 +81,7 @@ index f248515862c3bc418b42b8e197feb43addfd122d..395d7245aac45a1b805e15ee1fdb9949 @NotNull public static OfflinePlayer getOfflinePlayer(@NotNull String name) { return server.getOfflinePlayer(name); -@@ -1954,7 +1957,7 @@ public final class Bukkit { +@@ -1963,7 +1966,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -498,10 +498,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4 CRACKED(0x0), GLYPHED(0x1), diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b81a6544d4 100644 +index a7a04a4e9c94cc43ccf84abb3b7956b60c79e8fe..6412546d84874cb93fcdc8426a402bec4e276057 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -730,9 +730,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -740,9 +740,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @param id the id of the map to get * @return a map view if it exists, or null otherwise @@ -512,7 +512,7 @@ index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b8 @Nullable public MapView getMap(int id); -@@ -799,8 +798,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -809,8 +808,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * Returns the primary logger associated with this server instance. * * @return Logger associated with this server @@ -527,7 +527,7 @@ index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b8 public Logger getLogger(); /** -@@ -1137,10 +1142,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1147,10 +1152,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) @@ -539,7 +539,7 @@ index 3d5ef29bcfed92dc7fb3bb6d59538ba4a4e3de5f..43f8cdd600aa2c2e33136068b3c4b4b8 @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); -@@ -1649,7 +1652,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1659,7 +1662,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @return the scoreboard manager or null if no worlds are loaded. */ diff --git a/patches/api/0173-Server-Tick-Events.patch b/patches/api/0172-Server-Tick-Events.patch similarity index 100% rename from patches/api/0173-Server-Tick-Events.patch rename to patches/api/0172-Server-Tick-Events.patch diff --git a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0173-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0173-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0175-Add-Heightmap-API.patch b/patches/api/0174-Add-Heightmap-API.patch similarity index 100% rename from patches/api/0175-Add-Heightmap-API.patch rename to patches/api/0174-Add-Heightmap-API.patch diff --git a/patches/api/0176-Mob-Spawner-API-Enhancements.patch b/patches/api/0175-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0176-Mob-Spawner-API-Enhancements.patch rename to patches/api/0175-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0177-Add-BlockSoundGroup-interface.patch b/patches/api/0176-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0177-Add-BlockSoundGroup-interface.patch rename to patches/api/0176-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0177-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0178-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0177-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0179-Set-true-custom-payload-channel-size-limit.patch b/patches/api/0178-Set-true-custom-payload-channel-size-limit.patch similarity index 100% rename from patches/api/0179-Set-true-custom-payload-channel-size-limit.patch rename to patches/api/0178-Set-true-custom-payload-channel-size-limit.patch diff --git a/patches/api/0180-Expose-the-internal-current-tick.patch b/patches/api/0179-Expose-the-internal-current-tick.patch similarity index 79% rename from patches/api/0180-Expose-the-internal-current-tick.patch rename to patches/api/0179-Expose-the-internal-current-tick.patch index b89d40b430..31ca1dedb7 100644 --- a/patches/api/0180-Expose-the-internal-current-tick.patch +++ b/patches/api/0179-Expose-the-internal-current-tick.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 395d7245aac45a1b805e15ee1fdb9949574f3f59..d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1 100644 +index cddf3250c4a7efe239248b5e9662f33f5c0b702f..836b5d1363ffcff08708b6b4721253ade99eb987 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2498,6 +2498,10 @@ public final class Bukkit { +@@ -2507,6 +2507,10 @@ public final class Bukkit { public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) { return server.createProfileExact(uuid, name); } @@ -20,10 +20,10 @@ index 395d7245aac45a1b805e15ee1fdb9949574f3f59..d1e1c49ecf6a1ede71548fbac6143e38 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 43f8cdd600aa2c2e33136068b3c4b4b81a6544d4..f11c1caa81c97d1a31d8cc980ad4dab2e2573ec4 100644 +index 6412546d84874cb93fcdc8426a402bec4e276057..387478b3e4ad9877f3338b719ff447126ef16285 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2176,5 +2176,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2186,5 +2186,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name); diff --git a/patches/api/0181-Improve-Block-breakNaturally-API.patch b/patches/api/0180-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/api/0181-Improve-Block-breakNaturally-API.patch rename to patches/api/0180-Improve-Block-breakNaturally-API.patch diff --git a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0181-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0181-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0183-Add-ThrownEggHatchEvent.patch b/patches/api/0182-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0183-Add-ThrownEggHatchEvent.patch rename to patches/api/0182-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0184-Entity-Jump-API.patch b/patches/api/0183-Entity-Jump-API.patch similarity index 100% rename from patches/api/0184-Entity-Jump-API.patch rename to patches/api/0183-Entity-Jump-API.patch diff --git a/patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0184-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0185-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0184-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0186-Add-tick-times-API.patch b/patches/api/0185-Add-tick-times-API.patch similarity index 84% rename from patches/api/0186-Add-tick-times-API.patch rename to patches/api/0185-Add-tick-times-API.patch index 40cbc279eb..bd91d2fb9b 100644 --- a/patches/api/0186-Add-tick-times-API.patch +++ b/patches/api/0185-Add-tick-times-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1..385be33869f3850f8b1d3e690c8e0fc43adcbdce 100644 +index 836b5d1363ffcff08708b6b4721253ade99eb987..1a8f4e122b84b423fe19bfafad56d6d3df9ec134 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2170,6 +2170,25 @@ public final class Bukkit { +@@ -2179,6 +2179,25 @@ public final class Bukkit { public static double[] getTPS() { return server.getTPS(); } @@ -35,10 +35,10 @@ index d1e1c49ecf6a1ede71548fbac6143e38ba6dfea1..385be33869f3850f8b1d3e690c8e0fc4 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index cf242e2e6d538d3d38b7b10321ab375e018b24b1..d6d83b22389aee98967adda2631fa65ecbf00781 100644 +index 387478b3e4ad9877f3338b719ff447126ef16285..fc4e259e5ca7a4b25f276bda7f2f5ea022d0c552 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1836,6 +1836,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1846,6 +1846,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull public double[] getTPS(); diff --git a/patches/api/0187-Expose-MinecraftServer-isRunning.patch b/patches/api/0186-Expose-MinecraftServer-isRunning.patch similarity index 81% rename from patches/api/0187-Expose-MinecraftServer-isRunning.patch rename to patches/api/0186-Expose-MinecraftServer-isRunning.patch index 8912814c2b..b4b2e8c5c2 100644 --- a/patches/api/0187-Expose-MinecraftServer-isRunning.patch +++ b/patches/api/0186-Expose-MinecraftServer-isRunning.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794c7bd6706 100644 +index 1a8f4e122b84b423fe19bfafad56d6d3df9ec134..1c30e523d08250c8a5477fe4d749b779223f069a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2521,6 +2521,15 @@ public final class Bukkit { +@@ -2530,6 +2530,15 @@ public final class Bukkit { public static int getCurrentTick() { return server.getCurrentTick(); } @@ -26,10 +26,10 @@ index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 965032124406a63c70dc9007245f74fb2e503c52..17f6b930c7d462cd8112bb5a845c25202e6c78b5 100644 +index fc4e259e5ca7a4b25f276bda7f2f5ea022d0c552..1f4ebdaf9cfd14de9ff2d0cea7d110fe7630dc9a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2198,5 +2198,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2208,5 +2208,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return Current tick */ int getCurrentTick(); diff --git a/patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0188-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0188-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0189-Add-Player-Client-Options-API.patch rename to patches/api/0188-Add-Player-Client-Options-API.patch diff --git a/patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0189-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0190-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0189-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0191-Add-item-slot-convenience-methods.patch b/patches/api/0190-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0191-Add-item-slot-convenience-methods.patch rename to patches/api/0190-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0192-Villager-Restocks-API.patch b/patches/api/0191-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0192-Villager-Restocks-API.patch rename to patches/api/0191-Villager-Restocks-API.patch diff --git a/patches/api/0194-Add-Mob-Goal-API.patch b/patches/api/0192-Add-Mob-Goal-API.patch similarity index 98% rename from patches/api/0194-Add-Mob-Goal-API.patch rename to patches/api/0192-Add-Mob-Goal-API.patch index 1d8c7585d7..46f1f37db4 100644 --- a/patches/api/0194-Add-Mob-Goal-API.patch +++ b/patches/api/0192-Add-Mob-Goal-API.patch @@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef + Collection> getRunningGoalsWithout(@NotNull T mob, @NotNull GoalType type); +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d..79db7b5c25a7c824b107a5c79f40c61983d2757c 100644 +index 1c30e523d08250c8a5477fe4d749b779223f069a..f2fa4c419f212ea5d7ca0aab4ead4bd44dac5947 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2542,6 +2542,16 @@ public final class Bukkit { +@@ -2539,6 +2539,16 @@ public final class Bukkit { public static boolean isStopping() { return server.isStopping(); } diff --git a/patches/api/0195-Add-villager-reputation-API.patch b/patches/api/0193-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0195-Add-villager-reputation-API.patch rename to patches/api/0193-Add-villager-reputation-API.patch diff --git a/patches/api/0193-Expose-game-version.patch b/patches/api/0193-Expose-game-version.patch deleted file mode 100644 index 785d8563d2..0000000000 --- a/patches/api/0193-Expose-game-version.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Mark Vainomaa -Date: Fri, 1 May 2020 17:39:02 +0300 -Subject: [PATCH] Expose game version - - -diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f24d57a89dc4fdf73298bbb4cc187794c7bd6706..b608a6dc26bfc6d08f1e31107fed8ef1aaf90e1d 100644 ---- a/src/main/java/org/bukkit/Bukkit.java -+++ b/src/main/java/org/bukkit/Bukkit.java -@@ -161,6 +161,18 @@ public final class Bukkit { - return server.getBukkitVersion(); - } - -+ // Paper start - expose game version -+ /** -+ * Gets the version of game this server implements -+ * -+ * @return version of game -+ */ -+ @NotNull -+ public static String getMinecraftVersion() { -+ return server.getMinecraftVersion(); -+ } -+ // Paper end -+ - /** - * Gets a view of all currently logged in players. This {@linkplain - * Collections#unmodifiableCollection(Collection) view} is a reused -diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 015f1167bdc752fe6665807866caa0cda5ba0571..987e01f48f7f8b19fd6292a11988b1aeb90a09f6 100644 ---- a/src/main/java/org/bukkit/Server.java -+++ b/src/main/java/org/bukkit/Server.java -@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi - @NotNull - public String getBukkitVersion(); - -+ // Paper start - expose game version -+ /** -+ * Gets the version of game this server implements -+ * -+ * @return version of game -+ */ -+ @NotNull -+ String getMinecraftVersion(); -+ // Paper end -+ - /** - * Gets a view of all currently logged in players. This {@linkplain - * Collections#unmodifiableCollection(Collection) view} is a reused diff --git a/patches/api/0196-Spawn-Reason-API.patch b/patches/api/0194-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0196-Spawn-Reason-API.patch rename to patches/api/0194-Spawn-Reason-API.patch diff --git a/patches/api/0197-Potential-bed-API.patch b/patches/api/0195-Potential-bed-API.patch similarity index 100% rename from patches/api/0197-Potential-bed-API.patch rename to patches/api/0195-Potential-bed-API.patch diff --git a/patches/api/0198-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0196-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0198-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0196-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0199-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0197-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0199-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0197-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0200-Support-components-in-ItemMeta.patch b/patches/api/0198-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/api/0200-Support-components-in-ItemMeta.patch rename to patches/api/0198-Support-components-in-ItemMeta.patch diff --git a/patches/api/0201-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0199-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0201-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0199-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0202-Add-entity-liquid-API.patch b/patches/api/0200-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0202-Add-entity-liquid-API.patch rename to patches/api/0200-Add-entity-liquid-API.patch diff --git a/patches/api/0203-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0201-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0203-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0201-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0204-Add-BellRingEvent.patch b/patches/api/0202-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0204-Add-BellRingEvent.patch rename to patches/api/0202-Add-BellRingEvent.patch diff --git a/patches/api/0205-Brand-support.patch b/patches/api/0203-Brand-support.patch similarity index 100% rename from patches/api/0205-Brand-support.patch rename to patches/api/0203-Brand-support.patch diff --git a/patches/api/0206-Add-moon-phase-API.patch b/patches/api/0204-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0206-Add-moon-phase-API.patch rename to patches/api/0204-Add-moon-phase-API.patch diff --git a/patches/api/0207-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0207-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0208-Add-more-Evoker-API.patch b/patches/api/0206-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0208-Add-more-Evoker-API.patch rename to patches/api/0206-Add-more-Evoker-API.patch diff --git a/patches/api/0209-Add-methods-to-get-translation-keys.patch b/patches/api/0207-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/api/0209-Add-methods-to-get-translation-keys.patch rename to patches/api/0207-Add-methods-to-get-translation-keys.patch diff --git a/patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 97% rename from patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch index ff14019e55..b5ddd21440 100644 --- a/patches/api/0210-Create-HoverEvent-from-ItemStack-Entity.patch +++ b/patches/api/0208-Create-HoverEvent-from-ItemStack-Entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index e34c89a945a0f12cdc4be8cc232c8de986474372..dbebaf8172ec6872f56958b9583affde4f8400a4 100644 +index 4c4e52b2c200408c4e33a141e1eed78126ceaaee..53b8934cb829f37971cb3ecd5652c9974dec6ab0 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -265,4 +265,65 @@ public interface ItemFactory { diff --git a/patches/api/0211-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0209-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0211-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0209-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0212-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0210-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0212-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0210-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0213-Entity-isTicking.patch b/patches/api/0211-Entity-isTicking.patch similarity index 100% rename from patches/api/0213-Entity-isTicking.patch rename to patches/api/0211-Entity-isTicking.patch diff --git a/patches/api/0214-Villager-resetOffers.patch b/patches/api/0212-Villager-resetOffers.patch similarity index 100% rename from patches/api/0214-Villager-resetOffers.patch rename to patches/api/0212-Villager-resetOffers.patch diff --git a/patches/api/0215-Player-elytra-boost-API.patch b/patches/api/0213-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0215-Player-elytra-boost-API.patch rename to patches/api/0213-Player-elytra-boost-API.patch diff --git a/patches/api/0216-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch similarity index 91% rename from patches/api/0216-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0214-Add-getOfflinePlayerIfCached-String.patch index 402eff8c38..065ab10dd0 100644 --- a/patches/api/0216-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 79db7b5c25a7c824b107a5c79f40c61983d2757c..732ed3724e784ad659cb4411dbd73b42a8330a2c 100644 +index f2fa4c419f212ea5d7ca0aab4ead4bd44dac5947..3210587c341bc8d80ddc7f387ca4030dbd0074c9 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1373,6 +1373,27 @@ public final class Bukkit { +@@ -1370,6 +1370,27 @@ public final class Bukkit { return server.getOfflinePlayer(name); } @@ -37,7 +37,7 @@ index 79db7b5c25a7c824b107a5c79f40c61983d2757c..732ed3724e784ad659cb4411dbd73b42 * Gets the player by the given UUID, regardless if they are offline or * online. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8aba385b9d1a9b71c3304f1d802f18d4434f34d5..395f7910f535bfd33a5676b011ab62a53e30e140 100644 +index 711de014b7cf69459526e6c20c94f29ee4db11c4..f0c1d16c6bee58826a3cde3c4988e02690207fce 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1157,6 +1157,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi diff --git a/patches/api/0217-Add-ignore-discounts-API.patch b/patches/api/0215-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0217-Add-ignore-discounts-API.patch rename to patches/api/0215-Add-ignore-discounts-API.patch diff --git a/patches/api/0218-Item-no-age-no-player-pickup.patch b/patches/api/0216-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0218-Item-no-age-no-player-pickup.patch rename to patches/api/0216-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0219-Beacon-API-custom-effect-ranges.patch b/patches/api/0217-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0219-Beacon-API-custom-effect-ranges.patch rename to patches/api/0217-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0220-Add-API-for-quit-reason.patch b/patches/api/0218-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0220-Add-API-for-quit-reason.patch rename to patches/api/0218-Add-API-for-quit-reason.patch diff --git a/patches/api/0221-Add-Destroy-Speed-API.patch b/patches/api/0219-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0221-Add-Destroy-Speed-API.patch rename to patches/api/0219-Add-Destroy-Speed-API.patch diff --git a/patches/api/0222-Add-LivingEntity-clearActiveItem.patch b/patches/api/0220-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0222-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0220-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0223-Add-PlayerItemCooldownEvent.patch b/patches/api/0221-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0223-Add-PlayerItemCooldownEvent.patch rename to patches/api/0221-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0224-More-lightning-API.patch b/patches/api/0222-More-lightning-API.patch similarity index 100% rename from patches/api/0224-More-lightning-API.patch rename to patches/api/0222-More-lightning-API.patch diff --git a/patches/api/0225-Add-PlayerShearBlockEvent.patch b/patches/api/0223-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0225-Add-PlayerShearBlockEvent.patch rename to patches/api/0223-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0226-Player-Chunk-Load-Unload-Events.patch b/patches/api/0224-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0226-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0224-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0227-Expose-LivingEntity-hurt-direction.patch b/patches/api/0225-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0227-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0225-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0228-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0226-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0228-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0226-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0229-Added-PlayerTradeEvent.patch b/patches/api/0227-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0229-Added-PlayerTradeEvent.patch rename to patches/api/0227-Added-PlayerTradeEvent.patch diff --git a/patches/api/0230-Add-TargetHitEvent-API.patch b/patches/api/0228-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0230-Add-TargetHitEvent-API.patch rename to patches/api/0228-Add-TargetHitEvent-API.patch diff --git a/patches/api/0231-Additional-Block-Material-API-s.patch b/patches/api/0229-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0231-Additional-Block-Material-API-s.patch rename to patches/api/0229-Additional-Block-Material-API-s.patch diff --git a/patches/api/0232-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0230-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0232-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0230-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0233-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0231-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0233-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0231-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0234-Zombie-API-breaking-doors.patch b/patches/api/0232-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0234-Zombie-API-breaking-doors.patch rename to patches/api/0232-Zombie-API-breaking-doors.patch diff --git a/patches/api/0235-Add-EntityLoadCrossbowEvent.patch b/patches/api/0233-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0235-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0233-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0236-Added-WorldGameRuleChangeEvent.patch b/patches/api/0234-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0236-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0234-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0237-Added-ServerResourcesReloadedEvent.patch b/patches/api/0235-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0237-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0235-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0238-Add-BlockFailedDispenseEvent.patch b/patches/api/0236-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0238-Add-BlockFailedDispenseEvent.patch rename to patches/api/0236-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0239-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0237-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0239-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0237-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0240-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0238-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0240-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0238-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0241-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0239-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0241-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0239-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0242-Add-sendOpLevel-API.patch b/patches/api/0240-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0242-Add-sendOpLevel-API.patch rename to patches/api/0240-Add-sendOpLevel-API.patch diff --git a/patches/api/0243-Add-RegistryAccess-for-managing-registries.patch b/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch similarity index 99% rename from patches/api/0243-Add-RegistryAccess-for-managing-registries.patch rename to patches/api/0241-Add-RegistryAccess-for-managing-registries.patch index 62f2578f51..f81b5e8480 100644 --- a/patches/api/0243-Add-RegistryAccess-for-managing-registries.patch +++ b/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch @@ -190,10 +190,10 @@ index 791813220b2504214b1adecc69093cd600fb0f8c..47fe5b0d5d031110c27210a0a256c260 final RegistryKey registryKey = createInternal(key); REGISTRY_KEYS.add(registryKey); diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 732ed3724e784ad659cb4411dbd73b42a8330a2c..7be6710d28dea19bd0f9054c1c2e32dacd355c45 100644 +index 3210587c341bc8d80ddc7f387ca4030dbd0074c9..f35e5cd82c04bce3ca24120ca6cb5260a789b2d7 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2398,8 +2398,11 @@ public final class Bukkit { +@@ -2395,8 +2395,11 @@ public final class Bukkit { * @param tClass of the registry to get * @param type of the registry * @return the corresponding registry or null if not present diff --git a/patches/api/0244-Add-StructuresLocateEvent.patch b/patches/api/0242-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/api/0244-Add-StructuresLocateEvent.patch rename to patches/api/0242-Add-StructuresLocateEvent.patch diff --git a/patches/api/0245-Add-BlockPreDispenseEvent.patch b/patches/api/0243-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0245-Add-BlockPreDispenseEvent.patch rename to patches/api/0243-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0246-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0244-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0246-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0244-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0247-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0245-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0247-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0245-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0248-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0246-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0248-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0246-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0249-add-DragonEggFormEvent.patch b/patches/api/0247-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0249-add-DragonEggFormEvent.patch rename to patches/api/0247-add-DragonEggFormEvent.patch diff --git a/patches/api/0250-EntityMoveEvent.patch b/patches/api/0248-EntityMoveEvent.patch similarity index 100% rename from patches/api/0250-EntityMoveEvent.patch rename to patches/api/0248-EntityMoveEvent.patch diff --git a/patches/api/0251-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0249-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0251-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0249-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0252-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0250-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0252-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0250-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0253-living-entity-allow-attribute-registration.patch b/patches/api/0251-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0253-living-entity-allow-attribute-registration.patch rename to patches/api/0251-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0254-Add-missing-effects.patch b/patches/api/0252-Add-missing-effects.patch similarity index 100% rename from patches/api/0254-Add-missing-effects.patch rename to patches/api/0252-Add-missing-effects.patch diff --git a/patches/api/0255-Expose-Tracked-Players.patch b/patches/api/0253-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0255-Expose-Tracked-Players.patch rename to patches/api/0253-Expose-Tracked-Players.patch diff --git a/patches/api/0256-Add-worldborder-events.patch b/patches/api/0254-Add-worldborder-events.patch similarity index 100% rename from patches/api/0256-Add-worldborder-events.patch rename to patches/api/0254-Add-worldborder-events.patch diff --git a/patches/api/0257-added-PlayerNameEntityEvent.patch b/patches/api/0255-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0257-added-PlayerNameEntityEvent.patch rename to patches/api/0255-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0258-Add-recipe-to-cook-events.patch b/patches/api/0256-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0258-Add-recipe-to-cook-events.patch rename to patches/api/0256-Add-recipe-to-cook-events.patch diff --git a/patches/api/0259-Add-Block-isValidTool.patch b/patches/api/0257-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0259-Add-Block-isValidTool.patch rename to patches/api/0257-Add-Block-isValidTool.patch diff --git a/patches/api/0260-Expand-world-key-API.patch b/patches/api/0258-Expand-world-key-API.patch similarity index 97% rename from patches/api/0260-Expand-world-key-API.patch rename to patches/api/0258-Expand-world-key-API.patch index e26cc12b26..51b61aef60 100644 --- a/patches/api/0260-Expand-world-key-API.patch +++ b/patches/api/0258-Expand-world-key-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7be6710d28dea19bd0f9054c1c2e32dacd355c45..8fd1de659777595d9d8198e7ee638ad5500a6317 100644 +index f35e5cd82c04bce3ca24120ca6cb5260a789b2d7..94abdf67a057ef02fc98b61c1b9376454cc5b4c8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -864,6 +864,18 @@ public final class Bukkit { +@@ -861,6 +861,18 @@ public final class Bukkit { public static World getWorld(@NotNull UUID uid) { return server.getWorld(uid); } diff --git a/patches/api/0261-Improve-Item-Rarity-API.patch b/patches/api/0259-Improve-Item-Rarity-API.patch similarity index 100% rename from patches/api/0261-Improve-Item-Rarity-API.patch rename to patches/api/0259-Improve-Item-Rarity-API.patch diff --git a/patches/api/0262-Expose-protocol-version.patch b/patches/api/0260-Expose-protocol-version.patch similarity index 100% rename from patches/api/0262-Expose-protocol-version.patch rename to patches/api/0260-Expose-protocol-version.patch diff --git a/patches/api/0263-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0261-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0263-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0261-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0264-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0262-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0264-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0262-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0265-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0263-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/api/0265-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0263-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/api/0266-Added-PlayerDeepSleepEvent.patch b/patches/api/0264-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0266-Added-PlayerDeepSleepEvent.patch rename to patches/api/0264-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0267-More-World-API.patch b/patches/api/0265-More-World-API.patch similarity index 100% rename from patches/api/0267-More-World-API.patch rename to patches/api/0265-More-World-API.patch diff --git a/patches/api/0268-Added-PlayerBedFailEnterEvent.patch b/patches/api/0266-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0268-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0266-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0269-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0267-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0269-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0267-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0270-PlayerMoveEvent-Improvements.patch b/patches/api/0268-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0270-PlayerMoveEvent-Improvements.patch rename to patches/api/0268-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0271-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0269-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0271-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0269-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0272-Add-more-WanderingTrader-API.patch b/patches/api/0270-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0272-Add-more-WanderingTrader-API.patch rename to patches/api/0270-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0273-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0271-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0273-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0271-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0274-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0272-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0274-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0272-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0275-Inventory-close.patch b/patches/api/0273-Inventory-close.patch similarity index 100% rename from patches/api/0275-Inventory-close.patch rename to patches/api/0273-Inventory-close.patch diff --git a/patches/api/0276-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0274-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0276-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0274-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0277-Add-basic-Datapack-API.patch b/patches/api/0275-Add-basic-Datapack-API.patch similarity index 96% rename from patches/api/0277-Add-basic-Datapack-API.patch rename to patches/api/0275-Add-basic-Datapack-API.patch index 25a17a8105..029031d1d7 100644 --- a/patches/api/0277-Add-basic-Datapack-API.patch +++ b/patches/api/0275-Add-basic-Datapack-API.patch @@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7 + +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8fd1de659777595d9d8198e7ee638ad5500a6317..e62d46629305a268906cd2cd5d5977d063c2f484 100644 +index 94abdf67a057ef02fc98b61c1b9376454cc5b4c8..e5a9b816b281017a08959d8e61acf59574dc1c50 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -330,9 +330,11 @@ public final class Bukkit { +@@ -327,9 +327,11 @@ public final class Bukkit { /** * Get the DataPack Manager. * @@ -85,7 +85,7 @@ index 8fd1de659777595d9d8198e7ee638ad5500a6317..e62d46629305a268906cd2cd5d5977d0 public static DataPackManager getDataPackManager() { return server.getDataPackManager(); } -@@ -2588,6 +2590,14 @@ public final class Bukkit { +@@ -2585,6 +2587,14 @@ public final class Bukkit { public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return server.getMobGoals(); } diff --git a/patches/api/0278-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0276-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0278-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0276-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0279-ItemStack-repair-check-API.patch b/patches/api/0277-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0279-ItemStack-repair-check-API.patch rename to patches/api/0277-ItemStack-repair-check-API.patch diff --git a/patches/api/0280-More-Enchantment-API.patch b/patches/api/0278-More-Enchantment-API.patch similarity index 100% rename from patches/api/0280-More-Enchantment-API.patch rename to patches/api/0278-More-Enchantment-API.patch diff --git a/patches/api/0281-Add-Mob-lookAt-API.patch b/patches/api/0279-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0281-Add-Mob-lookAt-API.patch rename to patches/api/0279-Add-Mob-lookAt-API.patch diff --git a/patches/api/0282-ItemStack-editMeta.patch b/patches/api/0280-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0282-ItemStack-editMeta.patch rename to patches/api/0280-ItemStack-editMeta.patch diff --git a/patches/api/0283-Add-EntityInsideBlockEvent.patch b/patches/api/0281-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0283-Add-EntityInsideBlockEvent.patch rename to patches/api/0281-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0284-Attributes-API-for-item-defaults.patch b/patches/api/0282-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0284-Attributes-API-for-item-defaults.patch rename to patches/api/0282-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0285-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0283-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0285-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0283-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0286-More-Lidded-Block-API.patch b/patches/api/0284-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0286-More-Lidded-Block-API.patch rename to patches/api/0284-More-Lidded-Block-API.patch diff --git a/patches/api/0287-Add-PlayerKickEvent-causes.patch b/patches/api/0285-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0287-Add-PlayerKickEvent-causes.patch rename to patches/api/0285-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0288-Add-PufferFishStateChangeEvent.patch b/patches/api/0286-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0288-Add-PufferFishStateChangeEvent.patch rename to patches/api/0286-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0289-Add-BellRevealRaiderEvent.patch b/patches/api/0287-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0289-Add-BellRevealRaiderEvent.patch rename to patches/api/0287-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0290-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0288-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0290-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0288-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0291-Add-more-line-of-sight-methods.patch b/patches/api/0289-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0291-Add-more-line-of-sight-methods.patch rename to patches/api/0289-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0292-Add-WaterBottleSplashEvent.patch b/patches/api/0290-Add-WaterBottleSplashEvent.patch similarity index 100% rename from patches/api/0292-Add-WaterBottleSplashEvent.patch rename to patches/api/0290-Add-WaterBottleSplashEvent.patch diff --git a/patches/api/0293-Add-more-LimitedRegion-API.patch b/patches/api/0291-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/api/0293-Add-more-LimitedRegion-API.patch rename to patches/api/0291-Add-more-LimitedRegion-API.patch diff --git a/patches/api/0294-Missing-Entity-API.patch b/patches/api/0292-Missing-Entity-API.patch similarity index 100% rename from patches/api/0294-Missing-Entity-API.patch rename to patches/api/0292-Missing-Entity-API.patch diff --git a/patches/api/0295-Adds-PlayerArmSwingEvent.patch b/patches/api/0293-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/api/0295-Adds-PlayerArmSwingEvent.patch rename to patches/api/0293-Adds-PlayerArmSwingEvent.patch diff --git a/patches/api/0296-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0294-Add-PlayerSignCommandPreprocessEvent.patch similarity index 100% rename from patches/api/0296-Add-PlayerSignCommandPreprocessEvent.patch rename to patches/api/0294-Add-PlayerSignCommandPreprocessEvent.patch diff --git a/patches/api/0297-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0295-fix-empty-array-elements-in-command-arguments.patch similarity index 100% rename from patches/api/0297-fix-empty-array-elements-in-command-arguments.patch rename to patches/api/0295-fix-empty-array-elements-in-command-arguments.patch diff --git a/patches/api/0298-Stinger-API.patch b/patches/api/0296-Stinger-API.patch similarity index 100% rename from patches/api/0298-Stinger-API.patch rename to patches/api/0296-Stinger-API.patch diff --git a/patches/api/0299-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0297-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/api/0299-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/api/0297-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/api/0300-Add-PlayerSetSpawnEvent.patch b/patches/api/0298-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/api/0300-Add-PlayerSetSpawnEvent.patch rename to patches/api/0298-Add-PlayerSetSpawnEvent.patch diff --git a/patches/api/0301-Added-EntityDamageItemEvent.patch b/patches/api/0299-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/api/0301-Added-EntityDamageItemEvent.patch rename to patches/api/0299-Added-EntityDamageItemEvent.patch diff --git a/patches/api/0302-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0300-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/api/0302-Make-EntityUnleashEvent-cancellable.patch rename to patches/api/0300-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/api/0303-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0301-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/api/0303-Change-EnderEye-target-without-changing-other-things.patch rename to patches/api/0301-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/api/0304-Add-BlockBreakBlockEvent.patch b/patches/api/0302-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/api/0304-Add-BlockBreakBlockEvent.patch rename to patches/api/0302-Add-BlockBreakBlockEvent.patch diff --git a/patches/api/0305-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0303-Add-helpers-for-left-right-click-to-Action.patch similarity index 100% rename from patches/api/0305-Add-helpers-for-left-right-click-to-Action.patch rename to patches/api/0303-Add-helpers-for-left-right-click-to-Action.patch diff --git a/patches/api/0306-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/api/0304-Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/api/0306-Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/api/0304-Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/api/0307-More-CommandBlock-API.patch b/patches/api/0305-More-CommandBlock-API.patch similarity index 100% rename from patches/api/0307-More-CommandBlock-API.patch rename to patches/api/0305-More-CommandBlock-API.patch diff --git a/patches/api/0308-Add-missing-team-sidebar-display-slots.patch b/patches/api/0306-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/api/0308-Add-missing-team-sidebar-display-slots.patch rename to patches/api/0306-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/api/0309-add-back-EntityPortalExitEvent.patch b/patches/api/0307-add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/api/0309-add-back-EntityPortalExitEvent.patch rename to patches/api/0307-add-back-EntityPortalExitEvent.patch diff --git a/patches/api/0310-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0308-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/api/0310-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/api/0308-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/api/0311-Get-entity-default-attributes.patch b/patches/api/0309-Get-entity-default-attributes.patch similarity index 100% rename from patches/api/0311-Get-entity-default-attributes.patch rename to patches/api/0309-Get-entity-default-attributes.patch diff --git a/patches/api/0312-Left-handed-API.patch b/patches/api/0310-Left-handed-API.patch similarity index 100% rename from patches/api/0312-Left-handed-API.patch rename to patches/api/0310-Left-handed-API.patch diff --git a/patches/api/0313-Add-critical-damage-API.patch b/patches/api/0311-Add-critical-damage-API.patch similarity index 100% rename from patches/api/0313-Add-critical-damage-API.patch rename to patches/api/0311-Add-critical-damage-API.patch diff --git a/patches/api/0314-Add-more-advancement-API.patch b/patches/api/0312-Add-more-advancement-API.patch similarity index 100% rename from patches/api/0314-Add-more-advancement-API.patch rename to patches/api/0312-Add-more-advancement-API.patch diff --git a/patches/api/0315-Fix-issues-with-mob-conversion.patch b/patches/api/0313-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/api/0315-Fix-issues-with-mob-conversion.patch rename to patches/api/0313-Fix-issues-with-mob-conversion.patch diff --git a/patches/api/0316-Add-isCollidable-methods-to-various-places.patch b/patches/api/0314-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/api/0316-Add-isCollidable-methods-to-various-places.patch rename to patches/api/0314-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/api/0317-Goat-ram-API.patch b/patches/api/0315-Goat-ram-API.patch similarity index 100% rename from patches/api/0317-Goat-ram-API.patch rename to patches/api/0315-Goat-ram-API.patch diff --git a/patches/api/0318-Add-API-for-resetting-a-single-score.patch b/patches/api/0316-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/api/0318-Add-API-for-resetting-a-single-score.patch rename to patches/api/0316-Add-API-for-resetting-a-single-score.patch diff --git a/patches/api/0319-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0317-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/api/0319-Add-Raw-Byte-Entity-Serialization.patch rename to patches/api/0317-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/api/0320-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0318-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/api/0320-Add-PlayerItemFrameChangeEvent.patch rename to patches/api/0318-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/api/0321-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 96% rename from patches/api/0321-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch index 46674bdd76..b5cc2e41d7 100644 --- a/patches/api/0321-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index e62d46629305a268906cd2cd5d5977d063c2f484..8f88dc00c73810560070195fcf6e0f955e4ebdde 100644 +index e5a9b816b281017a08959d8e61acf59574dc1c50..6f4509bc3b997f773c19b31de91106c004c12af5 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2105,6 +2105,24 @@ public final class Bukkit { +@@ -2102,6 +2102,24 @@ public final class Bukkit { return server.createChunkData(world); } diff --git a/patches/api/0322-Add-more-Campfire-API.patch b/patches/api/0320-Add-more-Campfire-API.patch similarity index 100% rename from patches/api/0322-Add-more-Campfire-API.patch rename to patches/api/0320-Add-more-Campfire-API.patch diff --git a/patches/api/0323-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0321-Extend-VehicleCollisionEvent-move-HandlerList-up.patch similarity index 100% rename from patches/api/0323-Extend-VehicleCollisionEvent-move-HandlerList-up.patch rename to patches/api/0321-Extend-VehicleCollisionEvent-move-HandlerList-up.patch diff --git a/patches/api/0324-Improve-scoreboard-entries.patch b/patches/api/0322-Improve-scoreboard-entries.patch similarity index 100% rename from patches/api/0324-Improve-scoreboard-entries.patch rename to patches/api/0322-Improve-scoreboard-entries.patch diff --git a/patches/api/0325-Entity-powdered-snow-API.patch b/patches/api/0323-Entity-powdered-snow-API.patch similarity index 100% rename from patches/api/0325-Entity-powdered-snow-API.patch rename to patches/api/0323-Entity-powdered-snow-API.patch diff --git a/patches/api/0326-Add-API-for-item-entity-health.patch b/patches/api/0324-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/api/0326-Add-API-for-item-entity-health.patch rename to patches/api/0324-Add-API-for-item-entity-health.patch diff --git a/patches/api/0327-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0325-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/api/0327-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/api/0325-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/api/0328-Bucketable-API.patch b/patches/api/0326-Bucketable-API.patch similarity index 100% rename from patches/api/0328-Bucketable-API.patch rename to patches/api/0326-Bucketable-API.patch diff --git a/patches/api/0329-System-prop-for-default-config-comment-parsing.patch b/patches/api/0327-System-prop-for-default-config-comment-parsing.patch similarity index 100% rename from patches/api/0329-System-prop-for-default-config-comment-parsing.patch rename to patches/api/0327-System-prop-for-default-config-comment-parsing.patch diff --git a/patches/api/0330-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0328-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/api/0330-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/api/0328-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/api/0331-Multiple-Entries-with-Scoreboards.patch b/patches/api/0329-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/api/0331-Multiple-Entries-with-Scoreboards.patch rename to patches/api/0329-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/api/0332-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0330-Warn-on-strange-EventHandler-return-types.patch similarity index 100% rename from patches/api/0332-Warn-on-strange-EventHandler-return-types.patch rename to patches/api/0330-Warn-on-strange-EventHandler-return-types.patch diff --git a/patches/api/0333-Multi-Block-Change-API.patch b/patches/api/0331-Multi-Block-Change-API.patch similarity index 100% rename from patches/api/0333-Multi-Block-Change-API.patch rename to patches/api/0331-Multi-Block-Change-API.patch diff --git a/patches/api/0334-Fix-NotePlayEvent.patch b/patches/api/0332-Fix-NotePlayEvent.patch similarity index 100% rename from patches/api/0334-Fix-NotePlayEvent.patch rename to patches/api/0332-Fix-NotePlayEvent.patch diff --git a/patches/api/0335-Freeze-Tick-Lock-API.patch b/patches/api/0333-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/api/0335-Freeze-Tick-Lock-API.patch rename to patches/api/0333-Freeze-Tick-Lock-API.patch diff --git a/patches/api/0336-Dolphin-API.patch b/patches/api/0334-Dolphin-API.patch similarity index 100% rename from patches/api/0336-Dolphin-API.patch rename to patches/api/0334-Dolphin-API.patch diff --git a/patches/api/0337-More-PotionEffectType-API.patch b/patches/api/0335-More-PotionEffectType-API.patch similarity index 100% rename from patches/api/0337-More-PotionEffectType-API.patch rename to patches/api/0335-More-PotionEffectType-API.patch diff --git a/patches/api/0338-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 93% rename from patches/api/0338-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch index 666b423f41..815ba515f1 100644 --- a/patches/api/0338-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch @@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8f88dc00c73810560070195fcf6e0f955e4ebdde..1e96494c8080458f260ba94c4975ab18c4b4eefd 100644 +index 6f4509bc3b997f773c19b31de91106c004c12af5..f11b60d888e8f3a0c6213078cb5db35eafb82e3f 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1583,6 +1583,20 @@ public final class Bukkit { +@@ -1580,6 +1580,20 @@ public final class Bukkit { return server.getConsoleSender(); } diff --git a/patches/api/0339-Implement-regenerateChunk.patch b/patches/api/0337-Implement-regenerateChunk.patch similarity index 100% rename from patches/api/0339-Implement-regenerateChunk.patch rename to patches/api/0337-Implement-regenerateChunk.patch diff --git a/patches/api/0340-Add-GameEvent-tags.patch b/patches/api/0338-Add-GameEvent-tags.patch similarity index 100% rename from patches/api/0340-Add-GameEvent-tags.patch rename to patches/api/0338-Add-GameEvent-tags.patch diff --git a/patches/api/0341-Furnace-RecipesUsed-API.patch b/patches/api/0339-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/api/0341-Furnace-RecipesUsed-API.patch rename to patches/api/0339-Furnace-RecipesUsed-API.patch diff --git a/patches/api/0342-Configurable-sculk-sensor-listener-range.patch b/patches/api/0340-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/api/0342-Configurable-sculk-sensor-listener-range.patch rename to patches/api/0340-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/api/0343-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0341-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/api/0343-Add-missing-block-data-mins-and-maxes.patch rename to patches/api/0341-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/api/0344-Custom-Potion-Mixes.patch b/patches/api/0342-Custom-Potion-Mixes.patch similarity index 98% rename from patches/api/0344-Custom-Potion-Mixes.patch rename to patches/api/0342-Custom-Potion-Mixes.patch index 511fbb6d6c..9e3d5371aa 100644 --- a/patches/api/0344-Custom-Potion-Mixes.patch +++ b/patches/api/0342-Custom-Potion-Mixes.patch @@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 1e96494c8080458f260ba94c4975ab18c4b4eefd..d56baf72235173121a694e8bb5331f2c515d3aa8 100644 +index f11b60d888e8f3a0c6213078cb5db35eafb82e3f..84d43e24a69352e2715935fd7ce3fd05aaca8601 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2630,6 +2630,15 @@ public final class Bukkit { +@@ -2627,6 +2627,15 @@ public final class Bukkit { public static io.papermc.paper.datapack.DatapackManager getDatapackManager() { return server.getDatapackManager(); } diff --git a/patches/api/0345-Expose-furnace-minecart-push-values.patch b/patches/api/0343-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/api/0345-Expose-furnace-minecart-push-values.patch rename to patches/api/0343-Expose-furnace-minecart-push-values.patch diff --git a/patches/api/0346-More-Projectile-API.patch b/patches/api/0344-More-Projectile-API.patch similarity index 100% rename from patches/api/0346-More-Projectile-API.patch rename to patches/api/0344-More-Projectile-API.patch diff --git a/patches/api/0347-Add-getComputedBiome-API.patch b/patches/api/0345-Add-getComputedBiome-API.patch similarity index 100% rename from patches/api/0347-Add-getComputedBiome-API.patch rename to patches/api/0345-Add-getComputedBiome-API.patch diff --git a/patches/api/0348-Add-enchantWithLevels-API.patch b/patches/api/0346-Add-enchantWithLevels-API.patch similarity index 100% rename from patches/api/0348-Add-enchantWithLevels-API.patch rename to patches/api/0346-Add-enchantWithLevels-API.patch diff --git a/patches/api/0349-Add-TameableDeathMessageEvent.patch b/patches/api/0347-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/api/0349-Add-TameableDeathMessageEvent.patch rename to patches/api/0347-Add-TameableDeathMessageEvent.patch diff --git a/patches/api/0350-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0348-Allow-to-change-the-podium-of-the-EnderDragon.patch similarity index 100% rename from patches/api/0350-Allow-to-change-the-podium-of-the-EnderDragon.patch rename to patches/api/0348-Allow-to-change-the-podium-of-the-EnderDragon.patch diff --git a/patches/api/0351-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0349-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch similarity index 100% rename from patches/api/0351-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch rename to patches/api/0349-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch diff --git a/patches/api/0352-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0350-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/api/0352-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/api/0350-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/api/0353-WorldCreator-keepSpawnLoaded.patch b/patches/api/0351-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/api/0353-WorldCreator-keepSpawnLoaded.patch rename to patches/api/0351-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/api/0354-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0352-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/api/0354-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/api/0352-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/api/0355-Add-PlayerStopUsingItemEvent.patch b/patches/api/0353-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/api/0355-Add-PlayerStopUsingItemEvent.patch rename to patches/api/0353-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/api/0356-Expand-FallingBlock-API.patch b/patches/api/0354-Expand-FallingBlock-API.patch similarity index 100% rename from patches/api/0356-Expand-FallingBlock-API.patch rename to patches/api/0354-Expand-FallingBlock-API.patch diff --git a/patches/api/0357-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch similarity index 95% rename from patches/api/0357-Add-method-isTickingWorlds-to-Bukkit.patch rename to patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch index 9627540551..21683de3d2 100644 --- a/patches/api/0357-Add-method-isTickingWorlds-to-Bukkit.patch +++ b/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d56baf72235173121a694e8bb5331f2c515d3aa8..a1d9663730d5a63685d337f5eba40532b47ffbfc 100644 +index 84d43e24a69352e2715935fd7ce3fd05aaca8601..49c027f2c78660594caa51341291b1bcd35b8993 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -808,12 +808,26 @@ public final class Bukkit { +@@ -805,12 +805,26 @@ public final class Bukkit { return server.getWorlds(); } @@ -35,7 +35,7 @@ index d56baf72235173121a694e8bb5331f2c515d3aa8..a1d9663730d5a63685d337f5eba40532 * * @param creator the options to use when creating the world * @return newly created or loaded world -@@ -825,6 +839,9 @@ public final class Bukkit { +@@ -822,6 +836,9 @@ public final class Bukkit { /** * Unloads a world with the given name. @@ -45,7 +45,7 @@ index d56baf72235173121a694e8bb5331f2c515d3aa8..a1d9663730d5a63685d337f5eba40532 * * @param name Name of the world to unload * @param save whether to save the chunks before unloading -@@ -836,6 +853,9 @@ public final class Bukkit { +@@ -833,6 +850,9 @@ public final class Bukkit { /** * Unloads the given world. diff --git a/patches/api/0358-Add-WardenAngerChangeEvent.patch b/patches/api/0356-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/api/0358-Add-WardenAngerChangeEvent.patch rename to patches/api/0356-Add-WardenAngerChangeEvent.patch diff --git a/patches/api/0359-Nameable-Banner-API.patch b/patches/api/0357-Nameable-Banner-API.patch similarity index 100% rename from patches/api/0359-Nameable-Banner-API.patch rename to patches/api/0357-Nameable-Banner-API.patch diff --git a/patches/api/0360-Add-Player-getFishHook.patch b/patches/api/0358-Add-Player-getFishHook.patch similarity index 100% rename from patches/api/0360-Add-Player-getFishHook.patch rename to patches/api/0358-Add-Player-getFishHook.patch diff --git a/patches/api/0361-More-Teleport-API.patch b/patches/api/0359-More-Teleport-API.patch similarity index 100% rename from patches/api/0361-More-Teleport-API.patch rename to patches/api/0359-More-Teleport-API.patch diff --git a/patches/api/0362-Add-EntityPortalReadyEvent.patch b/patches/api/0360-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/api/0362-Add-EntityPortalReadyEvent.patch rename to patches/api/0360-Add-EntityPortalReadyEvent.patch diff --git a/patches/api/0363-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/api/0363-Custom-Chat-Completion-Suggestions-API.patch rename to patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/api/0364-Collision-API.patch b/patches/api/0362-Collision-API.patch similarity index 100% rename from patches/api/0364-Collision-API.patch rename to patches/api/0362-Collision-API.patch diff --git a/patches/api/0365-Block-Ticking-API.patch b/patches/api/0363-Block-Ticking-API.patch similarity index 100% rename from patches/api/0365-Block-Ticking-API.patch rename to patches/api/0363-Block-Ticking-API.patch diff --git a/patches/api/0366-Add-NamespacedKey-biome-methods.patch b/patches/api/0364-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/api/0366-Add-NamespacedKey-biome-methods.patch rename to patches/api/0364-Add-NamespacedKey-biome-methods.patch diff --git a/patches/api/0367-Also-load-resources-from-LibraryLoader.patch b/patches/api/0365-Also-load-resources-from-LibraryLoader.patch similarity index 100% rename from patches/api/0367-Also-load-resources-from-LibraryLoader.patch rename to patches/api/0365-Also-load-resources-from-LibraryLoader.patch diff --git a/patches/api/0368-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0366-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/api/0368-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/api/0366-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/api/0369-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0367-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/api/0369-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/api/0367-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/api/0370-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0368-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch similarity index 100% rename from patches/api/0370-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch rename to patches/api/0368-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch diff --git a/patches/api/0371-Add-getDrops-to-BlockState.patch b/patches/api/0369-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/api/0371-Add-getDrops-to-BlockState.patch rename to patches/api/0369-Add-getDrops-to-BlockState.patch diff --git a/patches/api/0372-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0370-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/api/0372-Add-PlayerInventorySlotChangeEvent.patch rename to patches/api/0370-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/api/0373-Elder-Guardian-appearance-API.patch b/patches/api/0371-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/api/0373-Elder-Guardian-appearance-API.patch rename to patches/api/0371-Elder-Guardian-appearance-API.patch diff --git a/patches/api/0374-Allow-changing-bed-s-occupied-property.patch b/patches/api/0372-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/api/0374-Allow-changing-bed-s-occupied-property.patch rename to patches/api/0372-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/api/0375-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0373-Add-EquipmentSlot-convenience-methods.patch similarity index 100% rename from patches/api/0375-Add-EquipmentSlot-convenience-methods.patch rename to patches/api/0373-Add-EquipmentSlot-convenience-methods.patch diff --git a/patches/api/0376-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch similarity index 100% rename from patches/api/0376-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch rename to patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch diff --git a/patches/api/0377-Add-entity-knockback-API.patch b/patches/api/0375-Add-entity-knockback-API.patch similarity index 100% rename from patches/api/0377-Add-entity-knockback-API.patch rename to patches/api/0375-Add-entity-knockback-API.patch diff --git a/patches/api/0378-Added-EntityToggleSitEvent.patch b/patches/api/0376-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/api/0378-Added-EntityToggleSitEvent.patch rename to patches/api/0376-Added-EntityToggleSitEvent.patch diff --git a/patches/api/0379-Add-Moving-Piston-API.patch b/patches/api/0377-Add-Moving-Piston-API.patch similarity index 100% rename from patches/api/0379-Add-Moving-Piston-API.patch rename to patches/api/0377-Add-Moving-Piston-API.patch diff --git a/patches/api/0380-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0378-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/api/0380-Add-PrePlayerAttackEntityEvent.patch rename to patches/api/0378-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/api/0381-Add-Player-Warden-Warning-API.patch b/patches/api/0379-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/api/0381-Add-Player-Warden-Warning-API.patch rename to patches/api/0379-Add-Player-Warden-Warning-API.patch diff --git a/patches/api/0382-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0380-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/api/0382-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/api/0380-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/api/0383-Add-paper-dumplisteners-command.patch b/patches/api/0381-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/api/0383-Add-paper-dumplisteners-command.patch rename to patches/api/0381-Add-paper-dumplisteners-command.patch diff --git a/patches/api/0384-ItemStack-damage-API.patch b/patches/api/0382-ItemStack-damage-API.patch similarity index 100% rename from patches/api/0384-ItemStack-damage-API.patch rename to patches/api/0382-ItemStack-damage-API.patch diff --git a/patches/api/0385-Add-Tick-TemporalUnit.patch b/patches/api/0383-Add-Tick-TemporalUnit.patch similarity index 100% rename from patches/api/0385-Add-Tick-TemporalUnit.patch rename to patches/api/0383-Add-Tick-TemporalUnit.patch diff --git a/patches/api/0386-Friction-API.patch b/patches/api/0384-Friction-API.patch similarity index 100% rename from patches/api/0386-Friction-API.patch rename to patches/api/0384-Friction-API.patch diff --git a/patches/api/0387-Player-Entity-Tracking-Events.patch b/patches/api/0385-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/api/0387-Player-Entity-Tracking-Events.patch rename to patches/api/0385-Player-Entity-Tracking-Events.patch diff --git a/patches/api/0388-Add-missing-Fluid-type.patch b/patches/api/0386-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0388-Add-missing-Fluid-type.patch rename to patches/api/0386-Add-missing-Fluid-type.patch diff --git a/patches/api/0389-fix-Instruments.patch b/patches/api/0387-fix-Instruments.patch similarity index 100% rename from patches/api/0389-fix-Instruments.patch rename to patches/api/0387-fix-Instruments.patch diff --git a/patches/api/0390-Add-BlockLockCheckEvent.patch b/patches/api/0388-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0390-Add-BlockLockCheckEvent.patch rename to patches/api/0388-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0391-Add-Sneaking-API-for-Entities.patch b/patches/api/0389-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/api/0391-Add-Sneaking-API-for-Entities.patch rename to patches/api/0389-Add-Sneaking-API-for-Entities.patch diff --git a/patches/api/0392-Improve-PortalEvents.patch b/patches/api/0390-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0392-Improve-PortalEvents.patch rename to patches/api/0390-Improve-PortalEvents.patch diff --git a/patches/api/0393-Flying-Fall-Damage-API.patch b/patches/api/0391-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0393-Flying-Fall-Damage-API.patch rename to patches/api/0391-Flying-Fall-Damage-API.patch diff --git a/patches/api/0394-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0392-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0394-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0392-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0395-Win-Screen-API.patch b/patches/api/0393-Win-Screen-API.patch similarity index 100% rename from patches/api/0395-Win-Screen-API.patch rename to patches/api/0393-Win-Screen-API.patch diff --git a/patches/api/0396-Add-Entity-Body-Yaw-API.patch b/patches/api/0394-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0396-Add-Entity-Body-Yaw-API.patch rename to patches/api/0394-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0397-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0395-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0397-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0395-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0398-Add-EntityFertilizeEggEvent.patch b/patches/api/0396-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0398-Add-EntityFertilizeEggEvent.patch rename to patches/api/0396-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0399-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0397-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0399-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0397-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0400-Add-Shearable-API.patch b/patches/api/0398-Add-Shearable-API.patch similarity index 100% rename from patches/api/0400-Add-Shearable-API.patch rename to patches/api/0398-Add-Shearable-API.patch diff --git a/patches/api/0401-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0399-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0401-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0399-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0402-Add-Mob-Experience-reward-API.patch b/patches/api/0400-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0402-Add-Mob-Experience-reward-API.patch rename to patches/api/0400-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0403-Expand-PlayerItemMendEvent.patch b/patches/api/0401-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0403-Expand-PlayerItemMendEvent.patch rename to patches/api/0401-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0404-Add-transient-modifier-API.patch b/patches/api/0402-Add-transient-modifier-API.patch similarity index 100% rename from patches/api/0404-Add-transient-modifier-API.patch rename to patches/api/0402-Add-transient-modifier-API.patch diff --git a/patches/api/0405-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/api/0405-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/api/0406-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/api/0406-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/api/0407-Folia-scheduler-and-owned-region-API.patch b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/api/0407-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0405-Folia-scheduler-and-owned-region-API.patch index cd1049c172..6c159797d3 100644 --- a/patches/api/0407-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch @@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index a1d9663730d5a63685d337f5eba40532b47ffbfc..91476b9e5238caf49492cb23b549c9df6a45ed3e 100644 +index 49c027f2c78660594caa51341291b1bcd35b8993..290d692fccf63c5f109b8a3f1de726a12a20ddc9 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2661,6 +2661,141 @@ public final class Bukkit { +@@ -2658,6 +2658,141 @@ public final class Bukkit { } // Paper end diff --git a/patches/api/0408-Add-event-for-player-editing-sign.patch b/patches/api/0406-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0408-Add-event-for-player-editing-sign.patch rename to patches/api/0406-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0409-Add-Sign-getInteractableSideFor.patch b/patches/api/0407-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0409-Add-Sign-getInteractableSideFor.patch rename to patches/api/0407-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0410-Fix-BanList-API.patch b/patches/api/0408-Fix-BanList-API.patch similarity index 100% rename from patches/api/0410-Fix-BanList-API.patch rename to patches/api/0408-Fix-BanList-API.patch diff --git a/patches/api/0411-Add-whitelist-events.patch b/patches/api/0409-Add-whitelist-events.patch similarity index 100% rename from patches/api/0411-Add-whitelist-events.patch rename to patches/api/0409-Add-whitelist-events.patch diff --git a/patches/api/0412-API-for-updating-recipes-on-clients.patch b/patches/api/0410-API-for-updating-recipes-on-clients.patch similarity index 96% rename from patches/api/0412-API-for-updating-recipes-on-clients.patch rename to patches/api/0410-API-for-updating-recipes-on-clients.patch index 1eb7bb0fc2..d4e528d077 100644 --- a/patches/api/0412-API-for-updating-recipes-on-clients.patch +++ b/patches/api/0410-API-for-updating-recipes-on-clients.patch @@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 91476b9e5238caf49492cb23b549c9df6a45ed3e..d6be967c2fd480547bf9eb3938ca147382f835da 100644 +index 290d692fccf63c5f109b8a3f1de726a12a20ddc9..91405dee7c822bba9ef809f00cbd85db5b569b44 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -992,6 +992,26 @@ public final class Bukkit { +@@ -989,6 +989,26 @@ public final class Bukkit { server.reloadData(); } @@ -35,7 +35,7 @@ index 91476b9e5238caf49492cb23b549c9df6a45ed3e..d6be967c2fd480547bf9eb3938ca1473 /** * Returns the primary logger associated with this server instance. * -@@ -1052,6 +1072,20 @@ public final class Bukkit { +@@ -1049,6 +1069,20 @@ public final class Bukkit { return server.addRecipe(recipe); } @@ -56,7 +56,7 @@ index 91476b9e5238caf49492cb23b549c9df6a45ed3e..d6be967c2fd480547bf9eb3938ca1473 /** * Get a list of all recipes for a given item. The stack size is ignored * in comparisons. If the durability is -1, it will match any data value. -@@ -1243,6 +1277,24 @@ public final class Bukkit { +@@ -1240,6 +1274,24 @@ public final class Bukkit { return server.removeRecipe(key); } diff --git a/patches/api/0413-Add-PlayerFailMoveEvent.patch b/patches/api/0411-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0413-Add-PlayerFailMoveEvent.patch rename to patches/api/0411-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0414-Fix-custom-statistic-criteria-creation.patch b/patches/api/0412-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0414-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0412-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0415-SculkCatalyst-bloom-API.patch b/patches/api/0413-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0415-SculkCatalyst-bloom-API.patch rename to patches/api/0413-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0416-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0414-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0416-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0414-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0417-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 97% rename from patches/api/0417-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch index b9b94d0f4b..69d5af26d8 100644 --- a/patches/api/0417-Deprecate-and-replace-methods-with-old-StructureType.patch +++ b/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index d6be967c2fd480547bf9eb3938ca147382f835da..81203ad1460f3b64413a8426fb58a051b7d78f03 100644 +index 91405dee7c822bba9ef809f00cbd85db5b569b44..2726ee0338cbcf4233588d0eb7dcce3b0c571908 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -937,9 +937,6 @@ public final class Bukkit { +@@ -934,9 +934,6 @@ public final class Bukkit { /** * Create a new explorer map targeting the closest nearby structure of a * given {@link StructureType}. @@ -18,7 +18,7 @@ index d6be967c2fd480547bf9eb3938ca147382f835da..81203ad1460f3b64413a8426fb58a051 * * @param world the world the map will belong to * @param location the origin location to find the nearest structure -@@ -948,7 +945,9 @@ public final class Bukkit { +@@ -945,7 +942,9 @@ public final class Bukkit { * * @see World#locateNearestStructure(org.bukkit.Location, * org.bukkit.StructureType, int, boolean) @@ -28,7 +28,7 @@ index d6be967c2fd480547bf9eb3938ca147382f835da..81203ad1460f3b64413a8426fb58a051 @NotNull public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) { return server.createExplorerMap(world, location, structureType); -@@ -971,11 +970,54 @@ public final class Bukkit { +@@ -968,11 +967,54 @@ public final class Bukkit { * * @see World#locateNearestStructure(org.bukkit.Location, * org.bukkit.StructureType, int, boolean) diff --git a/patches/api/0418-Add-Listing-API-for-Player.patch b/patches/api/0416-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0418-Add-Listing-API-for-Player.patch rename to patches/api/0416-Add-Listing-API-for-Player.patch diff --git a/patches/api/0419-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0417-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0419-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0417-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0420-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0418-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0420-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0418-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0421-Expand-Pose-API.patch b/patches/api/0419-Expand-Pose-API.patch similarity index 100% rename from patches/api/0421-Expand-Pose-API.patch rename to patches/api/0419-Expand-Pose-API.patch diff --git a/patches/api/0422-MerchantRecipe-add-copy-constructor.patch b/patches/api/0420-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0422-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0420-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0423-More-DragonBattle-API.patch b/patches/api/0421-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0423-More-DragonBattle-API.patch rename to patches/api/0421-More-DragonBattle-API.patch diff --git a/patches/api/0424-Add-PlayerPickItemEvent.patch b/patches/api/0422-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0424-Add-PlayerPickItemEvent.patch rename to patches/api/0422-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0425-Allow-trident-custom-damage.patch b/patches/api/0423-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0425-Allow-trident-custom-damage.patch rename to patches/api/0423-Allow-trident-custom-damage.patch diff --git a/patches/api/0426-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0424-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0426-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0424-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0427-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0425-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0427-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0425-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0428-Add-OfflinePlayer-isConnected.patch b/patches/api/0426-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0428-Add-OfflinePlayer-isConnected.patch rename to patches/api/0426-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0429-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0427-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0429-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0427-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0430-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0428-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0430-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0428-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0431-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0429-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0431-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0429-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0432-Add-player-idle-duration-API.patch b/patches/api/0430-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0432-Add-player-idle-duration-API.patch rename to patches/api/0430-Add-player-idle-duration-API.patch diff --git a/patches/api/0433-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0431-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0433-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0431-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0434-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0432-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0434-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0432-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0435-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0433-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0435-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0433-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0436-Add-UUID-attribute-modifier-API.patch b/patches/api/0434-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0436-Add-UUID-attribute-modifier-API.patch rename to patches/api/0434-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0437-Expand-LingeringPotion-API.patch b/patches/api/0435-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0437-Expand-LingeringPotion-API.patch rename to patches/api/0435-Expand-LingeringPotion-API.patch diff --git a/patches/api/0438-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0436-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0438-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0436-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0439-Add-Structure-check-API.patch b/patches/api/0437-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0439-Add-Structure-check-API.patch rename to patches/api/0437-Add-Structure-check-API.patch diff --git a/patches/api/0440-add-missing-Experimental-annotations.patch b/patches/api/0438-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0440-add-missing-Experimental-annotations.patch rename to patches/api/0438-add-missing-Experimental-annotations.patch diff --git a/patches/api/0441-Add-more-scoreboard-API.patch b/patches/api/0439-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0441-Add-more-scoreboard-API.patch rename to patches/api/0439-Add-more-scoreboard-API.patch diff --git a/patches/api/0442-Improve-Registry.patch b/patches/api/0440-Improve-Registry.patch similarity index 100% rename from patches/api/0442-Improve-Registry.patch rename to patches/api/0440-Improve-Registry.patch diff --git a/patches/api/0443-Add-experience-points-API.patch b/patches/api/0441-Add-experience-points-API.patch similarity index 100% rename from patches/api/0443-Add-experience-points-API.patch rename to patches/api/0441-Add-experience-points-API.patch diff --git a/patches/api/0444-Add-missing-InventoryType.patch b/patches/api/0442-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0444-Add-missing-InventoryType.patch rename to patches/api/0442-Add-missing-InventoryType.patch diff --git a/patches/api/0445-Add-drops-to-shear-events.patch b/patches/api/0443-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0445-Add-drops-to-shear-events.patch rename to patches/api/0443-Add-drops-to-shear-events.patch diff --git a/patches/api/0446-Add-HiddenPotionEffect-API.patch b/patches/api/0444-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/api/0446-Add-HiddenPotionEffect-API.patch rename to patches/api/0444-Add-HiddenPotionEffect-API.patch diff --git a/patches/api/0447-Add-PlayerShieldDisableEvent.patch b/patches/api/0445-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0447-Add-PlayerShieldDisableEvent.patch rename to patches/api/0445-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0448-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0446-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0448-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0446-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0449-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0447-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0449-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0447-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0450-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0448-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0450-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0448-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0451-Add-ShulkerDuplicateEvent.patch b/patches/api/0449-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0451-Add-ShulkerDuplicateEvent.patch rename to patches/api/0449-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0452-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0450-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0452-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0450-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0453-Add-Lifecycle-Event-system.patch b/patches/api/0451-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0453-Add-Lifecycle-Event-system.patch rename to patches/api/0451-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0454-ItemStack-Tooltip-API.patch b/patches/api/0452-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0454-ItemStack-Tooltip-API.patch rename to patches/api/0452-ItemStack-Tooltip-API.patch diff --git a/patches/api/0455-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0453-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0455-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0453-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0456-Add-FluidState-API.patch b/patches/api/0454-Add-FluidState-API.patch similarity index 100% rename from patches/api/0456-Add-FluidState-API.patch rename to patches/api/0454-Add-FluidState-API.patch diff --git a/patches/api/0457-add-number-format-api.patch b/patches/api/0455-add-number-format-api.patch similarity index 100% rename from patches/api/0457-add-number-format-api.patch rename to patches/api/0455-add-number-format-api.patch diff --git a/patches/api/0458-improve-BanList-types.patch b/patches/api/0456-improve-BanList-types.patch similarity index 97% rename from patches/api/0458-improve-BanList-types.patch rename to patches/api/0456-improve-BanList-types.patch index cee321426a..18c627689d 100644 --- a/patches/api/0458-improve-BanList-types.patch +++ b/patches/api/0456-improve-BanList-types.patch @@ -68,10 +68,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..0e0baadde9e34d28db56dc68e66aaf66 /** * Banned player names diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 81203ad1460f3b64413a8426fb58a051b7d78f03..5d1b55fdbcbe63f6b42b694d05211a3cc691a09d 100644 +index 2726ee0338cbcf4233588d0eb7dcce3b0c571908..71f1c361ebccbe83193c37ec3a90faa4085001c3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1651,11 +1651,27 @@ public final class Bukkit { +@@ -1648,11 +1648,27 @@ public final class Bukkit { * @param The ban target * * @return a ban list of the specified type diff --git a/patches/api/0459-Suspicious-Effect-Entry-API.patch b/patches/api/0457-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0459-Suspicious-Effect-Entry-API.patch rename to patches/api/0457-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0460-Fix-DamageSource-API.patch b/patches/api/0458-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0460-Fix-DamageSource-API.patch rename to patches/api/0458-Fix-DamageSource-API.patch diff --git a/patches/api/0461-Expanded-Hopper-API.patch b/patches/api/0459-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0461-Expanded-Hopper-API.patch rename to patches/api/0459-Expanded-Hopper-API.patch diff --git a/patches/api/0462-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0460-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0462-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0460-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0463-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0461-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/api/0463-Add-BlockBreakProgressUpdateEvent.patch rename to patches/api/0461-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/api/0464-Deprecate-ItemStack-setType.patch b/patches/api/0462-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/api/0464-Deprecate-ItemStack-setType.patch rename to patches/api/0462-Deprecate-ItemStack-setType.patch diff --git a/patches/api/0465-Item-Mutation-Fixes.patch b/patches/api/0463-Item-Mutation-Fixes.patch similarity index 100% rename from patches/api/0465-Item-Mutation-Fixes.patch rename to patches/api/0463-Item-Mutation-Fixes.patch diff --git a/patches/api/0466-API-for-checking-sent-chunks.patch b/patches/api/0464-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/api/0466-API-for-checking-sent-chunks.patch rename to patches/api/0464-API-for-checking-sent-chunks.patch diff --git a/patches/api/0467-Add-CartographyItemEvent.patch b/patches/api/0465-Add-CartographyItemEvent.patch similarity index 100% rename from patches/api/0467-Add-CartographyItemEvent.patch rename to patches/api/0465-Add-CartographyItemEvent.patch diff --git a/patches/api/0468-More-Raid-API.patch b/patches/api/0466-More-Raid-API.patch similarity index 100% rename from patches/api/0468-More-Raid-API.patch rename to patches/api/0466-More-Raid-API.patch diff --git a/patches/api/0469-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0467-Fix-SpawnerEntry-Equipment-API.patch similarity index 100% rename from patches/api/0469-Fix-SpawnerEntry-Equipment-API.patch rename to patches/api/0467-Fix-SpawnerEntry-Equipment-API.patch diff --git a/patches/api/0470-Fix-ItemFlags.patch b/patches/api/0468-Fix-ItemFlags.patch similarity index 100% rename from patches/api/0470-Fix-ItemFlags.patch rename to patches/api/0468-Fix-ItemFlags.patch diff --git a/patches/api/0471-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0469-Allow-modifying-library-loader-jars-bytecode.patch similarity index 100% rename from patches/api/0471-Allow-modifying-library-loader-jars-bytecode.patch rename to patches/api/0469-Allow-modifying-library-loader-jars-bytecode.patch diff --git a/patches/api/0472-Add-hook-to-remap-library-jars.patch b/patches/api/0470-Add-hook-to-remap-library-jars.patch similarity index 100% rename from patches/api/0472-Add-hook-to-remap-library-jars.patch rename to patches/api/0470-Add-hook-to-remap-library-jars.patch diff --git a/patches/api/0473-Add-GameMode-isInvulnerable.patch b/patches/api/0471-Add-GameMode-isInvulnerable.patch similarity index 100% rename from patches/api/0473-Add-GameMode-isInvulnerable.patch rename to patches/api/0471-Add-GameMode-isInvulnerable.patch diff --git a/patches/api/0474-Expose-hasColor-to-leather-armor.patch b/patches/api/0472-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/api/0474-Expose-hasColor-to-leather-armor.patch rename to patches/api/0472-Expose-hasColor-to-leather-armor.patch diff --git a/patches/api/0475-Add-missing-wind-charge-damage-type.patch b/patches/api/0473-Add-missing-wind-charge-damage-type.patch similarity index 100% rename from patches/api/0475-Add-missing-wind-charge-damage-type.patch rename to patches/api/0473-Add-missing-wind-charge-damage-type.patch diff --git a/patches/api/0476-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/api/0476-Added-API-to-get-player-ha-proxy-address.patch rename to patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/api/0477-More-Chest-Block-API.patch b/patches/api/0475-More-Chest-Block-API.patch similarity index 100% rename from patches/api/0477-More-Chest-Block-API.patch rename to patches/api/0475-More-Chest-Block-API.patch diff --git a/patches/api/0478-Brigadier-based-command-API.patch b/patches/api/0476-Brigadier-based-command-API.patch similarity index 100% rename from patches/api/0478-Brigadier-based-command-API.patch rename to patches/api/0476-Brigadier-based-command-API.patch diff --git a/patches/api/0479-Improve-Recipe-validation.patch b/patches/api/0477-Improve-Recipe-validation.patch similarity index 100% rename from patches/api/0479-Improve-Recipe-validation.patch rename to patches/api/0477-Improve-Recipe-validation.patch diff --git a/patches/server/0034-Expose-server-build-information.patch b/patches/server/0034-Expose-server-build-information.patch new file mode 100644 index 0000000000..44620f57a0 --- /dev/null +++ b/patches/server/0034-Expose-server-build-information.patch @@ -0,0 +1,702 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Tue, 1 Mar 2016 14:32:43 -0600 +Subject: [PATCH] Expose server build information + +Co-authored-by: Zach Brown +Co-authored-by: Kyle Wood +Co-authored-by: Mark Vainomaa +Co-authored-by: Riley Park +Co-authored-by: Jake Potrebic +Co-authored-by: masmc05 + +diff --git a/build.gradle.kts b/build.gradle.kts +index 158779a3590f089c4224b2b128c2e653aef42a94..2caa4c8e250a7925e7d6f9ba00a95956b5328568 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -1,4 +1,5 @@ + import io.papermc.paperweight.util.* ++import java.time.Instant + + plugins { + java +@@ -64,18 +65,24 @@ tasks.jar { + + manifest { + val git = Git(rootProject.layout.projectDirectory.path) ++ val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() ++ val build = System.getenv("BUILD_NUMBER") ?: null + val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() +- val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\"" ++ val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash" + val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper + val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper + attributes( + "Main-Class" to "org.bukkit.craftbukkit.Main", +- "Implementation-Title" to "CraftBukkit", +- "Implementation-Version" to "git-Paper-$implementationVersion", ++ "Implementation-Title" to "Paper", ++ "Implementation-Version" to implementationVersion, + "Implementation-Vendor" to date, // Paper +- "Specification-Title" to "Bukkit", ++ "Specification-Title" to "Paper", + "Specification-Version" to project.version, +- "Specification-Vendor" to "Bukkit Team", ++ "Specification-Vendor" to "Paper Team", ++ "Brand-Id" to "papermc:paper", ++ "Brand-Name" to "Paper", ++ "Build-Number" to (build ?: ""), ++ "Build-Time" to Instant.now().toString(), + "Git-Branch" to gitBranch, // Paper + "Git-Commit" to gitHash, // Paper + "CraftBukkit-Package-Version" to paperweight.craftBukkitPackageVersion.get(), // Paper +diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +new file mode 100644 +index 0000000000000000000000000000000000000000..532306cacd52579cdf37e4aca25887b1ed3ba6a1 +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +@@ -0,0 +1,146 @@ ++package com.destroystokyo.paper; ++ ++import com.destroystokyo.paper.util.VersionFetcher; ++import com.google.common.base.Charsets; ++import com.google.common.io.Resources; ++import com.google.gson.Gson; ++import com.google.gson.JsonArray; ++import com.google.gson.JsonElement; ++import com.google.gson.JsonObject; ++import com.google.gson.JsonSyntaxException; ++import com.mojang.logging.LogUtils; ++import io.papermc.paper.ServerBuildInfo; ++import java.io.BufferedReader; ++import java.io.IOException; ++import java.io.InputStreamReader; ++import java.net.HttpURLConnection; ++import java.net.URI; ++import java.util.Optional; ++import java.util.OptionalInt; ++import java.util.stream.StreamSupport; ++import net.kyori.adventure.text.Component; ++import net.kyori.adventure.text.event.ClickEvent; ++import net.kyori.adventure.text.format.NamedTextColor; ++import net.kyori.adventure.text.format.TextDecoration; ++import org.checkerframework.checker.nullness.qual.NonNull; ++import org.checkerframework.checker.nullness.qual.Nullable; ++import org.checkerframework.framework.qual.DefaultQualifier; ++import org.slf4j.Logger; ++ ++import static net.kyori.adventure.text.Component.text; ++import static net.kyori.adventure.text.format.TextColor.color; ++ ++@DefaultQualifier(NonNull.class) ++public class PaperVersionFetcher implements VersionFetcher { ++ private static final Logger LOGGER = LogUtils.getClassLogger(); ++ private static final int DISTANCE_ERROR = -1; ++ private static final int DISTANCE_UNKNOWN = -2; ++ private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper"; ++ ++ @Override ++ public long getCacheTime() { ++ return 720000; ++ } ++ ++ @Override ++ public Component getVersionMessage(final String serverVersion) { ++ final Component updateMessage; ++ final ServerBuildInfo build = ServerBuildInfo.buildInfo(); ++ if (build.buildNumber().isEmpty() && build.gitCommit().isEmpty()) { ++ updateMessage = text("You are running a development version without access to version information", color(0xFF5300)); ++ } else { ++ updateMessage = getUpdateStatusMessage("PaperMC/Paper", build); ++ } ++ final @Nullable Component history = this.getHistory(); ++ ++ return history != null ? Component.textOfChildren(updateMessage, Component.newline(), history) : updateMessage; ++ } ++ ++ private static Component getUpdateStatusMessage(final String repo, final ServerBuildInfo build) { ++ int distance = DISTANCE_ERROR; ++ ++ final OptionalInt buildNumber = build.buildNumber(); ++ if (buildNumber.isPresent()) { ++ distance = fetchDistanceFromSiteApi(build, buildNumber.getAsInt()); ++ } else { ++ final Optional gitBranch = build.gitBranch(); ++ final Optional gitCommit = build.gitCommit(); ++ if (gitBranch.isPresent() && gitCommit.isPresent()) { ++ distance = fetchDistanceFromGitHub(repo, gitBranch.get(), gitCommit.get()); ++ } ++ } ++ ++ return switch (distance) { ++ case DISTANCE_ERROR -> text("Error obtaining version information", NamedTextColor.YELLOW); ++ case 0 -> text("You are running the latest version", NamedTextColor.GREEN); ++ case DISTANCE_UNKNOWN -> text("Unknown version", NamedTextColor.YELLOW); ++ default -> text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW) ++ .append(Component.newline()) ++ .append(text("Download the new version at: ") ++ .append(text(DOWNLOAD_PAGE, NamedTextColor.GOLD) ++ .hoverEvent(text("Click to open", NamedTextColor.WHITE)) ++ .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE)))); ++ }; ++ } ++ ++ private static int fetchDistanceFromSiteApi(final ServerBuildInfo build, final int jenkinsBuild) { ++ try { ++ try (final BufferedReader reader = Resources.asCharSource( ++ URI.create("https://api.papermc.io/v2/projects/paper/versions/" + build.minecraftVersionId()).toURL(), ++ Charsets.UTF_8 ++ ).openBufferedStream()) { ++ final JsonObject json = new Gson().fromJson(reader, JsonObject.class); ++ final JsonArray builds = json.getAsJsonArray("builds"); ++ final int latest = StreamSupport.stream(builds.spliterator(), false) ++ .mapToInt(JsonElement::getAsInt) ++ .max() ++ .orElseThrow(); ++ return latest - jenkinsBuild; ++ } catch (final JsonSyntaxException ex) { ++ LOGGER.error("Error parsing json from Paper's downloads API", ex); ++ return DISTANCE_ERROR; ++ } ++ } catch (final IOException e) { ++ LOGGER.error("Error while parsing version", e); ++ return DISTANCE_ERROR; ++ } ++ } ++ ++ // Contributed by Techcable in GH-65 ++ private static int fetchDistanceFromGitHub(final String repo, final String branch, final String hash) { ++ try { ++ final HttpURLConnection connection = (HttpURLConnection) URI.create("https://api.github.com/repos/%s/compare/%s...%s".formatted(repo, branch, hash)).toURL().openConnection(); ++ connection.connect(); ++ if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return DISTANCE_UNKNOWN; // Unknown commit ++ try (final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) { ++ final JsonObject obj = new Gson().fromJson(reader, JsonObject.class); ++ final String status = obj.get("status").getAsString(); ++ return switch (status) { ++ case "identical" -> 0; ++ case "behind" -> obj.get("behind_by").getAsInt(); ++ default -> DISTANCE_ERROR; ++ }; ++ } catch (final JsonSyntaxException | NumberFormatException e) { ++ LOGGER.error("Error parsing json from GitHub's API", e); ++ return DISTANCE_ERROR; ++ } ++ } catch (final IOException e) { ++ LOGGER.error("Error while parsing version", e); ++ return DISTANCE_ERROR; ++ } ++ } ++ ++ private @Nullable Component getHistory() { ++ final VersionHistoryManager.@Nullable VersionData data = VersionHistoryManager.INSTANCE.getVersionData(); ++ if (data == null) { ++ return null; ++ } ++ ++ final @Nullable String oldVersion = data.getOldVersion(); ++ if (oldVersion == null) { ++ return null; ++ } ++ ++ return text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC); ++ } ++} +diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java +new file mode 100644 +index 0000000000000000000000000000000000000000..660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f +--- /dev/null ++++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java +@@ -0,0 +1,153 @@ ++package com.destroystokyo.paper; ++ ++import com.google.common.base.MoreObjects; ++import com.google.gson.Gson; ++import com.google.gson.JsonSyntaxException; ++import java.io.BufferedReader; ++import java.io.BufferedWriter; ++import java.io.IOException; ++import java.nio.charset.StandardCharsets; ++import java.nio.file.Files; ++import java.nio.file.Path; ++import java.nio.file.Paths; ++import java.nio.file.StandardOpenOption; ++import java.util.Objects; ++import java.util.logging.Level; ++import java.util.logging.Logger; ++import org.bukkit.Bukkit; ++ ++import javax.annotation.Nonnull; ++import javax.annotation.Nullable; ++ ++public enum VersionHistoryManager { ++ INSTANCE; ++ ++ private final Gson gson = new Gson(); ++ ++ private final Logger logger = Bukkit.getLogger(); ++ ++ private VersionData currentData = null; ++ ++ VersionHistoryManager() { ++ final Path path = Paths.get("version_history.json"); ++ ++ if (Files.exists(path)) { ++ // Basic file santiy checks ++ if (!Files.isRegularFile(path)) { ++ if (Files.isDirectory(path)) { ++ logger.severe(path + " is a directory, cannot be used for version history"); ++ } else { ++ logger.severe(path + " is not a regular file, cannot be used for version history"); ++ } ++ // We can't continue ++ return; ++ } ++ ++ try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) { ++ currentData = gson.fromJson(reader, VersionData.class); ++ } catch (final IOException e) { ++ logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e); ++ return; ++ } catch (final JsonSyntaxException e) { ++ logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e); ++ return; ++ } ++ ++ final String version = Bukkit.getVersion(); ++ if (version == null) { ++ logger.severe("Failed to retrieve current version"); ++ return; ++ } ++ ++ if (currentData == null) { ++ // Empty file ++ currentData = new VersionData(); ++ currentData.setCurrentVersion(version); ++ writeFile(path); ++ return; ++ } ++ ++ if (!version.equals(currentData.getCurrentVersion())) { ++ // The version appears to have changed ++ currentData.setOldVersion(currentData.getCurrentVersion()); ++ currentData.setCurrentVersion(version); ++ writeFile(path); ++ } ++ } else { ++ // File doesn't exist, start fresh ++ currentData = new VersionData(); ++ // oldVersion is null ++ currentData.setCurrentVersion(Bukkit.getVersion()); ++ writeFile(path); ++ } ++ } ++ ++ private void writeFile(@Nonnull final Path path) { ++ try (final BufferedWriter writer = Files.newBufferedWriter( ++ path, ++ StandardCharsets.UTF_8, ++ StandardOpenOption.WRITE, ++ StandardOpenOption.CREATE, ++ StandardOpenOption.TRUNCATE_EXISTING ++ )) { ++ gson.toJson(currentData, writer); ++ } catch (final IOException e) { ++ logger.log(Level.SEVERE, "Failed to write to version history file", e); ++ } ++ } ++ ++ @Nullable ++ public VersionData getVersionData() { ++ return currentData; ++ } ++ ++ public static class VersionData { ++ private String oldVersion; ++ ++ private String currentVersion; ++ ++ @Nullable ++ public String getOldVersion() { ++ return oldVersion; ++ } ++ ++ public void setOldVersion(@Nullable String oldVersion) { ++ this.oldVersion = oldVersion; ++ } ++ ++ @Nullable ++ public String getCurrentVersion() { ++ return currentVersion; ++ } ++ ++ public void setCurrentVersion(@Nullable String currentVersion) { ++ this.currentVersion = currentVersion; ++ } ++ ++ @Override ++ public String toString() { ++ return MoreObjects.toStringHelper(this) ++ .add("oldVersion", oldVersion) ++ .add("currentVersion", currentVersion) ++ .toString(); ++ } ++ ++ @Override ++ public boolean equals(@Nullable Object o) { ++ if (this == o) { ++ return true; ++ } ++ if (o == null || getClass() != o.getClass()) { ++ return false; ++ } ++ final VersionData versionData = (VersionData) o; ++ return Objects.equals(oldVersion, versionData.oldVersion) && ++ Objects.equals(currentVersion, versionData.currentVersion); ++ } ++ ++ @Override ++ public int hashCode() { ++ return Objects.hash(oldVersion, currentVersion); ++ } ++ } ++} +diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +new file mode 100644 +index 0000000000000000000000000000000000000000..790bad0494454ca12ee152e3de6da3da634d9b20 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java +@@ -0,0 +1,104 @@ ++package io.papermc.paper; ++ ++import com.google.common.base.Strings; ++import io.papermc.paper.util.JarManifests; ++import java.time.Instant; ++import java.time.temporal.ChronoUnit; ++import java.util.Optional; ++import java.util.OptionalInt; ++import java.util.jar.Manifest; ++import net.kyori.adventure.key.Key; ++import net.minecraft.SharedConstants; ++import org.bukkit.craftbukkit.CraftServer; ++import org.bukkit.craftbukkit.Main; ++import org.jetbrains.annotations.NotNull; ++ ++public record ServerBuildInfoImpl( ++ Key brandId, ++ String brandName, ++ String minecraftVersionId, ++ String minecraftVersionName, ++ OptionalInt buildNumber, ++ Instant buildTime, ++ Optional gitBranch, ++ Optional gitCommit ++) implements ServerBuildInfo { ++ private static final String ATTRIBUTE_BRAND_ID = "Brand-Id"; ++ private static final String ATTRIBUTE_BRAND_NAME = "Brand-Name"; ++ private static final String ATTRIBUTE_BUILD_TIME = "Build-Time"; ++ private static final String ATTRIBUTE_BUILD_NUMBER = "Build-Number"; ++ private static final String ATTRIBUTE_GIT_BRANCH = "Git-Branch"; ++ private static final String ATTRIBUTE_GIT_COMMIT = "Git-Commit"; ++ ++ private static final String BRAND_PAPER_NAME = "Paper"; ++ ++ private static final String BUILD_DEV = "DEV"; ++ ++ public ServerBuildInfoImpl() { ++ this(JarManifests.manifest(CraftServer.class)); ++ } ++ ++ private ServerBuildInfoImpl(final Manifest manifest) { ++ this( ++ getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID) ++ .map(Key::key) ++ .orElse(BRAND_PAPER_ID), ++ getManifestAttribute(manifest, ATTRIBUTE_BRAND_NAME) ++ .orElse(BRAND_PAPER_NAME), ++ SharedConstants.getCurrentVersion().getId(), ++ SharedConstants.getCurrentVersion().getName(), ++ getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER) ++ .map(Integer::parseInt) ++ .map(OptionalInt::of) ++ .orElse(OptionalInt.empty()), ++ getManifestAttribute(manifest, ATTRIBUTE_BUILD_TIME) ++ .map(Instant::parse) ++ .orElse(Main.BOOT_TIME), ++ getManifestAttribute(manifest, ATTRIBUTE_GIT_BRANCH), ++ getManifestAttribute(manifest, ATTRIBUTE_GIT_COMMIT) ++ ); ++ } ++ ++ @Override ++ public boolean isBrandCompatible(final @NotNull Key brandId) { ++ return brandId.equals(this.brandId); ++ } ++ ++ @Override ++ public @NotNull String asString(final @NotNull StringRepresentation representation) { ++ final StringBuilder sb = new StringBuilder(); ++ sb.append(this.minecraftVersionId); ++ sb.append('-'); ++ if (this.buildNumber.isPresent()) { ++ sb.append(this.buildNumber.getAsInt()); ++ } else { ++ sb.append(BUILD_DEV); ++ } ++ final boolean hasGitBranch = this.gitBranch.isPresent(); ++ final boolean hasGitCommit = this.gitCommit.isPresent(); ++ if (hasGitBranch || hasGitCommit) { ++ sb.append('-'); ++ } ++ if (hasGitBranch && representation == StringRepresentation.VERSION_FULL) { ++ sb.append(this.gitBranch.get()); ++ if (hasGitCommit) { ++ sb.append('@'); ++ } ++ } ++ if (hasGitCommit) { ++ sb.append(this.gitCommit.get()); ++ } ++ if (representation == StringRepresentation.VERSION_FULL) { ++ sb.append(' '); ++ sb.append('('); ++ sb.append(this.buildTime.truncatedTo(ChronoUnit.SECONDS)); ++ sb.append(')'); ++ } ++ return sb.toString(); ++ } ++ ++ private static Optional getManifestAttribute(final Manifest manifest, final String name) { ++ final String value = manifest != null ? manifest.getMainAttributes().getValue(name) : null; ++ return Optional.ofNullable(Strings.emptyToNull(value)); ++ } ++} +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index dee319882d7d51a0e03e0f5f31ab6312048e189d..80a20dce63658842a0fa04004b8eaa8af7685fb4 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -43,7 +43,6 @@ import java.util.Set; + import java.util.UUID; + import java.util.concurrent.CompletableFuture; + import java.util.concurrent.Executor; +-import java.util.concurrent.RejectedExecutionException; + import java.util.concurrent.atomic.AtomicReference; + import java.util.function.BooleanSupplier; + import java.util.function.Consumer; +@@ -185,8 +184,6 @@ import net.minecraft.world.phys.Vec2; + import net.minecraft.world.phys.Vec3; + import org.bukkit.Bukkit; + import org.bukkit.craftbukkit.CraftRegistry; +-import org.bukkit.craftbukkit.CraftServer; +-import org.bukkit.craftbukkit.Main; + import org.bukkit.event.server.ServerLoadEvent; + // CraftBukkit end + +@@ -1680,7 +1677,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // CraftBukkit - cb > vanilla! ++ return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper + } + + public SystemReport fillSystemReport(SystemReport details) { +diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +index bbe2fabc9251838f232480a04f0a2cf2b49f2812..a6126515e497cb0769bdc96881389026196bbbae 100644 +--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java ++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +@@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + // Paper end - initialize global and world-defaults configuration + io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command + com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics ++ com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now + + this.setPvpAllowed(dedicatedserverproperties.pvp); + this.setFlightAllowed(dedicatedserverproperties.allowFlight); +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java +index f077b8ff0bf0d96628db3569132696b68fd79921..5f11f5b16766f9d1d5640ae037e259bed9020384 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftCrashReport.java +@@ -18,8 +18,10 @@ public class CraftCrashReport implements Supplier { + + @Override + public String get() { ++ final io.papermc.paper.ServerBuildInfo build = io.papermc.paper.ServerBuildInfo.buildInfo(); // Paper + StringWriter value = new StringWriter(); + try { ++ value.append("\n BrandInfo: ").append(String.format("%s (%s) version %s", build.brandName(), build.brandId(), build.asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_FULL))); // Paper + value.append("\n Running: ").append(Bukkit.getName()).append(" version ").append(Bukkit.getVersion()).append(" (Implementing API version ").append(Bukkit.getBukkitVersion()).append(") ").append(String.valueOf(MinecraftServer.getServer().usesAuthentication())); + value.append("\n Plugins: {"); + for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) { +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index b32ae5b9c232e5d9b3bd89303db3d2cc6258ea29..4d31fb8bc8bf285720a9d5828325d7124cf41c6e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -10,8 +10,6 @@ import com.google.common.collect.MapMaker; + import com.mojang.authlib.GameProfile; + import com.mojang.brigadier.StringReader; + import com.mojang.brigadier.exceptions.CommandSyntaxException; +-import com.mojang.brigadier.tree.CommandNode; +-import com.mojang.brigadier.tree.LiteralCommandNode; + import com.mojang.serialization.Dynamic; + import com.mojang.serialization.Lifecycle; + import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +@@ -26,7 +24,6 @@ import java.net.InetAddress; + import java.util.ArrayList; + import java.util.Collections; + import java.util.Date; +-import java.util.HashMap; + import java.util.HashSet; + import java.util.Iterator; + import java.util.LinkedHashMap; +@@ -153,7 +150,6 @@ import org.bukkit.craftbukkit.ban.CraftProfileBanList; + import org.bukkit.craftbukkit.block.data.CraftBlockData; + import org.bukkit.craftbukkit.boss.CraftBossBar; + import org.bukkit.craftbukkit.boss.CraftKeyedBossbar; +-import org.bukkit.craftbukkit.command.BukkitCommandWrapper; + import org.bukkit.craftbukkit.command.CraftCommandMap; + import org.bukkit.craftbukkit.command.VanillaCommandWrapper; + import org.bukkit.craftbukkit.entity.CraftEntityFactory; +@@ -249,7 +245,6 @@ import org.bukkit.plugin.PluginManager; + import org.bukkit.plugin.ServicesManager; + import org.bukkit.plugin.SimplePluginManager; + import org.bukkit.plugin.SimpleServicesManager; +-import org.bukkit.plugin.java.JavaPluginLoader; + import org.bukkit.plugin.messaging.Messenger; + import org.bukkit.plugin.messaging.StandardMessenger; + import org.bukkit.profile.PlayerProfile; +@@ -266,7 +261,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; + import net.md_5.bungee.api.chat.BaseComponent; // Spigot + + public final class CraftServer implements Server { +- private final String serverName = "CraftBukkit"; ++ private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper + private final String serverVersion; + private final String bukkitVersion = Versioning.getBukkitVersion(); + private final Logger logger = Logger.getLogger("Minecraft"); +@@ -320,7 +315,7 @@ public final class CraftServer implements Server { + return player.getBukkitEntity(); + } + })); +- this.serverVersion = CraftServer.class.getPackage().getImplementationVersion(); ++ this.serverVersion = io.papermc.paper.ServerBuildInfo.buildInfo().asString(io.papermc.paper.ServerBuildInfo.StringRepresentation.VERSION_SIMPLE); // Paper - improve version + this.structureManager = new CraftStructureManager(console.getStructureManager(), console.registryAccess()); + this.dataPackManager = new CraftDataPackManager(this.getServer().getPackRepository()); + this.serverTickManager = new CraftServerTickManager(console.tickRateManager()); +@@ -573,6 +568,13 @@ public final class CraftServer implements Server { + return this.bukkitVersion; + } + ++ // Paper start - expose game version ++ @Override ++ public String getMinecraftVersion() { ++ return console.getServerVersion(); ++ } ++ // Paper end ++ + @Override + public List getOnlinePlayers() { + return this.playerView; +diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java +index bc664b090e16ed27ba795c204dc5639679e6eee8..9dc72b01092783c436bc1fa8ce29ff7cdaa39b19 100644 +--- a/src/main/java/org/bukkit/craftbukkit/Main.java ++++ b/src/main/java/org/bukkit/craftbukkit/Main.java +@@ -15,6 +15,7 @@ import joptsimple.OptionSet; + import joptsimple.util.PathConverter; + + public class Main { ++ public static final java.time.Instant BOOT_TIME = java.time.Instant.now(); // Paper - track initial start time + public static boolean useJline = true; + public static boolean useConsole = true; + +@@ -252,13 +253,26 @@ public class Main { + deadline.add(Calendar.DAY_OF_YEAR, -3); + if (buildDate.before(deadline.getTime())) { + System.err.println("*** Error, this build is outdated ***"); +- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); ++ System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper + System.err.println("*** Server will start in 20 seconds ***"); + Thread.sleep(TimeUnit.SECONDS.toMillis(20)); + } + } + + System.setProperty("library.jansi.version", "Paper"); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows ++ // Paper start - Log Java and OS versioning to help with debugging plugin issues ++ java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean(); ++ java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean(); ++ if (runtimeMX != null && osMX != null) { ++ String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")"; ++ String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")"; ++ ++ System.out.println("System Info: " + javaInfo + " " + osInfo); ++ } else { ++ System.out.println("Unable to read system info"); ++ } ++ // Paper end - Log Java and OS versioning to help with debugging plugin issues ++ + System.out.println("Loading libraries, please wait..."); + net.minecraft.server.Main.main(options); + } catch (Throwable t) { +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +index 983660c1cc4df5ec6f08ab7363a1bb5d47af9f19..f541ca7cb3328a9366e08a9933b24ed5c76059c0 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +@@ -477,6 +477,11 @@ public final class CraftMagicNumbers implements UnsafeValues { + public String getTimingsServerName() { + return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName; + } ++ ++ @Override ++ public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { ++ return new com.destroystokyo.paper.PaperVersionFetcher(); ++ } + // Paper end + + @Override +diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java +index f697d45e0ac4e9cdc8a46121510a04c0f294d91f..e086765dec32241bc5a77afcf072c77a40c6d785 100644 +--- a/src/main/java/org/spigotmc/WatchdogThread.java ++++ b/src/main/java/org/spigotmc/WatchdogThread.java +@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread + + private WatchdogThread(long timeoutTime, boolean restart) + { +- super( "Spigot Watchdog Thread" ); ++ super( "Paper Watchdog Thread" ); + this.timeoutTime = timeoutTime; + this.restart = restart; + } +@@ -65,14 +65,14 @@ public class WatchdogThread extends Thread + { + Logger log = Bukkit.getServer().getLogger(); + log.log( Level.SEVERE, "------------------------------" ); +- log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." ); ++ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper + log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" ); + log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" ); + log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" ); + log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" ); +- log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" ); ++ log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" ); + log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" ); +- log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() ); ++ log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() ); + // + if ( net.minecraft.world.level.Level.lastPhysicsProblem != null ) + { +@@ -82,7 +82,7 @@ public class WatchdogThread extends Thread + } + // + log.log( Level.SEVERE, "------------------------------" ); +- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" ); ++ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper + WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); + log.log( Level.SEVERE, "------------------------------" ); + // +diff --git a/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo b/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo +new file mode 100644 +index 0000000000000000000000000000000000000000..79b4b25784cfeabd5f619ed5454ef843f35041db +--- /dev/null ++++ b/src/main/resources/META-INF/services/io.papermc.paper.ServerBuildInfo +@@ -0,0 +1 @@ ++io.papermc.paper.ServerBuildInfoImpl diff --git a/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch deleted file mode 100644 index 0827c86c18..0000000000 --- a/patches/server/0034-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Tue, 1 Mar 2016 14:32:43 -0600 -Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang - stats - - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8ead44e27598c01249f710e10a765dd1796ed249..fcb2d06f088a938b5bb76e6b42581d8f292d2eaf 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1680,7 +1680,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // CraftBukkit - cb > vanilla! -+ return "Paper"; // Paper - } - - public SystemReport fillSystemReport(SystemReport details) { -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 035c541290e5ff67d0db65fc0d68c612bba19840..a8a23daac1d102f9f5a17c9ed6aa821b16345f32 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -266,7 +266,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException; - import net.md_5.bungee.api.chat.BaseComponent; // Spigot - - public final class CraftServer implements Server { -- private final String serverName = "CraftBukkit"; -+ private final String serverName = "Paper"; // Paper - private final String serverVersion; - private final String bukkitVersion = Versioning.getBukkitVersion(); - private final Logger logger = Logger.getLogger("Minecraft"); -diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index bc664b090e16ed27ba795c204dc5639679e6eee8..3c4a593cfbc111084abc971bc7532898d094bd9a 100644 ---- a/src/main/java/org/bukkit/craftbukkit/Main.java -+++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -252,13 +252,26 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -3); - if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); -- System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); -+ System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads/paper ***"); // Paper - System.err.println("*** Server will start in 20 seconds ***"); - Thread.sleep(TimeUnit.SECONDS.toMillis(20)); - } - } - - System.setProperty("library.jansi.version", "Paper"); // Paper - set meaningless jansi version to prevent git builds from crashing on Windows -+ // Paper start - Log Java and OS versioning to help with debugging plugin issues -+ java.lang.management.RuntimeMXBean runtimeMX = java.lang.management.ManagementFactory.getRuntimeMXBean(); -+ java.lang.management.OperatingSystemMXBean osMX = java.lang.management.ManagementFactory.getOperatingSystemMXBean(); -+ if (runtimeMX != null && osMX != null) { -+ String javaInfo = "Java " + runtimeMX.getSpecVersion() + " (" + runtimeMX.getVmName() + " " + runtimeMX.getVmVersion() + ")"; -+ String osInfo = "Host: " + osMX.getName() + " " + osMX.getVersion() + " (" + osMX.getArch() + ")"; -+ -+ System.out.println("System Info: " + javaInfo + " " + osInfo); -+ } else { -+ System.out.println("Unable to read system info"); -+ } -+ // Paper end - Log Java and OS versioning to help with debugging plugin issues -+ - System.out.println("Loading libraries, please wait..."); - net.minecraft.server.Main.main(options); - } catch (Throwable t) { -diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index f697d45e0ac4e9cdc8a46121510a04c0f294d91f..e086765dec32241bc5a77afcf072c77a40c6d785 100644 ---- a/src/main/java/org/spigotmc/WatchdogThread.java -+++ b/src/main/java/org/spigotmc/WatchdogThread.java -@@ -19,7 +19,7 @@ public class WatchdogThread extends Thread - - private WatchdogThread(long timeoutTime, boolean restart) - { -- super( "Spigot Watchdog Thread" ); -+ super( "Paper Watchdog Thread" ); - this.timeoutTime = timeoutTime; - this.restart = restart; - } -@@ -65,14 +65,14 @@ public class WatchdogThread extends Thread - { - Logger log = Bukkit.getServer().getLogger(); - log.log( Level.SEVERE, "------------------------------" ); -- log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Spigot bug." ); -+ log.log( Level.SEVERE, "The server has stopped responding! This is (probably) not a Paper bug." ); // Paper - log.log( Level.SEVERE, "If you see a plugin in the Server thread dump below, then please report it to that author" ); - log.log( Level.SEVERE, "\t *Especially* if it looks like HTTP or MySQL operations are occurring" ); - log.log( Level.SEVERE, "If you see a world save or edit, then it means you did far more than your server can handle at once" ); - log.log( Level.SEVERE, "\t If this is the case, consider increasing timeout-time in spigot.yml but note that this will replace the crash with LARGE lag spikes" ); -- log.log( Level.SEVERE, "If you are unsure or still think this is a Spigot bug, please report to https://www.spigotmc.org/" ); -+ log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" ); - log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" ); -- log.log( Level.SEVERE, "Spigot version: " + Bukkit.getServer().getVersion() ); -+ log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() ); - // - if ( net.minecraft.world.level.Level.lastPhysicsProblem != null ) - { -@@ -82,7 +82,7 @@ public class WatchdogThread extends Thread - } - // - log.log( Level.SEVERE, "------------------------------" ); -- log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" ); -+ log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper - WatchdogThread.dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); - log.log( Level.SEVERE, "------------------------------" ); - // diff --git a/patches/server/0035-Implement-Paper-VersionChecker.patch b/patches/server/0035-Implement-Paper-VersionChecker.patch deleted file mode 100644 index 27e99e60b6..0000000000 --- a/patches/server/0035-Implement-Paper-VersionChecker.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zach Brown -Date: Mon, 27 May 2019 03:40:05 -0500 -Subject: [PATCH] Implement Paper VersionChecker - - -diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -new file mode 100644 -index 0000000000000000000000000000000000000000..22a55be34fde453fedd987173d95b8b347a03588 ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -@@ -0,0 +1,129 @@ -+package com.destroystokyo.paper; -+ -+import com.destroystokyo.paper.util.VersionFetcher; -+import com.google.common.base.Charsets; -+import com.google.common.io.Resources; -+import com.google.gson.*; -+import net.kyori.adventure.text.Component; -+import net.kyori.adventure.text.event.ClickEvent; -+import net.kyori.adventure.text.format.NamedTextColor; -+ -+import javax.annotation.Nonnull; -+import javax.annotation.Nullable; -+import java.io.*; -+import java.net.HttpURLConnection; -+import java.net.URL; -+import java.util.stream.StreamSupport; -+ -+public class PaperVersionFetcher implements VersionFetcher { -+ private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end -+ private static final String GITHUB_BRANCH_NAME = "master"; -+ private static final String DOWNLOAD_PAGE = "https://papermc.io/downloads/paper"; -+ private static @Nullable String mcVer; -+ -+ @Override -+ public long getCacheTime() { -+ return 720000; -+ } -+ -+ @Nonnull -+ @Override -+ public Component getVersionMessage(@Nonnull String serverVersion) { -+ String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]"); -+ return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]); -+ } -+ -+ private static @Nullable String getMinecraftVersion() { -+ if (mcVer == null) { -+ java.util.regex.Matcher matcher = VER_PATTERN.matcher(org.bukkit.Bukkit.getBukkitVersion()); -+ if (matcher.find()) { -+ String result = matcher.group(); -+ mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-' -+ } else { -+ org.bukkit.Bukkit.getLogger().warning("Unable to match version to pattern! Report to PaperMC!"); -+ org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString()); -+ org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); -+ } -+ } -+ -+ return mcVer; -+ } -+ -+ private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) { -+ int distance; -+ try { -+ int jenkinsBuild = Integer.parseInt(versionInfo); -+ distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); -+ } catch (NumberFormatException ignored) { -+ versionInfo = versionInfo.replace("\"", ""); -+ distance = fetchDistanceFromGitHub(repo, branch, versionInfo); -+ } -+ -+ switch (distance) { -+ case -1: -+ return Component.text("Error obtaining version information", NamedTextColor.YELLOW); -+ case 0: -+ return Component.text("You are running the latest version", NamedTextColor.GREEN); -+ case -2: -+ return Component.text("Unknown version", NamedTextColor.YELLOW); -+ default: -+ return Component.text("You are " + distance + " version(s) behind", NamedTextColor.YELLOW) -+ .append(Component.newline()) -+ .append(Component.text("Download the new version at: ") -+ .append(Component.text(DOWNLOAD_PAGE, NamedTextColor.GOLD) -+ .hoverEvent(Component.text("Click to open", NamedTextColor.WHITE)) -+ .clickEvent(ClickEvent.openUrl(DOWNLOAD_PAGE)))); -+ } -+ } -+ -+ private static int fetchDistanceFromSiteApi(int jenkinsBuild, @Nullable String siteApiVersion) { -+ if (siteApiVersion == null) { return -1; } -+ try { -+ try (BufferedReader reader = Resources.asCharSource( -+ new URL("https://api.papermc.io/v2/projects/paper/versions/" + siteApiVersion), -+ Charsets.UTF_8 -+ ).openBufferedStream()) { -+ JsonObject json = new Gson().fromJson(reader, JsonObject.class); -+ JsonArray builds = json.getAsJsonArray("builds"); -+ int latest = StreamSupport.stream(builds.spliterator(), false) -+ .mapToInt(e -> e.getAsInt()) -+ .max() -+ .getAsInt(); -+ return latest - jenkinsBuild; -+ } catch (JsonSyntaxException ex) { -+ ex.printStackTrace(); -+ return -1; -+ } -+ } catch (IOException e) { -+ e.printStackTrace(); -+ return -1; -+ } -+ } -+ -+ // Contributed by Techcable in GH-65 -+ private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) { -+ try { -+ HttpURLConnection connection = (HttpURLConnection) new URL("https://api.github.com/repos/" + repo + "/compare/" + branch + "..." + hash).openConnection(); -+ connection.connect(); -+ if (connection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) return -2; // Unknown commit -+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), Charsets.UTF_8))) { -+ JsonObject obj = new Gson().fromJson(reader, JsonObject.class); -+ String status = obj.get("status").getAsString(); -+ switch (status) { -+ case "identical": -+ return 0; -+ case "behind": -+ return obj.get("behind_by").getAsInt(); -+ default: -+ return -1; -+ } -+ } catch (JsonSyntaxException | NumberFormatException e) { -+ e.printStackTrace(); -+ return -1; -+ } -+ } catch (IOException e) { -+ e.printStackTrace(); -+ return -1; -+ } -+ } -+} -diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index e7b98cefde1e0ecfbd151ef968062a774a6ebf55..5df312c8c663b51dcdfa69945050baadbc2f5f92 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -477,6 +477,11 @@ public final class CraftMagicNumbers implements UnsafeValues { - public String getTimingsServerName() { - return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName; - } -+ -+ @Override -+ public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { -+ return new com.destroystokyo.paper.PaperVersionFetcher(); -+ } - // Paper end - - @Override diff --git a/patches/server/0037-Player-affects-spawning-API.patch b/patches/server/0035-Player-affects-spawning-API.patch similarity index 100% rename from patches/server/0037-Player-affects-spawning-API.patch rename to patches/server/0035-Player-affects-spawning-API.patch diff --git a/patches/server/0036-Add-version-history-to-version-command.patch b/patches/server/0036-Add-version-history-to-version-command.patch deleted file mode 100644 index 4d5ccce75a..0000000000 --- a/patches/server/0036-Add-version-history-to-version-command.patch +++ /dev/null @@ -1,222 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kyle Wood -Date: Thu, 1 Mar 2018 19:37:52 -0600 -Subject: [PATCH] Add version history to version command - - -diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 22a55be34fde453fedd987173d95b8b347a03588..9d687da5bdf398bb3f6c84cdf1249a7213d09f2e 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -@@ -7,6 +7,8 @@ import com.google.gson.*; - import net.kyori.adventure.text.Component; - import net.kyori.adventure.text.event.ClickEvent; - import net.kyori.adventure.text.format.NamedTextColor; -+import net.kyori.adventure.text.format.TextDecoration; -+import net.kyori.adventure.text.TextComponent; - - import javax.annotation.Nonnull; - import javax.annotation.Nullable; -@@ -30,7 +32,10 @@ public class PaperVersionFetcher implements VersionFetcher { - @Override - public Component getVersionMessage(@Nonnull String serverVersion) { - String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]"); -- return getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]); -+ final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]); -+ final Component history = getHistory(); -+ -+ return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; - } - - private static @Nullable String getMinecraftVersion() { -@@ -126,4 +131,19 @@ public class PaperVersionFetcher implements VersionFetcher { - return -1; - } - } -+ -+ @Nullable -+ private Component getHistory() { -+ final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData(); -+ if (data == null) { -+ return null; -+ } -+ -+ final String oldVersion = data.getOldVersion(); -+ if (oldVersion == null) { -+ return null; -+ } -+ -+ return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC); -+ } - } -diff --git a/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java -new file mode 100644 -index 0000000000000000000000000000000000000000..660b2ec6b63a4ceffee44ab11f54dfa7c0d0996f ---- /dev/null -+++ b/src/main/java/com/destroystokyo/paper/VersionHistoryManager.java -@@ -0,0 +1,153 @@ -+package com.destroystokyo.paper; -+ -+import com.google.common.base.MoreObjects; -+import com.google.gson.Gson; -+import com.google.gson.JsonSyntaxException; -+import java.io.BufferedReader; -+import java.io.BufferedWriter; -+import java.io.IOException; -+import java.nio.charset.StandardCharsets; -+import java.nio.file.Files; -+import java.nio.file.Path; -+import java.nio.file.Paths; -+import java.nio.file.StandardOpenOption; -+import java.util.Objects; -+import java.util.logging.Level; -+import java.util.logging.Logger; -+import org.bukkit.Bukkit; -+ -+import javax.annotation.Nonnull; -+import javax.annotation.Nullable; -+ -+public enum VersionHistoryManager { -+ INSTANCE; -+ -+ private final Gson gson = new Gson(); -+ -+ private final Logger logger = Bukkit.getLogger(); -+ -+ private VersionData currentData = null; -+ -+ VersionHistoryManager() { -+ final Path path = Paths.get("version_history.json"); -+ -+ if (Files.exists(path)) { -+ // Basic file santiy checks -+ if (!Files.isRegularFile(path)) { -+ if (Files.isDirectory(path)) { -+ logger.severe(path + " is a directory, cannot be used for version history"); -+ } else { -+ logger.severe(path + " is not a regular file, cannot be used for version history"); -+ } -+ // We can't continue -+ return; -+ } -+ -+ try (final BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) { -+ currentData = gson.fromJson(reader, VersionData.class); -+ } catch (final IOException e) { -+ logger.log(Level.SEVERE, "Failed to read version history file '" + path + "'", e); -+ return; -+ } catch (final JsonSyntaxException e) { -+ logger.log(Level.SEVERE, "Invalid json syntax for file '" + path + "'", e); -+ return; -+ } -+ -+ final String version = Bukkit.getVersion(); -+ if (version == null) { -+ logger.severe("Failed to retrieve current version"); -+ return; -+ } -+ -+ if (currentData == null) { -+ // Empty file -+ currentData = new VersionData(); -+ currentData.setCurrentVersion(version); -+ writeFile(path); -+ return; -+ } -+ -+ if (!version.equals(currentData.getCurrentVersion())) { -+ // The version appears to have changed -+ currentData.setOldVersion(currentData.getCurrentVersion()); -+ currentData.setCurrentVersion(version); -+ writeFile(path); -+ } -+ } else { -+ // File doesn't exist, start fresh -+ currentData = new VersionData(); -+ // oldVersion is null -+ currentData.setCurrentVersion(Bukkit.getVersion()); -+ writeFile(path); -+ } -+ } -+ -+ private void writeFile(@Nonnull final Path path) { -+ try (final BufferedWriter writer = Files.newBufferedWriter( -+ path, -+ StandardCharsets.UTF_8, -+ StandardOpenOption.WRITE, -+ StandardOpenOption.CREATE, -+ StandardOpenOption.TRUNCATE_EXISTING -+ )) { -+ gson.toJson(currentData, writer); -+ } catch (final IOException e) { -+ logger.log(Level.SEVERE, "Failed to write to version history file", e); -+ } -+ } -+ -+ @Nullable -+ public VersionData getVersionData() { -+ return currentData; -+ } -+ -+ public static class VersionData { -+ private String oldVersion; -+ -+ private String currentVersion; -+ -+ @Nullable -+ public String getOldVersion() { -+ return oldVersion; -+ } -+ -+ public void setOldVersion(@Nullable String oldVersion) { -+ this.oldVersion = oldVersion; -+ } -+ -+ @Nullable -+ public String getCurrentVersion() { -+ return currentVersion; -+ } -+ -+ public void setCurrentVersion(@Nullable String currentVersion) { -+ this.currentVersion = currentVersion; -+ } -+ -+ @Override -+ public String toString() { -+ return MoreObjects.toStringHelper(this) -+ .add("oldVersion", oldVersion) -+ .add("currentVersion", currentVersion) -+ .toString(); -+ } -+ -+ @Override -+ public boolean equals(@Nullable Object o) { -+ if (this == o) { -+ return true; -+ } -+ if (o == null || getClass() != o.getClass()) { -+ return false; -+ } -+ final VersionData versionData = (VersionData) o; -+ return Objects.equals(oldVersion, versionData.oldVersion) && -+ Objects.equals(currentVersion, versionData.currentVersion); -+ } -+ -+ @Override -+ public int hashCode() { -+ return Objects.hash(oldVersion, currentVersion); -+ } -+ } -+} -diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index bbe2fabc9251838f232480a04f0a2cf2b49f2812..a6126515e497cb0769bdc96881389026196bbbae 100644 ---- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -214,6 +214,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface - // Paper end - initialize global and world-defaults configuration - io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command - com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics -+ com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now - - this.setPvpAllowed(dedicatedserverproperties.pvp); - this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/patches/server/0038-Only-refresh-abilities-if-needed.patch b/patches/server/0036-Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/0038-Only-refresh-abilities-if-needed.patch rename to patches/server/0036-Only-refresh-abilities-if-needed.patch diff --git a/patches/server/0039-Entity-Origin-API.patch b/patches/server/0037-Entity-Origin-API.patch similarity index 98% rename from patches/server/0039-Entity-Origin-API.patch rename to patches/server/0037-Entity-Origin-API.patch index ac1b821538..b021245302 100644 --- a/patches/server/0039-Entity-Origin-API.patch +++ b/patches/server/0037-Entity-Origin-API.patch @@ -25,7 +25,7 @@ index a6e78b8a6ced8ec84273e2c5d18ffccacb005cb6..c476a49f69261868f74ad528a2ad746a public void onTrackingEnd(Entity entity) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 09ce9511f52f7f8643fedc325c49580eba4e4645..030be85ff601711007bd2e550f3c534d34e73085 100644 +index 074292615a13cf1f42ee74d629109ec1be390da5..35ec3d6557a02a29df15c7302c1007f335c3db65 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -322,7 +322,27 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch b/patches/server/0038-Prevent-block-entity-and-entity-crashes.patch similarity index 97% rename from patches/server/0040-Prevent-block-entity-and-entity-crashes.patch rename to patches/server/0038-Prevent-block-entity-and-entity-crashes.patch index 1b4eff07fa..ccdc3ed18a 100644 --- a/patches/server/0040-Prevent-block-entity-and-entity-crashes.patch +++ b/patches/server/0038-Prevent-block-entity-and-entity-crashes.patch @@ -26,7 +26,7 @@ index 5f881af95bd5ee94daadfd9e5d64ee6d411255c4..472df81e4aef21e0cf2684a9e04d6ce1 } diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index fb495fcbf42be3825bfb785a9887148c54f5b00b..8d281ce2a0e44b97957cea2992e273abc86bd157 100644 +index 7fa49fcf5469276e25c40af4cd27943f665d8721..d116d427ed692a9ef7d65e06ebef18012ce22aab 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java @@ -263,7 +263,12 @@ public abstract class BlockEntity { diff --git a/patches/server/0041-Configurable-top-of-nether-void-damage.patch b/patches/server/0039-Configurable-top-of-nether-void-damage.patch similarity index 97% rename from patches/server/0041-Configurable-top-of-nether-void-damage.patch rename to patches/server/0039-Configurable-top-of-nether-void-damage.patch index 715e63f758..78fb2dce6b 100644 --- a/patches/server/0041-Configurable-top-of-nether-void-damage.patch +++ b/patches/server/0039-Configurable-top-of-nether-void-damage.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable top of nether void damage Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 030be85ff601711007bd2e550f3c534d34e73085..f4e0a10eb936ed9d43c9a2fc3ed03a785bf00901 100644 +index 35ec3d6557a02a29df15c7302c1007f335c3db65..795ac5f58469f10ce35fff55bbc4fa5f395eea2a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -696,7 +696,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/server/0040-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/0042-Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/server/0040-Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch b/patches/server/0041-Add-more-entities-to-activation-range-ignore-list.patch similarity index 100% rename from patches/server/0043-Add-more-entities-to-activation-range-ignore-list.patch rename to patches/server/0041-Add-more-entities-to-activation-range-ignore-list.patch diff --git a/patches/server/0044-Configurable-end-credits.patch b/patches/server/0042-Configurable-end-credits.patch similarity index 91% rename from patches/server/0044-Configurable-end-credits.patch rename to patches/server/0042-Configurable-end-credits.patch index 4c53dd9e33..f53785fc6c 100644 --- a/patches/server/0044-Configurable-end-credits.patch +++ b/patches/server/0042-Configurable-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8292f45aa100e2788584f568430d76560c2fa9a8..244be33d0000189556ce7c6714e5a9768c16ba6b 100644 +index 08b2d5c6fb6d236b805ca6556270ad1891b411f5..5b33cc5c54ab38b32f232dae00684d8b1e276acf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1107,6 +1107,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 92% rename from patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch index 390dc10580..549e7e93fb 100644 --- a/patches/server/0045-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/patches/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 296de8e9ae1284d4805932e746291d1148f7f8eb..b8b142f573b297ba72d45be3ae4c2729f3cffe1e 100644 +index 93c6d28df13077a2759fecf31d7dba5db10e11f9..598050c77c5a875d3fa27271debd916ab8b5259f 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -226,7 +226,7 @@ public class Explosion { diff --git a/patches/server/0046-Optimize-explosions.patch b/patches/server/0044-Optimize-explosions.patch similarity index 95% rename from patches/server/0046-Optimize-explosions.patch rename to patches/server/0044-Optimize-explosions.patch index 50bb8f8a47..6704afe14d 100644 --- a/patches/server/0046-Optimize-explosions.patch +++ b/patches/server/0044-Optimize-explosions.patch @@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fcb2d06f088a938b5bb76e6b42581d8f292d2eaf..231fba80a25601cdfba4f6f44ac7c2888e505ed2 100644 +index 80a20dce63658842a0fa04004b8eaa8af7685fb4..a0fda40b2b7b16b424ed08d3a63da8704317133c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1554,6 +1554,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements diff --git a/patches/server/0058-Improve-Player-chat-API-handling.patch b/patches/server/0056-Improve-Player-chat-API-handling.patch similarity index 96% rename from patches/server/0058-Improve-Player-chat-API-handling.patch rename to patches/server/0056-Improve-Player-chat-API-handling.patch index 5a08a8685a..d940e1d9b2 100644 --- a/patches/server/0058-Improve-Player-chat-API-handling.patch +++ b/patches/server/0056-Improve-Player-chat-API-handling.patch @@ -40,10 +40,10 @@ index b700cd5ccf37f3592f7cb931101397fbc59dc60f..ad598e57feb2d9db1b71cb3a432df222 if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index a8a23daac1d102f9f5a17c9ed6aa821b16345f32..0287b2a02a94fa0671ee242ad3f5dac44d62dbbd 100644 +index 4d31fb8bc8bf285720a9d5828325d7124cf41c6e..2ca22c4d3f15ec3d7c2f8abf68ce7d810fe7c3ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -898,7 +898,7 @@ public final class CraftServer implements Server { +@@ -900,7 +900,7 @@ public final class CraftServer implements Server { public boolean dispatchCommand(CommandSender sender, String commandLine) { Preconditions.checkArgument(sender != null, "sender cannot be null"); Preconditions.checkArgument(commandLine != null, "commandLine cannot be null"); diff --git a/patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/server/0057-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0059-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/server/0057-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0060-Expose-server-CommandMap.patch b/patches/server/0058-Expose-server-CommandMap.patch similarity index 78% rename from patches/server/0060-Expose-server-CommandMap.patch rename to patches/server/0058-Expose-server-CommandMap.patch index c23d4895f5..7e5affaf5a 100644 --- a/patches/server/0060-Expose-server-CommandMap.patch +++ b/patches/server/0058-Expose-server-CommandMap.patch @@ -5,10 +5,10 @@ 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 0287b2a02a94fa0671ee242ad3f5dac44d62dbbd..3218c620cb09e5da7ed75df125adc2d8ba41c306 100644 +index 2ca22c4d3f15ec3d7c2f8abf68ce7d810fe7c3ea..61f2e7faa5c5497eb5c45e127166b933c532036a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2141,6 +2141,7 @@ public final class CraftServer implements Server { +@@ -2143,6 +2143,7 @@ public final class CraftServer implements Server { return this.helpMap; } diff --git a/patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/server/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/server/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0062-Player-Tab-List-and-Title-APIs.patch b/patches/server/0060-Player-Tab-List-and-Title-APIs.patch similarity index 97% rename from patches/server/0062-Player-Tab-List-and-Title-APIs.patch rename to patches/server/0060-Player-Tab-List-and-Title-APIs.patch index 396ca10a8d..c2b14bfc41 100644 --- a/patches/server/0062-Player-Tab-List-and-Title-APIs.patch +++ b/patches/server/0060-Player-Tab-List-and-Title-APIs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a51bce9252328df85b485a5af7786db0622a4672..b53d62754f823c2e41c92a95f200af7c388ed011 100644 +index e4be5445045c28e0bf6c84f4b6695ff47f8df72e..b6932bee839cac9b819b9cd7a3f7668688bfe44e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -384,6 +384,98 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0063-Add-configurable-portal-search-radius.patch b/patches/server/0061-Add-configurable-portal-search-radius.patch similarity index 96% rename from patches/server/0063-Add-configurable-portal-search-radius.patch rename to patches/server/0061-Add-configurable-portal-search-radius.patch index 41391fe2ae..f65dd2ef82 100644 --- a/patches/server/0063-Add-configurable-portal-search-radius.patch +++ b/patches/server/0061-Add-configurable-portal-search-radius.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable portal search radius diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f4e0a10eb936ed9d43c9a2fc3ed03a785bf00901..406d69220b315b47bd3d03a0dacc39addaaf9294 100644 +index 795ac5f58469f10ce35fff55bbc4fa5f395eea2a..fb3f9082b16f5ec420ddc1f5a0e81b8130a71e4f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3208,7 +3208,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0064-Add-velocity-warnings.patch b/patches/server/0062-Add-velocity-warnings.patch similarity index 96% rename from patches/server/0064-Add-velocity-warnings.patch rename to patches/server/0062-Add-velocity-warnings.patch index 0776a543ef..58c2ab5bf6 100644 --- a/patches/server/0064-Add-velocity-warnings.patch +++ b/patches/server/0062-Add-velocity-warnings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 3218c620cb09e5da7ed75df125adc2d8ba41c306..2dd6af53220dcdc21d7f3d304a9fadaa22b61b86 100644 +index 61f2e7faa5c5497eb5c45e127166b933c532036a..8ebd605a35b16a07ed1d927ebc9308a56a497c40 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -303,6 +303,7 @@ public final class CraftServer implements Server { +@@ -298,6 +298,7 @@ public final class CraftServer implements Server { public boolean ignoreVanillaPermissions = false; private final List playerView; public int reloadCount; diff --git a/patches/server/0065-Configurable-inter-world-teleportation-safety.patch b/patches/server/0063-Configurable-inter-world-teleportation-safety.patch similarity index 94% rename from patches/server/0065-Configurable-inter-world-teleportation-safety.patch rename to patches/server/0063-Configurable-inter-world-teleportation-safety.patch index 2154200454..e6af143352 100644 --- a/patches/server/0065-Configurable-inter-world-teleportation-safety.patch +++ b/patches/server/0063-Configurable-inter-world-teleportation-safety.patch @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b53d62754f823c2e41c92a95f200af7c388ed011..392d77e43d5add1fd71f35817435c2b3c6a7a8fa 100644 +index b6932bee839cac9b819b9cd7a3f7668688bfe44e..24621c11ff91df8695eecc818e6a94a095c5a9cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1235,7 +1235,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0066-Add-exception-reporting-event.patch b/patches/server/0064-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0066-Add-exception-reporting-event.patch rename to patches/server/0064-Add-exception-reporting-event.patch diff --git a/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch b/patches/server/0065-Disable-Scoreboards-for-non-players-by-default.patch similarity index 91% rename from patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/server/0065-Disable-Scoreboards-for-non-players-by-default.patch index 492c8f6fe9..e008b70806 100644 --- a/patches/server/0067-Disable-Scoreboards-for-non-players-by-default.patch +++ b/patches/server/0065-Disable-Scoreboards-for-non-players-by-default.patch @@ -11,7 +11,7 @@ So avoid looking up scoreboards and short circuit to the "not on a team" logic which is most likely to be true. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 406d69220b315b47bd3d03a0dacc39addaaf9294..1cd40266418a3805f05b09c554d561e2e83822e5 100644 +index fb3f9082b16f5ec420ddc1f5a0e81b8130a71e4f..66ba606ccbff3a578a090d5170f3ff866ecf99af 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2836,6 +2836,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -23,7 +23,7 @@ index 406d69220b315b47bd3d03a0dacc39addaaf9294..1cd40266418a3805f05b09c554d561e2 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a2cbe1fd8aef67cc9c71ef22bf4c7efd9d8d6a95..8f13f53b14209542283586c437e5cbf549ec8e46 100644 +index 856fb1a15279efc1e24a93fa289ca1ca8effd43e..e0ad0e242181261adccdec9c006a9937ac4a24e6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -873,6 +873,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/server/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0068-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/server/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0069-Chunk-Save-Reattempt.patch b/patches/server/0067-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0069-Chunk-Save-Reattempt.patch rename to patches/server/0067-Chunk-Save-Reattempt.patch diff --git a/patches/server/0070-Complete-resource-pack-API.patch b/patches/server/0068-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0070-Complete-resource-pack-API.patch rename to patches/server/0068-Complete-resource-pack-API.patch diff --git a/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0069-Default-loading-permissions.yml-before-plugins.patch similarity index 89% rename from patches/server/0071-Default-loading-permissions.yml-before-plugins.patch rename to patches/server/0069-Default-loading-permissions.yml-before-plugins.patch index ba81a22f2c..26b2484c59 100644 --- a/patches/server/0071-Default-loading-permissions.yml-before-plugins.patch +++ b/patches/server/0069-Default-loading-permissions.yml-before-plugins.patch @@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2dd6af53220dcdc21d7f3d304a9fadaa22b61b86..39767d5de04c11ab0ccacad6a677209df301d3e9 100644 +index 8ebd605a35b16a07ed1d927ebc9308a56a497c40..a4fffd20b0617563a67d5b9980814a7dc6fda997 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -459,6 +459,7 @@ public final class CraftServer implements Server { +@@ -454,6 +454,7 @@ public final class CraftServer implements Server { if (type == PluginLoadOrder.STARTUP) { this.helpMap.clear(); this.helpMap.initializeGeneralTopics(); @@ -27,7 +27,7 @@ index 2dd6af53220dcdc21d7f3d304a9fadaa22b61b86..39767d5de04c11ab0ccacad6a677209d } Plugin[] plugins = this.pluginManager.getPlugins(); -@@ -478,7 +479,7 @@ public final class CraftServer implements Server { +@@ -473,7 +474,7 @@ public final class CraftServer implements Server { this.commandMap.registerServerAliases(); DefaultPermissions.registerCorePermissions(); CraftDefaultPermissions.registerCorePermissions(); diff --git a/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0070-Allow-Reloading-of-Custom-Permissions.patch similarity index 90% rename from patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch rename to patches/server/0070-Allow-Reloading-of-Custom-Permissions.patch index 24eb99a038..810bbb2a2b 100644 --- a/patches/server/0072-Allow-Reloading-of-Custom-Permissions.patch +++ b/patches/server/0070-Allow-Reloading-of-Custom-Permissions.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 39767d5de04c11ab0ccacad6a677209df301d3e9..8c3954a4b9adff7d41a772870d955e8f618a19cc 100644 +index a4fffd20b0617563a67d5b9980814a7dc6fda997..363a56ab9e1debb075ae8d441c9e2d31fa4fd5bb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2752,5 +2752,23 @@ public final class CraftServer implements Server { +@@ -2754,5 +2754,23 @@ public final class CraftServer implements Server { } return this.adventure$audiences; } diff --git a/patches/server/0073-Remove-Metadata-on-reload.patch b/patches/server/0071-Remove-Metadata-on-reload.patch similarity index 88% rename from patches/server/0073-Remove-Metadata-on-reload.patch rename to patches/server/0071-Remove-Metadata-on-reload.patch index 3f6a30810f..ced7fd2271 100644 --- a/patches/server/0073-Remove-Metadata-on-reload.patch +++ b/patches/server/0071-Remove-Metadata-on-reload.patch @@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8c3954a4b9adff7d41a772870d955e8f618a19cc..219f34bf52d561ade27d9bb4876fc49ee2de30f6 100644 +index 363a56ab9e1debb075ae8d441c9e2d31fa4fd5bb..9eb00817b757fea2d2400aac7a33f72866ab8796 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -965,8 +965,16 @@ public final class CraftServer implements Server { +@@ -967,8 +967,16 @@ public final class CraftServer implements Server { world.spigotConfig.init(); // Spigot } diff --git a/patches/server/0074-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0072-Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/0074-Handle-Item-Meta-Inconsistencies.patch rename to patches/server/0072-Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0075-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/server/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0076-Add-World-Util-Methods.patch b/patches/server/0074-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0076-Add-World-Util-Methods.patch rename to patches/server/0074-Add-World-Util-Methods.patch diff --git a/patches/server/0077-Custom-replacement-for-eaten-items.patch b/patches/server/0075-Custom-replacement-for-eaten-items.patch similarity index 96% rename from patches/server/0077-Custom-replacement-for-eaten-items.patch rename to patches/server/0075-Custom-replacement-for-eaten-items.patch index 5aa65e4e45..b619a02688 100644 --- a/patches/server/0077-Custom-replacement-for-eaten-items.patch +++ b/patches/server/0075-Custom-replacement-for-eaten-items.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8f13f53b14209542283586c437e5cbf549ec8e46..801577d2c9e6eacd8e3038f5b3cdb026c62a5d09 100644 +index e0ad0e242181261adccdec9c006a9937ac4a24e6..d710e20447df4767e10f9250ce91dcd3141eaab0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3808,10 +3808,11 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0079-Use-a-Shared-Random-for-Entities.patch b/patches/server/0077-Use-a-Shared-Random-for-Entities.patch similarity index 98% rename from patches/server/0079-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0077-Use-a-Shared-Random-for-Entities.patch index 8be701d5d4..62162b7089 100644 --- a/patches/server/0079-Use-a-Shared-Random-for-Entities.patch +++ b/patches/server/0077-Use-a-Shared-Random-for-Entities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1cd40266418a3805f05b09c554d561e2e83822e5..bc098b6a9c0e3b19b9154ab3727949232bddb20a 100644 +index 66ba606ccbff3a578a090d5170f3ff866ecf99af..2fcdd61e9669904756aa33b1ff8ab7160ea5e371 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -169,6 +169,79 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0078-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0080-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/server/0078-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0079-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 96% rename from patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/server/0079-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index 7a21368c62..e0209fe811 100644 --- a/patches/server/0081-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/patches/server/0079-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener Saves on some object allocation and processing when no plugin listens to this diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 231fba80a25601cdfba4f6f44ac7c2888e505ed2..4dc8fcd8e118a1c2f5fac0fc291b5555abeec124 100644 +index a0fda40b2b7b16b424ed08d3a63da8704317133c..4a9669422567983e2c3b3cee4f4ef945d4486d97 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1520,6 +1520,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, CommandSource, AutoCloseable { @@ -17,7 +17,7 @@ index 53a344b3ee3813872f5f061aab660bf602b573a5..fa4a7babd045021545514f214c1d027f public static final Logger LOGGER = LogUtils.getLogger(); public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper public static final String VANILLA_BRAND = "vanilla"; -@@ -327,6 +328,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -@@ -2529,9 +2531,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop, ServerLevel> levels; private PlayerList playerList; private volatile boolean running; @@ -41,7 +41,7 @@ index 5a52369c1e4c462f401c4b6699a2b7376b8bc0e9..ec0fe27a6475cc3d097d394cf9694a17 private boolean stopped; private int tickCount; private int ticksUntilAutosave; -@@ -934,7 +935,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5abb033ff78a0e1d79a71ed65d82774738aa9ba4..990fad51d6fc1800d8ad815708c26747f46cfef0 100644 +index ea8e5b4775944fc2bf4e30c311b281363bd21049..9126d9409d1df900790db05c4c30a224460c36cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2251,7 +2251,7 @@ public final class CraftServer implements Server { +@@ -2253,7 +2253,7 @@ public final class CraftServer implements Server { offers = this.tabCompleteChat(player, message); } diff --git a/patches/server/0166-PlayerPickupExperienceEvent.patch b/patches/server/0164-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0166-PlayerPickupExperienceEvent.patch rename to patches/server/0164-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0165-Ability-to-apply-mending-to-XP-API.patch similarity index 96% rename from patches/server/0167-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0165-Ability-to-apply-mending-to-XP-API.patch index 92a6a66574..46d2cc7b09 100644 --- a/patches/server/0167-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/server/0165-Ability-to-apply-mending-to-XP-API.patch @@ -14,7 +14,7 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7e1f6e23980f12786abaa4218d8d77dd1a8feb3c..96277af4b3c1ebe081bf4aa42c7b78f1f084cbd6 100644 +index 7635c501d71273ef85e6500ff15434c6b89c9e3c..2928c835d2f99ea82db2bb06761cd273e1427caf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1624,7 +1624,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0166-PlayerNaturallySpawnCreaturesEvent.patch similarity index 98% rename from patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0166-PlayerNaturallySpawnCreaturesEvent.patch index e8b8f3b1e7..7d9889cafe 100644 --- a/patches/server/0168-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0166-PlayerNaturallySpawnCreaturesEvent.patch @@ -60,7 +60,7 @@ index 3f60a3289ec58d5eb3c0c5634ca62ef2fa287ce7..bc81649b09c39188697b8851abedafca boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit Iterator iterator1 = list.iterator(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a5122de4602db3b93a9221e1a9a33bcb73dbe771..785c7e56a053acffa79fb11a32849d99961e35a4 100644 +index 96bc2fa87502c363c68822d512e3c63c09a29513..53246654bf8154e723b26097e864f83fd203caa5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -282,6 +282,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0167-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0169-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0167-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0170-PreCreatureSpawnEvent.patch b/patches/server/0168-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0170-PreCreatureSpawnEvent.patch rename to patches/server/0168-PreCreatureSpawnEvent.patch diff --git a/patches/server/0171-Fill-Profile-Property-Events.patch b/patches/server/0169-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0171-Fill-Profile-Property-Events.patch rename to patches/server/0169-Fill-Profile-Property-Events.patch diff --git a/patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0170-Add-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0172-Add-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0170-Add-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0173-Add-ArmorStand-Item-Meta.patch b/patches/server/0171-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0173-Add-ArmorStand-Item-Meta.patch rename to patches/server/0171-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0174-Extend-Player-Interact-cancellation.patch b/patches/server/0172-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0174-Extend-Player-Interact-cancellation.patch rename to patches/server/0172-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0175-Tameable-getOwnerUniqueId-API.patch b/patches/server/0173-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0175-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0173-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0176-Toggleable-player-crits.patch b/patches/server/0174-Toggleable-player-crits.patch similarity index 100% rename from patches/server/0176-Toggleable-player-crits.patch rename to patches/server/0174-Toggleable-player-crits.patch diff --git a/patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0175-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0177-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0175-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0176-Implement-extended-PaperServerListPingEvent.patch similarity index 98% rename from patches/server/0178-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0176-Implement-extended-PaperServerListPingEvent.patch index 3ecad64906..4373d2086a 100644 --- a/patches/server/0178-Implement-extended-PaperServerListPingEvent.patch +++ b/patches/server/0176-Implement-extended-PaperServerListPingEvent.patch @@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ec0fe27a6475cc3d097d394cf9694a17cba76332..478445e7ed67b17d7aff0e10e9aae0788605a4b9 100644 +index 260e364c91d8c3d774681f9f0ecba63df5dd3f5c..2ae6eb3a05bd0574143699e1286f63f5fd699f30 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,6 +3,9 @@ package net.minecraft.server; @@ -194,7 +194,7 @@ index ec0fe27a6475cc3d097d394cf9694a17cba76332..478445e7ed67b17d7aff0e10e9aae078 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -@@ -1493,7 +1496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index e612921a7fb68dd74d8fd4084a8beccc299ff6ea..49b100e2cf9868c4f06aae0bf538fcd4a2ae0ba9 100644 +index 9a8d70c1f92ecc8da6444ba5581a8d4b24af0672..6ade79a291f0443fbb8cb3bf7ef622b12b391b72 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1892,9 +1892,23 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -39,7 +39,7 @@ index e612921a7fb68dd74d8fd4084a8beccc299ff6ea..49b100e2cf9868c4f06aae0bf538fcd4 protected void markHurt() { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3f50533b89345a74392e0e6ef0407e6aa544876e..b153247b4be38e8ecaf3df64db55df88b7501cfd 100644 +index b10d532d81efa8330f363f86d5a19e8847b90ba0..8baf8f715d68c96133085d625599ab2aa30bb83c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1593,7 +1593,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -218,7 +218,7 @@ index 9f9b7373c9a714597858ddcd8932e31b902cf5a1..f7f26d595072372004143c4e26506ed5 public abstract void explode(); diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 754ca46d11dfe0495aa3109b68b1032e6d7d76e9..4c7795e1ba7bb3135fcf5bab1c8aa857b8e7417b 100644 +index da9a9b235d1c8bcab3762134d69dcb112470e55d..a24e9c9e80659b5508e3c5ef3fa3d1a26b96b483 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -303,6 +303,16 @@ public class Explosion { diff --git a/patches/server/0207-Expand-Explosions-API.patch b/patches/server/0205-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0207-Expand-Explosions-API.patch rename to patches/server/0205-Expand-Explosions-API.patch diff --git a/patches/server/0208-LivingEntity-Active-Item-API.patch b/patches/server/0206-LivingEntity-Active-Item-API.patch similarity index 100% rename from patches/server/0208-LivingEntity-Active-Item-API.patch rename to patches/server/0206-LivingEntity-Active-Item-API.patch diff --git a/patches/server/0209-RangedEntity-API.patch b/patches/server/0207-RangedEntity-API.patch similarity index 99% rename from patches/server/0209-RangedEntity-API.patch rename to patches/server/0207-RangedEntity-API.patch index 5383dfd935..2b548743e2 100644 --- a/patches/server/0209-RangedEntity-API.patch +++ b/patches/server/0207-RangedEntity-API.patch @@ -83,7 +83,7 @@ index 995c77ee53347328bfd0ad66fcc1b39589967476..5b2af80e584977683cd39e6f440e65a7 public CraftIllusioner(CraftServer server, net.minecraft.world.entity.monster.Illusioner entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index dfd4cf1e613b7ccf3ad986f8e0d783593a411194..9986ac517e11b076a29a8c8e3f480ec286fa5825 100644 +index 189b5ac97f3354b8dea082c2acef242f8ff2f002..bf297388c75521266c93580a9caafe6bad70ab45 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Llama; diff --git a/patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0208-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0210-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0208-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0211-Implement-World.getEntity-UUID-API.patch b/patches/server/0209-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0211-Implement-World.getEntity-UUID-API.patch rename to patches/server/0209-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0212-InventoryCloseEvent-Reason-API.patch b/patches/server/0210-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0212-InventoryCloseEvent-Reason-API.patch rename to patches/server/0210-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0213-Vex-get-setSummoner-API.patch b/patches/server/0211-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0213-Vex-get-setSummoner-API.patch rename to patches/server/0211-Vex-get-setSummoner-API.patch diff --git a/patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0212-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0214-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0212-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0215-add-more-information-to-Entity.toString.patch b/patches/server/0213-add-more-information-to-Entity.toString.patch similarity index 95% rename from patches/server/0215-add-more-information-to-Entity.toString.patch rename to patches/server/0213-add-more-information-to-Entity.toString.patch index 075a1453d8..948060c5bc 100644 --- a/patches/server/0215-add-more-information-to-Entity.toString.patch +++ b/patches/server/0213-add-more-information-to-Entity.toString.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString() UUID, ticks lived, valid, dead diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 49b100e2cf9868c4f06aae0bf538fcd4a2ae0ba9..c2dd3767fbeb7215c9b2703054c9068252828355 100644 +index 6ade79a291f0443fbb8cb3bf7ef622b12b391b72..ffc3cee1e19a039ef78634b9f94b045be8a2a3f8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3182,7 +3182,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0216-EnderDragon-Events.patch b/patches/server/0214-EnderDragon-Events.patch similarity index 100% rename from patches/server/0216-EnderDragon-Events.patch rename to patches/server/0214-EnderDragon-Events.patch diff --git a/patches/server/0217-PlayerElytraBoostEvent.patch b/patches/server/0215-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0217-PlayerElytraBoostEvent.patch rename to patches/server/0215-PlayerElytraBoostEvent.patch diff --git a/patches/server/0218-PlayerLaunchProjectileEvent.patch b/patches/server/0216-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0218-PlayerLaunchProjectileEvent.patch rename to patches/server/0216-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0219-Improve-BlockPosition-inlining.patch b/patches/server/0217-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0219-Improve-BlockPosition-inlining.patch rename to patches/server/0217-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 95% rename from patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index 4c4526b87a..4c9123e6bf 100644 --- a/patches/server/0220-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/patches/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index d33c49c4a4b87a5203f9b4592deff9389e6e870d..62d63883f6a9f4da099491f697b309d4194b6082 100644 +index dd7ecba4525d90e6b9509d1c3cab24c1615e37a9..521ad674b42e40df30916cf02ae6ace42c0368a2 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -344,6 +344,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0221-Vanished-players-don-t-have-rights.patch b/patches/server/0219-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0221-Vanished-players-don-t-have-rights.patch rename to patches/server/0219-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0222-Allow-disabling-armor-stand-ticking.patch b/patches/server/0220-Allow-disabling-armor-stand-ticking.patch similarity index 100% rename from patches/server/0222-Allow-disabling-armor-stand-ticking.patch rename to patches/server/0220-Allow-disabling-armor-stand-ticking.patch diff --git a/patches/server/0223-SkeletonHorse-Additions.patch b/patches/server/0221-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0223-SkeletonHorse-Additions.patch rename to patches/server/0221-SkeletonHorse-Additions.patch diff --git a/patches/server/0224-Expand-ArmorStand-API.patch b/patches/server/0222-Expand-ArmorStand-API.patch similarity index 100% rename from patches/server/0224-Expand-ArmorStand-API.patch rename to patches/server/0222-Expand-ArmorStand-API.patch diff --git a/patches/server/0225-AnvilDamageEvent.patch b/patches/server/0223-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0225-AnvilDamageEvent.patch rename to patches/server/0223-AnvilDamageEvent.patch diff --git a/patches/server/0226-Add-TNTPrimeEvent.patch b/patches/server/0224-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0226-Add-TNTPrimeEvent.patch rename to patches/server/0224-Add-TNTPrimeEvent.patch diff --git a/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 97% rename from patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch index 70d25047c5..dd6bdb1a1e 100644 --- a/patches/server/0227-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a8c48cc286807a742838d372dc6dc2d2bb843f89..b74bee4fa7bd222e5bb707f00aebe437dfa0886a 100644 +index 096a7f51684fa1939a6b1b973fbbffe58775f003..b4bf6e47378ddf4c836479773fe833f1aa321292 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0228-Fix-NBT-type-issues.patch b/patches/server/0226-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0228-Fix-NBT-type-issues.patch rename to patches/server/0226-Fix-NBT-type-issues.patch diff --git a/patches/server/0229-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0227-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0229-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0227-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 97% rename from patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index 27da8072f4..376591dda4 100644 --- a/patches/server/0230-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -43,7 +43,7 @@ index 6f2e316480c4cd1ffb32e8d01009a18c2234c731..42dd9ab70c07e92258da70ad29b51c77 // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getKey(entity.getType())); // CraftBukkit return false; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c2dd3767fbeb7215c9b2703054c9068252828355..d39aec1b3233e91aa5b953396d876e7466a9a5bc 100644 +index ffc3cee1e19a039ef78634b9f94b045be8a2a3f8..50c5ad0eea45c1828b9a1c6c47727e4800940252 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -245,6 +245,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 96% rename from patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch index b0978f4a22..404d2e0141 100644 --- a/patches/server/0231-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/patches/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch @@ -9,10 +9,10 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8f5eaecb0bda3c4d69bb077ca727458f3f190f44..5fe925b85a7783e3b972d24e01cfe4a4b878dd38 100644 +index 2ae6eb3a05bd0574143699e1286f63f5fd699f30..6d871dd9bc4a954046f03f0911003e3fb2d4dfd6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1104,6 +1104,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4c0afa2589606d2748e54961f2a25e28a5309073..bea2c72cf0f4bed73984cde8f7d06cef797cd769 100644 +index a0801437d631b148d435b3700e60f97f95e2bb92..7076801dce113004b255866c659bdc5e29d8e951 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2133,6 +2133,21 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0262-Add-more-Witch-API.patch b/patches/server/0260-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0262-Add-more-Witch-API.patch rename to patches/server/0260-Add-more-Witch-API.patch diff --git a/patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0263-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 98% rename from patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch index 278991d650..5a51e81fb4 100644 --- a/patches/server/0264-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b74bee4fa7bd222e5bb707f00aebe437dfa0886a..2cfd937f30e481038483a6ba2c552f5da316c66e 100644 +index b4bf6e47378ddf4c836479773fe833f1aa321292..c5a9bd1d5dcf96d0b206de48000ebf63f7a0fcb1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -494,9 +494,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0265-Reset-players-airTicks-on-respawn.patch b/patches/server/0263-Reset-players-airTicks-on-respawn.patch similarity index 90% rename from patches/server/0265-Reset-players-airTicks-on-respawn.patch rename to patches/server/0263-Reset-players-airTicks-on-respawn.patch index 0754da0a5c..7259a2564f 100644 --- a/patches/server/0265-Reset-players-airTicks-on-respawn.patch +++ b/patches/server/0263-Reset-players-airTicks-on-respawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bea2c72cf0f4bed73984cde8f7d06cef797cd769..91ce1788e2a019c15fba2daf9ee383618f874fd4 100644 +index 7076801dce113004b255866c659bdc5e29d8e951..665fcf8382fbcb214eda16dae9e40e33e257ec6f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2624,6 +2624,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0266-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 97% rename from patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index 5930ac11e6..553a1ab418 100644 --- a/patches/server/0267-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -92,10 +92,10 @@ index cf54e2c8e8aadb9e7343382a5ba59c657234c9b9..c7a21a11efba5c212958d56095217621 return executorService; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 077b2e1d06a4bb0c2ce10274dc6144ee76608d90..9477d6f850b112ff8e835ba5e80d56bc090f9c48 100644 +index 6d871dd9bc4a954046f03f0911003e3fb2d4dfd6..41ffbf38f8bc4423f7670edf86702330f02e488d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -319,6 +319,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { MinecraftServer.LOGGER.error("Uncaught exception in server thread", throwable); }); diff --git a/patches/server/0268-Optimize-World-Time-Updates.patch b/patches/server/0266-Optimize-World-Time-Updates.patch similarity index 94% rename from patches/server/0268-Optimize-World-Time-Updates.patch rename to patches/server/0266-Optimize-World-Time-Updates.patch index 4b1b035dfe..618501d083 100644 --- a/patches/server/0268-Optimize-World-Time-Updates.patch +++ b/patches/server/0266-Optimize-World-Time-Updates.patch @@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9477d6f850b112ff8e835ba5e80d56bc090f9c48..65e9ac5ba7237e97e286953568f28db86d244d1e 100644 +index 41ffbf38f8bc4423f7670edf86702330f02e488d..c543a7e7ef3b26ab610811448b8091894a0a36d5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1538,12 +1538,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index caa7fefab037a24713e9f7f15a541d47bc7655ee..11b1e23ea2a0d4faf7e74d3c9580b7a776ac795b 100644 +index faa228698c7dd60bde0f3767cc27957ece04b8be..f3bce016e729d553aaa6185470bbf4317f94352b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -202,23 +202,27 @@ public class Main { +@@ -203,23 +203,27 @@ public class Main { return; } diff --git a/patches/server/0323-Add-ThrownEggHatchEvent.patch b/patches/server/0321-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0323-Add-ThrownEggHatchEvent.patch rename to patches/server/0321-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0324-Entity-Jump-API.patch b/patches/server/0322-Entity-Jump-API.patch similarity index 97% rename from patches/server/0324-Entity-Jump-API.patch rename to patches/server/0322-Entity-Jump-API.patch index 33973d1d65..2b4b803a54 100644 --- a/patches/server/0324-Entity-Jump-API.patch +++ b/patches/server/0322-Entity-Jump-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Entity Jump API public net.minecraft.world.entity.LivingEntity jumping diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d88b13be2d72cc40c5ca846a55eece1d9ca5fd37..c2934dc1d87bd8211714ab8af8ddfc32695b7953 100644 +index ebdc95a04400ab71a261a1a4fd6e4477ee9d3122..fa9da0e3b9fc579f16c3b05c8c45310940e68d62 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3401,8 +3401,10 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 96% rename from patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch index 21df90e99e..515c726562 100644 --- a/patches/server/0325-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ce2594baa8eb5cfff75a2fb9f3277676a7b08e18..f1b8e3f06db9bef44319c6d53574b1e7188c5931 100644 +index 5bb379251c5af88d4350bd2715147e6442d695fd..f75457a5297fc041de5f2d7eabcc072201a42a09 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -399,6 +399,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0326-Make-the-GUI-graph-fancier.patch b/patches/server/0324-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0326-Make-the-GUI-graph-fancier.patch rename to patches/server/0324-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch similarity index 93% rename from patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch index 17fa73f9af..da943486d3 100644 --- a/patches/server/0327-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e2d74bf7e888b5161b210393e72c484058a3657b..fae07957147ee22a91d5da925e834a0495021958 100644 +index 6d947a11bc94cb8792a3ce0b5314d7226485e8ab..74fc73549b504eb2b7fcaa141aa125f84a077ed9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -401,13 +401,18 @@ public class CraftEventFactory { diff --git a/patches/server/0328-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0326-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0328-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0326-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0329-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0328-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0330-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0328-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0331-Optimise-Chunk-getFluid.patch b/patches/server/0329-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0331-Optimise-Chunk-getFluid.patch rename to patches/server/0329-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0332-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0333-Add-tick-times-API-and-mspt-command.patch b/patches/server/0331-Add-tick-times-API-and-mspt-command.patch similarity index 94% rename from patches/server/0333-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0331-Add-tick-times-API-and-mspt-command.patch index 5596b1d188..130e46cf47 100644 --- a/patches/server/0333-Add-tick-times-API-and-mspt-command.patch +++ b/patches/server/0331-Add-tick-times-API-and-mspt-command.patch @@ -125,10 +125,10 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7 public static void registerCommands(final MinecraftServer server) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 91981ef15a9d8a46681f39ec8cf0f136f9931968..b260b197bc254d22a9fd0f1c2dd799930489c8f7 100644 +index 5d8fb0a781b2f86ab15c7045cd09c58563848848..3788057fa995d11c23f189c39d0554e9ccac0a68 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -255,6 +255,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c2934dc1d87bd8211714ab8af8ddfc32695b7953..a54024b88555bd6a47314dcc42deae1252be7125 100644 +index fa9da0e3b9fc579f16c3b05c8c45310940e68d62..b8ea7830f9dc1b4ee0052bf3b83127c415cc8085 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3512,10 +3512,24 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0348-Implement-Player-Client-Options-API.patch b/patches/server/0346-Implement-Player-Client-Options-API.patch similarity index 98% rename from patches/server/0348-Implement-Player-Client-Options-API.patch rename to patches/server/0346-Implement-Player-Client-Options-API.patch index 48f83018f9..4603218155 100644 --- a/patches/server/0348-Implement-Player-Client-Options-API.patch +++ b/patches/server/0346-Implement-Player-Client-Options-API.patch @@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4492d082b172a8bfc65405bfa73865237d02dd3f..9f74168b0dd9392d2f4164fc7011e98623e28882 100644 +index ce2df5daf3854b541ce0206ea6105c33aad3d010..234b290896ba9dfb36d110740cd0494b0fbfe1e4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -354,7 +354,7 @@ public class ServerPlayer extends Player { @@ -136,7 +136,7 @@ index 4492d082b172a8bfc65405bfa73865237d02dd3f..9f74168b0dd9392d2f4164fc7011e986 this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper this.requestedViewDistance = clientOptions.viewDistance(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4c12ad37d304460ca79033282c52cf851537d1f9..381207e020e5b06cacb98142663db5f2030615ce 100644 +index 6572ca279d8ffe896b852fc138e01816fd28058a..4131b83117e399d7113442def85101d20c493d06 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -651,6 +651,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0349-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch similarity index 98% rename from patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch rename to patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch index f8725ebf87..a771469d23 100644 --- a/patches/server/0350-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch +++ b/patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch @@ -43,7 +43,7 @@ index 66936834a80ef6b645ab44f3439defcb90237bfa..406c78dcb97d954f16f05d379d4dbf74 EntityType entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 9f74168b0dd9392d2f4164fc7011e98623e28882..a8c9a9cea8d527f2bb4393c0539b3c8f3b25e06e 100644 +index 234b290896ba9dfb36d110740cd0494b0fbfe1e4..dde6d567521a08b416ee50b1249b653b0bf6e87a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -284,6 +284,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 98% rename from patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index 3cf5caf32a..0361e80eeb 100644 --- a/patches/server/0351-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -84,7 +84,7 @@ index a4db0bcefc92091ff26b146a2ce914c1d36a3c23..935061ed5c22b48e43d27fe0840cc69f } // Paper end - Entity#getEntitySpawnReason diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f1b8e3f06db9bef44319c6d53574b1e7188c5931..04bd6d6bc6af0e423f56329dc3554b04170932f9 100644 +index f75457a5297fc041de5f2d7eabcc072201a42a09..511208e323b26df24263b87eeb7d2645572d9ff8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2317,27 +2317,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 95% rename from patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch index e96017d4ce..4c9e16dda5 100644 --- a/patches/server/0352-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a54024b88555bd6a47314dcc42deae1252be7125..022ff3f125b7fe4f59b8c4bf75533d9b6cac4189 100644 +index b8ea7830f9dc1b4ee0052bf3b83127c415cc8085..2f3615cb8e4206ed2eb87c1341de4258879d3907 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2264,7 +2264,16 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0353-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0352-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0354-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0352-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0355-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0353-Fix-item-duplication-and-teleport-issues.patch similarity index 100% rename from patches/server/0355-Fix-item-duplication-and-teleport-issues.patch rename to patches/server/0353-Fix-item-duplication-and-teleport-issues.patch diff --git a/patches/server/0356-Villager-Restocks-API.patch b/patches/server/0354-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0356-Villager-Restocks-API.patch rename to patches/server/0354-Villager-Restocks-API.patch diff --git a/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 95% rename from patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch index 03ebc55195..aa5fcfc6ac 100644 --- a/patches/server/0357-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fedc4654178a3771004394665914efd2b842432a..b3026d2c70419a9de11f5887cbc998f29b7820eb 100644 +index e728b9f317d12c3c452db70ba7d1e930c84e345d..7277c9b82c127cd38db2daec3df4d33e8376b8dc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -892,7 +892,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 91% rename from patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index a5ad213696..44bd324f68 100644 --- a/patches/server/0359-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,10 +17,10 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cc4f7f5bdb6b930af4130dc775e4ed754be87783..90911cd3ba86e02baf8684099f0762fab563581c 100644 +index f3bce016e729d553aaa6185470bbf4317f94352b..02243b69cca7255588b43dab57e1c9ca4c3ca87f 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java -@@ -26,6 +26,7 @@ public class Main { +@@ -27,6 +27,7 @@ public class Main { } // Paper end // Todo: Installation script diff --git a/patches/server/0360-misc-debugging-dumps.patch b/patches/server/0357-misc-debugging-dumps.patch similarity index 93% rename from patches/server/0360-misc-debugging-dumps.patch rename to patches/server/0357-misc-debugging-dumps.patch index eaf88ad341..759c0ff6fd 100644 --- a/patches/server/0360-misc-debugging-dumps.patch +++ b/patches/server/0357-misc-debugging-dumps.patch @@ -49,10 +49,10 @@ index f15c388434a0a501f86868de35cc138756975027..5044a7dc120c8b040ee23365d2bf97e6 StackTraceElement[] astacktraceelement = exception.getStackTrace(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b260b197bc254d22a9fd0f1c2dd799930489c8f7..c0d467cc65c208aa1166a24dec753b1e2b3d995b 100644 +index 3788057fa995d11c23f189c39d0554e9ccac0a68..386f8b825dac6dda253b0c55a3a0eeef5bdca271 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -912,6 +912,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Fri, 1 May 2020 17:39:26 +0300 -Subject: [PATCH] Expose game version - - -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e7a56475d7fdeabe7a864bac06477051ef7aeda8..750c976c596ea149634229754984f2d95682874d 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -579,6 +579,13 @@ public final class CraftServer implements Server { - return this.bukkitVersion; - } - -+ // Paper start - expose game version -+ @Override -+ public String getMinecraftVersion() { -+ return console.getServerVersion(); -+ } -+ // Paper end -+ - @Override - public List getOnlinePlayers() { - return this.playerView; diff --git a/patches/server/0361-Prevent-teleporting-dead-entities.patch b/patches/server/0358-Prevent-teleporting-dead-entities.patch similarity index 93% rename from patches/server/0361-Prevent-teleporting-dead-entities.patch rename to patches/server/0358-Prevent-teleporting-dead-entities.patch index 2820b8f349..034646a8bb 100644 --- a/patches/server/0361-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0358-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b3026d2c70419a9de11f5887cbc998f29b7820eb..b715e7b3230dba24d10230d5e4d8dd5589f93018 100644 +index 7277c9b82c127cd38db2daec3df4d33e8376b8dc..d0ce184da22352b591f4783918104a4c473cc873 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1540,6 +1540,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0362-Implement-Mob-Goal-API.patch b/patches/server/0359-Implement-Mob-Goal-API.patch similarity index 99% rename from patches/server/0362-Implement-Mob-Goal-API.patch rename to patches/server/0359-Implement-Mob-Goal-API.patch index 494c441c11..628d807ab1 100644 --- a/patches/server/0362-Implement-Mob-Goal-API.patch +++ b/patches/server/0359-Implement-Mob-Goal-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API diff --git a/build.gradle.kts b/build.gradle.kts -index 0d757b4a1b5d1bb68a48ec0a398019bf1f64c6a4..cab6f19bb69da3b51bf05fac7075675b2a55564b 100644 +index 2caa4c8e250a7925e7d6f9ba00a95956b5328568..69b5d39f57a63130c0b83f6238898bdf68fa1e9a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -40,6 +40,7 @@ dependencies { +@@ -41,6 +41,7 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") @@ -773,10 +773,10 @@ index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..16f9a98b8a939e5ca7e2dc04f87134a7 LOOK, JUMP, diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c7d95adbd675af54dcd32773ab88c79e829df745..8fa6496605c3f2ac7f16abd0e32190a189d6549a 100644 +index 26bebc3ddd15e963e818011556f216f275bd7415..8e0e38bc85ca97f4c632299affc366ece7e63a52 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2908,5 +2908,11 @@ public final class CraftServer implements Server { +@@ -2903,5 +2903,11 @@ public final class CraftServer implements Server { public boolean isStopping() { return net.minecraft.server.MinecraftServer.getServer().hasStopped(); } diff --git a/patches/server/0363-Add-villager-reputation-API.patch b/patches/server/0360-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0363-Add-villager-reputation-API.patch rename to patches/server/0360-Add-villager-reputation-API.patch diff --git a/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 96% rename from patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch index 6b0e5e5279..ce8ca08ee9 100644 --- a/patches/server/0364-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/patches/server/0361-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f39bfda4487114f5a0a720e328321485839dd790..13147a658bc9c254538632bad12cdc4f0ba67bff 100644 +index ac4a8c9d4f727f3caa16f6dc5497d69f9db52aab..feffc6a539738e584dd6eda8c1f2f5b267f617f6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -703,16 +703,30 @@ public class CraftEventFactory { diff --git a/patches/server/0365-ExperienceOrbMergeEvent.patch b/patches/server/0362-ExperienceOrbMergeEvent.patch similarity index 94% rename from patches/server/0365-ExperienceOrbMergeEvent.patch rename to patches/server/0362-ExperienceOrbMergeEvent.patch index 2d56cb06bf..aad5f90997 100644 --- a/patches/server/0365-ExperienceOrbMergeEvent.patch +++ b/patches/server/0362-ExperienceOrbMergeEvent.patch @@ -9,7 +9,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 13147a658bc9c254538632bad12cdc4f0ba67bff..36999a5c603aef1dc1e79adb2f2f6801899bfacc 100644 +index feffc6a539738e584dd6eda8c1f2f5b267f617f6..1e9835647a0f9eb1e1a264467a62af85af664594 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -712,7 +712,7 @@ public class CraftEventFactory { diff --git a/patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0363-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0366-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0363-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0367-Potential-bed-API.patch b/patches/server/0364-Potential-bed-API.patch similarity index 100% rename from patches/server/0367-Potential-bed-API.patch rename to patches/server/0364-Potential-bed-API.patch diff --git a/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch similarity index 89% rename from patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch index 8175c30658..4df8e38b8b 100644 --- a/patches/server/0368-Wait-for-Async-Tasks-during-shutdown.patch +++ b/patches/server/0365-Wait-for-Async-Tasks-during-shutdown.patch @@ -10,10 +10,10 @@ Adds a 5 second grace period for any async tasks to finish and warns if any are still running after that delay just as reload does. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c0d467cc65c208aa1166a24dec753b1e2b3d995b..6da91e7236ee2d2a0bcbe1f3933b562425ec06a5 100644 +index 386f8b825dac6dda253b0c55a3a0eeef5bdca271..0087e8037e2d30d940e6efa886226e59e8daa98f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -939,6 +939,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index af49ff55865b327c167efedcb7413c270824efe3..e6422024dd4aa472156d9751dcdeb55b5e210f53 100644 +index c6877df96229eb922fa0d4029f31d9698eab78ab..8576e7919dfaf6a17e6442a2047a7d6bef3b53cb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -665,8 +665,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 95% rename from patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index c69a9ef532..dea556a606 100644 --- a/patches/server/0384-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0381-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -8,10 +8,10 @@ makes it so that the server keeps the last difficulty used instead of restoring the server.properties every single load. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6da91e7236ee2d2a0bcbe1f3933b562425ec06a5..44521086adbb9db6574045414c7b23a4dde22387 100644 +index 0087e8037e2d30d940e6efa886226e59e8daa98f..a7de512a019a51d3133d4304b9ef80a6b6b6b80d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -833,7 +833,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 2303525542daa933a8de5978ac43d16223c6e5fd..3fe60f5ee38ecb704194a8c2dd6e40c5bb57d9cc 100644 +index 9953b6b36cbcbfd1756bac478b568ca5700fc898..21ad2f461a5a578a2bf7fec1deeb421071245e6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -721,4 +721,19 @@ public class CraftBlockData implements BlockData { diff --git a/patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0444-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0447-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0444-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0448-Add-LivingEntity-clearActiveItem.patch b/patches/server/0445-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0448-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0445-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0449-Add-PlayerItemCooldownEvent.patch b/patches/server/0446-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0449-Add-PlayerItemCooldownEvent.patch rename to patches/server/0446-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0447-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0450-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0447-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0451-More-lightning-API.patch b/patches/server/0448-More-lightning-API.patch similarity index 100% rename from patches/server/0451-More-lightning-API.patch rename to patches/server/0448-More-lightning-API.patch diff --git a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 96% rename from patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch index c2f72432f5..d5cd7c6469 100644 --- a/patches/server/0452-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0449-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bbce55b02f848be720ad95cb5b896ff9ad1f66d0..717d596b2479a66861a83445ed87f40c7c0f69d8 100644 +index 81c9f06bdba9eb51c9ee3d1d969f8d8e6302a70f..3bc4b964d49d7de789506a482de9eb700051a2b8 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2011,6 +2011,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -44,7 +44,7 @@ index ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb..e382a29b441b656f35bc24cb90f95cb4 } else if (entity.level().isClientSide && (!(entity1 instanceof Player) || !((Player) entity1).isLocalPlayer())) { return false; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 81838056cacb9f2fd2d3c05b125461ac3013e82b..636bef0624f71dea27cbab261c3072fdf73fbf4b 100644 +index 4bf48ce1824e404906a551ceec720c8e485adb44..48f772bcbc207c07aef9d28011ff935b58f8c381 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3540,7 +3540,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -116,7 +116,7 @@ index bff2627aa0c2cc48020e65c71a5862ab6e995f99..d53ef42e64d87790ea86d806153f0470 } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index bf717b5bcd14291a99414eae5366c0b91ce68a68..b1b0b0554e0ad035463fd53aa440d9c079b7cfb4 100644 +index e1f6853c450a2e6a0d7607f1faec7bc5c82d9621..767f076c6fad7a1146bc409bf47f1d2fc3caf3ce 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -350,7 +350,7 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0453-Add-missing-default-perms-for-commands.patch b/patches/server/0450-Add-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0453-Add-missing-default-perms-for-commands.patch rename to patches/server/0450-Add-missing-default-perms-for-commands.patch diff --git a/patches/server/0454-Add-PlayerShearBlockEvent.patch b/patches/server/0451-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0454-Add-PlayerShearBlockEvent.patch rename to patches/server/0451-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0455-Limit-recipe-packets.patch b/patches/server/0452-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0455-Limit-recipe-packets.patch rename to patches/server/0452-Limit-recipe-packets.patch diff --git a/patches/server/0456-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0453-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0456-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0453-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0457-Player-Chunk-Load-Unload-Events.patch b/patches/server/0454-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0457-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0454-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0455-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0458-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0455-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0459-Expose-LivingEntity-hurt-direction.patch b/patches/server/0456-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0459-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0456-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0457-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 91% rename from patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0457-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index ca3ce280b4..d6bcac37e8 100644 --- a/patches/server/0460-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0457-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f0e1bb3d9e4254d2c32f28fb715ea429c7646cec..253563371aa05954c19607b98675e37450e772ef 100644 +index 737fbe02c630da0a95dbed49ff152fb5c7ec4d37..e55dafab2f986e445d9499cecd346bc96673bc9c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -302,6 +302,10 @@ public class CraftEventFactory { diff --git a/patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0458-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch similarity index 100% rename from patches/server/0461-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch rename to patches/server/0458-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch diff --git a/patches/server/0462-Add-TargetHitEvent.patch b/patches/server/0459-Add-TargetHitEvent.patch similarity index 100% rename from patches/server/0462-Add-TargetHitEvent.patch rename to patches/server/0459-Add-TargetHitEvent.patch diff --git a/patches/server/0463-MC-4-Fix-item-position-desync.patch b/patches/server/0460-MC-4-Fix-item-position-desync.patch similarity index 96% rename from patches/server/0463-MC-4-Fix-item-position-desync.patch rename to patches/server/0460-MC-4-Fix-item-position-desync.patch index 56d177e95e..c30714f374 100644 --- a/patches/server/0463-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0460-MC-4-Fix-item-position-desync.patch @@ -28,7 +28,7 @@ index ffec3deb9bcd31d51974c1deda2e76bc8374e5c5..a3d247c93ac1a2d872ff0e3841efc3d7 public Vec3 decode(long x, long y, long z) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 717d596b2479a66861a83445ed87f40c7c0f69d8..31911870e5056391d67c49fa68d59010534bf35f 100644 +index 3bc4b964d49d7de789506a482de9eb700051a2b8..67dd20b6fae2ee39eaae3286eba7b485a6dd41cc 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4212,6 +4212,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0464-Additional-Block-Material-API.patch b/patches/server/0461-Additional-Block-Material-API.patch similarity index 100% rename from patches/server/0464-Additional-Block-Material-API.patch rename to patches/server/0461-Additional-Block-Material-API.patch diff --git a/patches/server/0465-Fix-harming-potion-dupe.patch b/patches/server/0462-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0465-Fix-harming-potion-dupe.patch rename to patches/server/0462-Fix-harming-potion-dupe.patch diff --git a/patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0463-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/server/0466-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/server/0463-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0464-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0467-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0464-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0465-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0468-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0465-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0466-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0469-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0466-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch similarity index 97% rename from patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch rename to patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch index 7781f60252..96d7a637db 100644 --- a/patches/server/0470-Fix-interact-event-not-being-called-sometimes.patch +++ b/patches/server/0467-Fix-interact-event-not-being-called-sometimes.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes Co-authored-by: Moulberry diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7ea22e99de646f439ae738354c1336b11a4c542f..1d71aa9237ee17b009568f6d67f900ffe64ff301 100644 +index 35c8aa3971de05be66acd49b6a0b76cba59f93ac..362bd15dc359762095bdc5120a25460227a0175e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1759,7 +1759,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0471-Zombie-API-breaking-doors.patch b/patches/server/0468-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0471-Zombie-API-breaking-doors.patch rename to patches/server/0468-Zombie-API-breaking-doors.patch diff --git a/patches/server/0472-Fix-nerfed-slime-when-splitting.patch b/patches/server/0469-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0472-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0469-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0473-Add-EntityLoadCrossbowEvent.patch b/patches/server/0470-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0473-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0470-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0474-Add-WorldGameRuleChangeEvent.patch b/patches/server/0471-Add-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0474-Add-WorldGameRuleChangeEvent.patch rename to patches/server/0471-Add-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0475-Add-ServerResourcesReloadedEvent.patch b/patches/server/0472-Add-ServerResourcesReloadedEvent.patch similarity index 94% rename from patches/server/0475-Add-ServerResourcesReloadedEvent.patch rename to patches/server/0472-Add-ServerResourcesReloadedEvent.patch index 05289f3429..b7df3b9934 100644 --- a/patches/server/0475-Add-ServerResourcesReloadedEvent.patch +++ b/patches/server/0472-Add-ServerResourcesReloadedEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a3e5b5075ff8097479689bf5cff66cdf93014128..7a12028ab83cb6162a7f5d7e22c52af0853b79ee 100644 +index 58a208501fc8e23b0bfe977e4b4964ac8e3c238f..d86f01599b02626c72ad0b8da0b6b9d741f8c894 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2097,7 +2097,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop completablefuture = CompletableFuture.supplyAsync(() -> { Stream stream = dataPacks.stream(); // CraftBukkit - decompile error PackRepository resourcepackrepository = this.packRepository; -@@ -2129,6 +2135,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop worlds = new LinkedHashMap(); @@ -801,7 +801,7 @@ index a25fd6ad9438bd80a9acc21d694d9e9129f4a897..85bad6c85c1662a0693765e235d3b573 private YamlConfiguration configuration; private YamlConfiguration commandsConfiguration; private final Yaml yaml = new Yaml(new SafeConstructor(new LoaderOptions())); -@@ -2694,7 +2694,7 @@ public final class CraftServer implements Server { +@@ -2689,7 +2689,7 @@ public final class CraftServer implements Server { @Override public Registry getRegistry(Class aClass) { diff --git a/patches/server/0486-Add-StructuresLocateEvent.patch b/patches/server/0483-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0486-Add-StructuresLocateEvent.patch rename to patches/server/0483-Add-StructuresLocateEvent.patch diff --git a/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch similarity index 97% rename from patches/server/0487-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0484-Collision-option-for-requiring-a-player-participant.patch index 8d8ebfc1f4..0f66837ab0 100644 --- a/patches/server/0487-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0484-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 31911870e5056391d67c49fa68d59010534bf35f..04581cd90272775208a0192ef36f9c7458ad3a0c 100644 +index 67dd20b6fae2ee39eaae3286eba7b485a6dd41cc..eb5cc58e5b53407de5d2a0ddcbbfbc7cdd3bb072 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1872,6 +1872,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0488-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0485-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0486-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0489-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0486-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0490-Make-schedule-command-per-world.patch b/patches/server/0487-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0490-Make-schedule-command-per-world.patch rename to patches/server/0487-Make-schedule-command-per-world.patch diff --git a/patches/server/0491-Configurable-max-leash-distance.patch b/patches/server/0488-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0491-Configurable-max-leash-distance.patch rename to patches/server/0488-Configurable-max-leash-distance.patch diff --git a/patches/server/0492-Add-BlockPreDispenseEvent.patch b/patches/server/0489-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0492-Add-BlockPreDispenseEvent.patch rename to patches/server/0489-Add-BlockPreDispenseEvent.patch diff --git a/patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0490-Add-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0493-Add-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0490-Add-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0491-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0494-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0491-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0492-Add-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0495-Add-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0492-Add-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0496-Expand-EntityUnleashEvent.patch b/patches/server/0493-Expand-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0496-Expand-EntityUnleashEvent.patch rename to patches/server/0493-Expand-EntityUnleashEvent.patch diff --git a/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0494-Reset-shield-blocking-on-dimension-change.patch similarity index 90% rename from patches/server/0497-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0494-Reset-shield-blocking-on-dimension-change.patch index c33708022d..5125656c21 100644 --- a/patches/server/0497-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0494-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c4ba4b378aee28e7479207aff46c27307bd6b105..7eab41ac49707a52adcfd6fb3c3d70cff3a4ad1b 100644 +index 89aa23a4443311771775adc2e98cb78c4bb369a5..f920c134716620c69d31a88e2ad0ee1e7e2431b0 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1275,6 +1275,11 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0498-Add-DragonEggFormEvent.patch b/patches/server/0495-Add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0498-Add-DragonEggFormEvent.patch rename to patches/server/0495-Add-DragonEggFormEvent.patch diff --git a/patches/server/0499-Add-EntityMoveEvent.patch b/patches/server/0496-Add-EntityMoveEvent.patch similarity index 93% rename from patches/server/0499-Add-EntityMoveEvent.patch rename to patches/server/0496-Add-EntityMoveEvent.patch index 5f87e7e8ec..d88e5489cc 100644 --- a/patches/server/0499-Add-EntityMoveEvent.patch +++ b/patches/server/0496-Add-EntityMoveEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityMoveEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7a12028ab83cb6162a7f5d7e22c52af0853b79ee..784bcb1a504482bafcccfe57f72186e5322253ae 100644 +index d86f01599b02626c72ad0b8da0b6b9d741f8c894..a9851d2c6d89e30f40da35586ac3dddfa72ba421 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1583,6 +1583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent @@ -29,7 +29,7 @@ index a9a39c99874001f1024f71bfc97130e8c9a507e7..19333b61bcb50f2171ac2c75d7f4ca4f public LevelChunk getChunkIfLoaded(int x, int z) { return this.chunkSource.getChunk(x, z, false); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 636bef0624f71dea27cbab261c3072fdf73fbf4b..df0286a972dfa4e3b4c1898f8936062aaf3cdde6 100644 +index 48f772bcbc207c07aef9d28011ff935b58f8c381..f523514e65039b0683617653625c2c33559d9874 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3477,6 +3477,20 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0497-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0500-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0497-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0501-Inline-shift-direction-fields.patch b/patches/server/0498-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0501-Inline-shift-direction-fields.patch rename to patches/server/0498-Inline-shift-direction-fields.patch diff --git a/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0499-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 95% rename from patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0499-Allow-adding-items-to-BlockDropItemEvent.patch index ea45c33555..1a444afd42 100644 --- a/patches/server/0502-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0499-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index dadb4f13ec6b9915108603aa34d4112c47337c44..ea9a12ff01203072975bb2f22a077d1d2e46376f 100644 +index 0c2e8921d1048cb138a48215853c04c5d73f3514..dbb7b8e93c1773058c78de71a3e6e3559eb0a46b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -451,13 +451,30 @@ public class CraftEventFactory { diff --git a/patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0500-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0503-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0500-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0504-living-entity-allow-attribute-registration.patch b/patches/server/0501-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0504-living-entity-allow-attribute-registration.patch rename to patches/server/0501-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0505-fix-dead-slime-setSize-invincibility.patch b/patches/server/0502-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0505-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0502-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0503-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0506-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0503-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0507-Expose-Tracked-Players.patch b/patches/server/0504-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0507-Expose-Tracked-Players.patch rename to patches/server/0504-Expose-Tracked-Players.patch diff --git a/patches/server/0508-Improve-ServerGUI.patch b/patches/server/0505-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0508-Improve-ServerGUI.patch rename to patches/server/0505-Improve-ServerGUI.patch diff --git a/patches/server/0509-fix-converting-txt-to-json-file.patch b/patches/server/0506-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0509-fix-converting-txt-to-json-file.patch rename to patches/server/0506-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0510-Add-worldborder-events.patch b/patches/server/0507-Add-worldborder-events.patch similarity index 100% rename from patches/server/0510-Add-worldborder-events.patch rename to patches/server/0507-Add-worldborder-events.patch diff --git a/patches/server/0511-Add-PlayerNameEntityEvent.patch b/patches/server/0508-Add-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0511-Add-PlayerNameEntityEvent.patch rename to patches/server/0508-Add-PlayerNameEntityEvent.patch diff --git a/patches/server/0512-Add-recipe-to-cook-events.patch b/patches/server/0509-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0512-Add-recipe-to-cook-events.patch rename to patches/server/0509-Add-recipe-to-cook-events.patch diff --git a/patches/server/0513-Add-Block-isValidTool.patch b/patches/server/0510-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0513-Add-Block-isValidTool.patch rename to patches/server/0510-Add-Block-isValidTool.patch diff --git a/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0511-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0514-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0511-Allow-using-signs-inside-spawn-protection.patch index fba8a91080..560f3be3dd 100644 --- a/patches/server/0514-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0511-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1d71aa9237ee17b009568f6d67f900ffe64ff301..e385bad877dd7ab529e67a7dced5b53a0f55d795 100644 +index 362bd15dc359762095bdc5120a25460227a0175e..55c311ddc8add7d5838d112bc3a71baeb52356a8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1747,8 +1747,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0515-Expand-world-key-API.patch b/patches/server/0512-Expand-world-key-API.patch similarity index 91% rename from patches/server/0515-Expand-world-key-API.patch rename to patches/server/0512-Expand-world-key-API.patch index 4822c7f48e..616d224ea3 100644 --- a/patches/server/0515-Expand-world-key-API.patch +++ b/patches/server/0512-Expand-world-key-API.patch @@ -20,10 +20,10 @@ index 9801f78f1d44fd5a72fbdb319681b683e8fb85c4..1e720b96f0367652db6924b8654deaa9 // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e999b58830 100644 +index 1f4efb4ee9454b3115607f4e1f05d0b03f20c882..1f6218e580a2a0138d128940a709147c20354b39 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1150,9 +1150,15 @@ public final class CraftServer implements Server { +@@ -1145,9 +1145,15 @@ public final class CraftServer implements Server { File folder = new File(this.getWorldContainer(), name); World world = this.getWorld(name); @@ -41,7 +41,7 @@ index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e9 if (folder.exists()) { Preconditions.checkArgument(folder.isDirectory(), "File (%s) exists and isn't a folder", name); -@@ -1278,7 +1284,7 @@ public final class CraftServer implements Server { +@@ -1273,7 +1279,7 @@ public final class CraftServer implements Server { } else if (name.equals(levelName + "_the_end")) { worldKey = net.minecraft.world.level.Level.END; } else { @@ -50,7 +50,7 @@ index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e9 } // If set to not keep spawn in memory (changed from default) then adjust rule accordingly -@@ -1374,6 +1380,15 @@ public final class CraftServer implements Server { +@@ -1369,6 +1375,15 @@ public final class CraftServer implements Server { return null; } @@ -67,7 +67,7 @@ index ab9c9f62da229faadddd68560db41d9f5e46689d..31602e41b9c5370f583cc8a22f15a4e9 // Check if a World already exists with the UID. if (this.getWorld(world.getUID()) != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 336a245395f8802a1ed1d9e2f615effda85fc947..dc9742e553632cdc760ba1b392f60643a025a922 100644 +index d3723fa5f64d0c12867d57c44513db08f6eed599..7e8bd8204dcdc64897464331c99eae25b127d30c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -540,6 +540,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0513-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0516-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0513-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0514-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0517-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0514-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0515-forced-whitelist-use-configurable-kick-message.patch similarity index 87% rename from patches/server/0518-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0515-forced-whitelist-use-configurable-kick-message.patch index 484e77b357..9e79f88fe6 100644 --- a/patches/server/0518-forced-whitelist-use-configurable-kick-message.patch +++ b/patches/server/0515-forced-whitelist-use-configurable-kick-message.patch @@ -5,10 +5,10 @@ Subject: [PATCH] forced whitelist: use configurable kick message diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 784bcb1a504482bafcccfe57f72186e5322253ae..e31b5775b00148b6e8ac9545e589a87987a8b377 100644 +index a9851d2c6d89e30f40da35586ac3dddfa72ba421..7353beeea3f1e02d62a4d2456124edcf723371f3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2269,7 +2269,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop playerView; public int reloadCount; @@ -103,7 +103,7 @@ index 31602e41b9c5370f583cc8a22f15a4e999b58830..fb6f176e37583443c4f67121a46a52b1 public static Exception excessiveVelEx; // Paper - Velocity warnings static { -@@ -388,6 +389,7 @@ public final class CraftServer implements Server { +@@ -383,6 +384,7 @@ public final class CraftServer implements Server { if (this.configuration.getBoolean("settings.use-map-color-cache")) { MapPalette.setMapColorCache(new CraftMapColorCache(this.logger)); } @@ -111,7 +111,7 @@ index 31602e41b9c5370f583cc8a22f15a4e999b58830..fb6f176e37583443c4f67121a46a52b1 } public boolean getCommandBlockOverride(String command) { -@@ -2976,5 +2978,11 @@ public final class CraftServer implements Server { +@@ -2971,5 +2973,11 @@ public final class CraftServer implements Server { public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return mobGoals; } diff --git a/patches/server/0545-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0542-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0545-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0542-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0546-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0543-Expand-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0546-Expand-PlayerGameModeChangeEvent.patch rename to patches/server/0543-Expand-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0547-ItemStack-repair-check-API.patch b/patches/server/0544-ItemStack-repair-check-API.patch similarity index 97% rename from patches/server/0547-ItemStack-repair-check-API.patch rename to patches/server/0544-ItemStack-repair-check-API.patch index bbd81a3f7b..395fa0fb11 100644 --- a/patches/server/0547-ItemStack-repair-check-API.patch +++ b/patches/server/0544-ItemStack-repair-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack repair check API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 12446063a6c0f6c6f15a6a6500e76a99f5214001..df929851d75c9aafc4027a1b57732b660703561f 100644 +index 28f8a85c35c9c160bb223b8cd4245949b259dd5c..952a8147947fa0e2a960628fc760212d3d206ce6 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -550,6 +550,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0548-More-Enchantment-API.patch b/patches/server/0545-More-Enchantment-API.patch similarity index 100% rename from patches/server/0548-More-Enchantment-API.patch rename to patches/server/0545-More-Enchantment-API.patch diff --git a/patches/server/0549-Move-range-check-for-block-placing-up.patch b/patches/server/0546-Move-range-check-for-block-placing-up.patch similarity index 92% rename from patches/server/0549-Move-range-check-for-block-placing-up.patch rename to patches/server/0546-Move-range-check-for-block-placing-up.patch index ecccee748f..44913b8c49 100644 --- a/patches/server/0549-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0546-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3a6769fec9bae32209d2b126a10d99fd1b8dd4b7..a2a4f30ed2a524fc8b86e0ffbc9d6aa49e557e44 100644 +index 4a5553335cd6bbad8d3a05694710d95c96f62b9d..a04c7677ded862890e6e809db610817b4cfff56a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1734,6 +1734,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0550-Add-Mob-lookAt-API.patch b/patches/server/0547-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0550-Add-Mob-lookAt-API.patch rename to patches/server/0547-Add-Mob-lookAt-API.patch diff --git a/patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0548-Correctly-check-if-bucket-dispenses-will-succeed-for.patch similarity index 100% rename from patches/server/0551-Correctly-check-if-bucket-dispenses-will-succeed-for.patch rename to patches/server/0548-Correctly-check-if-bucket-dispenses-will-succeed-for.patch diff --git a/patches/server/0552-Add-Unix-domain-socket-support.patch b/patches/server/0549-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0552-Add-Unix-domain-socket-support.patch rename to patches/server/0549-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0553-Add-EntityInsideBlockEvent.patch b/patches/server/0550-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0553-Add-EntityInsideBlockEvent.patch rename to patches/server/0550-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0554-Fix-item-default-attributes-API.patch b/patches/server/0551-Fix-item-default-attributes-API.patch similarity index 95% rename from patches/server/0554-Fix-item-default-attributes-API.patch rename to patches/server/0551-Fix-item-default-attributes-API.patch index 88ba63397d..7bc3c4f579 100644 --- a/patches/server/0554-Fix-item-default-attributes-API.patch +++ b/patches/server/0551-Fix-item-default-attributes-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix item default attributes API (previously added this API but upstream also added it) diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index df929851d75c9aafc4027a1b57732b660703561f..0a6f78b5e08fffc782b51f19f42a53cad9287334 100644 +index 952a8147947fa0e2a960628fc760212d3d206ce6..27acc1965e16d697fa98f64cf64ecc6ecd775e86 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -399,9 +399,14 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 98% rename from patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch index d1e76737e3..d1900e480d 100644 --- a/patches/server/0555-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0552-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 714968021716fa7cee9ba0b47204d126fb8272fb..d4e73445f680a283cda9a1e4b823efcd389a84ed 100644 +index 3816b445279fcd562acc06f08b8cd04bffa49592..3e935df2de58bd57b061c33b00f9d2ea4134ca80 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -440,8 +440,8 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0556-More-Lidded-Block-API.patch b/patches/server/0553-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0556-More-Lidded-Block-API.patch rename to patches/server/0553-More-Lidded-Block-API.patch diff --git a/patches/server/0557-Limit-item-frame-cursors-on-maps.patch b/patches/server/0554-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0557-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0554-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0558-Add-PlayerKickEvent-causes.patch b/patches/server/0555-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0558-Add-PlayerKickEvent-causes.patch rename to patches/server/0555-Add-PlayerKickEvent-causes.patch index 4b24ab2ce3..bdba1e0e95 100644 --- a/patches/server/0558-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0555-Add-PlayerKickEvent-causes.patch @@ -43,10 +43,10 @@ index dbcf183483766f39334d7f7e8336033906625f3f..300929a406905f5ff1ede664d5b99fb0 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e31b5775b00148b6e8ac9545e589a87987a8b377..718a455aa70999a339cccc51d6fc4bb689c2c27b 100644 +index 7353beeea3f1e02d62a4d2456124edcf723371f3..2986dc458ddbd642669c6c2c104df2a2446e5b11 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2269,7 +2269,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index dde1d3850af610241e1f76a194efe1a58dc96bd5..8ac5d8ccf731100a1be690cb2ed1be82cadba8ed 100644 +index 7659a3f50f5a90814dc7331ea00d6251dcf32600..308aef9c4933b2bcdd622a34b68efab4a220fe4d 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -109,6 +109,11 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -50,7 +50,7 @@ index dde1d3850af610241e1f76a194efe1a58dc96bd5..8ac5d8ccf731100a1be690cb2ed1be82 MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 23e3df2eaecde15cf4726a5adc25c883cc0dca11..f8a833ccae35db5e04871fa100ddc45044f4642a 100644 +index dd3767f482929d7d8105a4164c27651099935a89..5ba7340d3860975b826dc878385e0879a9f07957 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1878,6 +1878,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0577-Don-t-apply-cramming-damage-to-players.patch similarity index 94% rename from patches/server/0580-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0577-Don-t-apply-cramming-damage-to-players.patch index 8a1b8eb465..4fc24e4549 100644 --- a/patches/server/0580-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0577-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d3f3eed67557b362c0f51a83967f60276283d3ea..ff5d24f6afd224496dd1902497497483ec7fc24d 100644 +index 25e4521676e55a876ac27d8cbe4fdb2ddc9bf5e5..1be3c03022f8fb14d536981d4dc688c541f528ad 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -98,6 +98,7 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0578-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0581-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0578-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0582-Add-missing-forceDrop-toggles.patch b/patches/server/0579-Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0582-Add-missing-forceDrop-toggles.patch rename to patches/server/0579-Add-missing-forceDrop-toggles.patch diff --git a/patches/server/0583-Stinger-API.patch b/patches/server/0580-Stinger-API.patch similarity index 100% rename from patches/server/0583-Stinger-API.patch rename to patches/server/0580-Stinger-API.patch diff --git a/patches/server/0584-Add-System.out-err-catcher.patch b/patches/server/0581-Add-System.out-err-catcher.patch similarity index 97% rename from patches/server/0584-Add-System.out-err-catcher.patch rename to patches/server/0581-Add-System.out-err-catcher.patch index 7ebe01fa1d..e4d4fc106a 100644 --- a/patches/server/0584-Add-System.out-err-catcher.patch +++ b/patches/server/0581-Add-System.out-err-catcher.patch @@ -105,10 +105,10 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fb6f176e37583443c4f67121a46a52b17b7d625a..2260ce0e705d8ba5b4d2c2ebaac09deb43ec9af0 100644 +index c4e63ba96a54fb9e1353510f77d848bed3656405..ceb18ee56a99f56997f09e9d6dd01b8b58194430 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -308,6 +308,7 @@ public final class CraftServer implements Server { +@@ -303,6 +303,7 @@ public final class CraftServer implements Server { public int reloadCount; private final io.papermc.paper.datapack.PaperDatapackManager datapackManager; // Paper public static Exception excessiveVelEx; // Paper - Velocity warnings diff --git a/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0582-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0582-Prevent-AFK-kick-while-watching-end-credits.patch index c0ffba11ed..92d95bf1df 100644 --- a/patches/server/0585-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0582-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f8a833ccae35db5e04871fa100ddc45044f4642a..8c44644a9118ef0a5013fb71031de82a43831911 100644 +index 5ba7340d3860975b826dc878385e0879a9f07957..40d2c7bfc8ba8b8b366f23e53cf37f331e19ccf7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -397,7 +397,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0583-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0586-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0583-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0587-Add-PlayerSetSpawnEvent.patch b/patches/server/0584-Add-PlayerSetSpawnEvent.patch similarity index 97% rename from patches/server/0587-Add-PlayerSetSpawnEvent.patch rename to patches/server/0584-Add-PlayerSetSpawnEvent.patch index 1bc05bf134..95276bf07f 100644 --- a/patches/server/0587-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0584-Add-PlayerSetSpawnEvent.patch @@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ff5d24f6afd224496dd1902497497483ec7fc24d..22f9b40e2c9a71f8944b1738e91ee2e189a77cec 100644 +index 1be3c03022f8fb14d536981d4dc688c541f528ad..093cfac173d35ab8b7b459edad9be7c3d6e5b340 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1384,7 +1384,7 @@ public class ServerPlayer extends Player { @@ -167,7 +167,7 @@ index 2b7ad2b9cd525814c9f91d22606c42aa82ce9f94..d7bbdcc97745246718c92c9aba56d9f9 } diff --git a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java -index 3cfe325f14b6b184517de7c6982f54e0895b1eb8..be85535767bc79875c38da78a209d33d4be87c8a 100644 +index ba22ad1e4253477572d10d71db6db0ebc14d6755..94d067e9eeee73183de25165d8c97043fe256103 100644 --- a/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java +++ b/src/main/java/net/minecraft/world/level/block/RespawnAnchorBlock.java @@ -89,9 +89,14 @@ public class RespawnAnchorBlock extends Block { @@ -187,7 +187,7 @@ index 3cfe325f14b6b184517de7c6982f54e0895b1eb8..be85535767bc79875c38da78a209d33d } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1cbf70e8f238a3e67f27d86b9f685d5303fa5527..cc6d0b713f839d482dfba8a1e83f927923c9c690 100644 +index 2d173370b69d4caf6b890115a2f7dabc733d0a58..f786981e0d07d116ba901e26ed7c3de34ee9d8ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1399,9 +1399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0585-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0588-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0585-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0589-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0586-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0589-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0586-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0590-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0587-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0590-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0587-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0591-Add-EntityDamageItemEvent.patch b/patches/server/0588-Add-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0591-Add-EntityDamageItemEvent.patch rename to patches/server/0588-Add-EntityDamageItemEvent.patch diff --git a/patches/server/0592-Optimize-indirect-passenger-iteration.patch b/patches/server/0589-Optimize-indirect-passenger-iteration.patch similarity index 96% rename from patches/server/0592-Optimize-indirect-passenger-iteration.patch rename to patches/server/0589-Optimize-indirect-passenger-iteration.patch index f63dee44e9..a3cededc73 100644 --- a/patches/server/0592-Optimize-indirect-passenger-iteration.patch +++ b/patches/server/0589-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aac47d2de2825b46e54ad936a48c96ef7f6703e1..66ddae628d8ccce62aa6937166d719911aef44a2 100644 +index 99cdadb3c84f3b40eaec7ba5df6601a0454f3569..95d5ad9517d57a319970375be37e44ef0e8fb79e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3870,20 +3870,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0590-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0593-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0590-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0594-Clear-bucket-NBT-after-dispense.patch b/patches/server/0591-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0594-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0591-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0592-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0595-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0592-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0596-Add-BlockBreakBlockEvent.patch b/patches/server/0593-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0596-Add-BlockBreakBlockEvent.patch rename to patches/server/0593-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0594-Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/server/0597-Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/server/0594-Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/server/0598-More-CommandBlock-API.patch b/patches/server/0595-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0598-More-CommandBlock-API.patch rename to patches/server/0595-More-CommandBlock-API.patch diff --git a/patches/server/0599-Add-missing-team-sidebar-display-slots.patch b/patches/server/0596-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0599-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0596-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0600-Add-back-EntityPortalExitEvent.patch b/patches/server/0597-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0600-Add-back-EntityPortalExitEvent.patch rename to patches/server/0597-Add-back-EntityPortalExitEvent.patch index 02c52718f6..75fdede002 100644 --- a/patches/server/0600-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0597-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 66ddae628d8ccce62aa6937166d719911aef44a2..dd353bad7ddf7c1e4bbc37ed3724d73696f7b8a7 100644 +index 95d5ad9517d57a319970375be37e44ef0e8fb79e..541789139e9ccb0371a93da989b1f9701fceb034 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3307,6 +3307,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 97% rename from patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch index a6b0c9df56..fdc84ceea1 100644 --- a/patches/server/0601-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0598-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes public net.minecraft.server.level.ServerLevel findLightningRod(Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 6d7b006525068f32549c8f9cccafd821e5a587ce..1f556e53c4fa70c2ecab2181a655020ba7669624 100644 +index eecc5704582ce7c9a45adee8057d8297eae03a86..5cb0281ea110a1ce3444f4392bccbb19ca3bbf09 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -763,6 +763,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0602-Get-entity-default-attributes.patch b/patches/server/0599-Get-entity-default-attributes.patch similarity index 98% rename from patches/server/0602-Get-entity-default-attributes.patch rename to patches/server/0599-Get-entity-default-attributes.patch index ad280f7dbc..197141cc8b 100644 --- a/patches/server/0602-Get-entity-default-attributes.patch +++ b/patches/server/0599-Get-entity-default-attributes.patch @@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..ec9ebd2d539333293c51b7edfa18f18b + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 0a6f78b5e08fffc782b51f19f42a53cad9287334..85fa9ee443e5222551f3c1e9001833eecc2f6c5c 100644 +index 27acc1965e16d697fa98f64cf64ecc6ecd775e86..6bfd5fad899720c853fc4812f50893a6d81f7ea8 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -563,6 +563,18 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0603-Left-handed-API.patch b/patches/server/0600-Left-handed-API.patch similarity index 100% rename from patches/server/0603-Left-handed-API.patch rename to patches/server/0600-Left-handed-API.patch diff --git a/patches/server/0604-Add-more-advancement-API.patch b/patches/server/0601-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0604-Add-more-advancement-API.patch rename to patches/server/0601-Add-more-advancement-API.patch diff --git a/patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0602-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0605-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0602-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0606-Add-critical-damage-API.patch b/patches/server/0603-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0606-Add-critical-damage-API.patch rename to patches/server/0603-Add-critical-damage-API.patch diff --git a/patches/server/0607-Fix-issues-with-mob-conversion.patch b/patches/server/0604-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0607-Fix-issues-with-mob-conversion.patch rename to patches/server/0604-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0608-Add-isCollidable-methods-to-various-places.patch b/patches/server/0605-Add-isCollidable-methods-to-various-places.patch similarity index 96% rename from patches/server/0608-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0605-Add-isCollidable-methods-to-various-places.patch index 7e886726b7..52fd23cf92 100644 --- a/patches/server/0608-Add-isCollidable-methods-to-various-places.patch +++ b/patches/server/0605-Add-isCollidable-methods-to-various-places.patch @@ -39,7 +39,7 @@ index 1002123cd0c6f57cecc4e80f5f21cc6ff5886d37..e96023b71845526383288917e8d7c575 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 85fa9ee443e5222551f3c1e9001833eecc2f6c5c..027825a41d09d40bdd80c9ac37f014f5b45763c9 100644 +index 6bfd5fad899720c853fc4812f50893a6d81f7ea8..3824a02431e3b1d82576937248f2a57f1a0414b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -575,6 +575,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0609-Goat-ram-API.patch b/patches/server/0606-Goat-ram-API.patch similarity index 100% rename from patches/server/0609-Goat-ram-API.patch rename to patches/server/0606-Goat-ram-API.patch diff --git a/patches/server/0610-Add-API-for-resetting-a-single-score.patch b/patches/server/0607-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0610-Add-API-for-resetting-a-single-score.patch rename to patches/server/0607-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch similarity index 98% rename from patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch index f19300b22e..b35e62fbc2 100644 --- a/patches/server/0611-Add-Raw-Byte-Entity-Serialization.patch +++ b/patches/server/0608-Add-Raw-Byte-Entity-Serialization.patch @@ -50,7 +50,7 @@ index 9edcdc71b28cf08e42fbe44723ba540e8d4f7808..a61638bc8200f6aa25d9c3254aea6c0c @Override public boolean isInvisible() { // Paper - moved up from LivingEntity diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 027825a41d09d40bdd80c9ac37f014f5b45763c9..3e88b095260674a8383cc2646fc194c854bcf121 100644 +index 3824a02431e3b1d82576937248f2a57f1a0414b0..a2961166695e5fe4c607c82a490ce67c2e1b5fde 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -513,7 +513,33 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0612-Vanilla-command-permission-fixes.patch b/patches/server/0609-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0612-Vanilla-command-permission-fixes.patch rename to patches/server/0609-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 95% rename from patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 19d821b087..e556bcb3f1 100644 --- a/patches/server/0613-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0610-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -9,7 +9,7 @@ chunk through it. This should also be OK from a leak prevention/ state desync POV because the TE is getting unloaded anyways. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1f556e53c4fa70c2ecab2181a655020ba7669624..efc246d405d58550104bb767a40d296e40b79d70 100644 +index 5cb0281ea110a1ce3444f4392bccbb19ca3bbf09..e611857d9d29e8532b4ea3e0634c8f24a396a190 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1276,9 +1276,13 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -28,7 +28,7 @@ index 1f556e53c4fa70c2ecab2181a655020ba7669624..efc246d405d58550104bb767a40d296e } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 22f9b40e2c9a71f8944b1738e91ee2e189a77cec..c3e8efd58c191ac8f479f8a979e73cc390e881a4 100644 +index 093cfac173d35ab8b7b459edad9be7c3d6e5b340..7ba28e1258006c8f897b7c94cbdf0b87ace12b5e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1675,6 +1675,18 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0614-Fix-GameProfileCache-concurrency.patch b/patches/server/0611-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0614-Fix-GameProfileCache-concurrency.patch rename to patches/server/0611-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0615-Improve-and-expand-AsyncCatcher.patch b/patches/server/0612-Improve-and-expand-AsyncCatcher.patch similarity index 98% rename from patches/server/0615-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0612-Improve-and-expand-AsyncCatcher.patch index f248ef7a0f..860e68a6e6 100644 --- a/patches/server/0615-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0612-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8c44644a9118ef0a5013fb71031de82a43831911..d5796e345b42c427e313130077092cf41c794eaa 100644 +index 40d2c7bfc8ba8b8b366f23e53cf37f331e19ccf7..795e65c7c98d50ff67953ccb1ff68dac0088116e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1565,6 +1565,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -29,7 +29,7 @@ index 8c44644a9118ef0a5013fb71031de82a43831911..d5796e345b42c427e313130077092cf4 if (player.isRemoved()) { LOGGER.info("Attempt to teleport removed player {} restricted", player.getScoreboardName()); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5f9c39b18ab55c80e78ac578de6821fe282c04bb..9cceee5f968d397f27b0618dcc5b5d97ac34b289 100644 +index b4295448819271f5a651e3a3ae83c7ae4014d92f..3f46ca2f03142c3a7bb5928ec092c21491c1fdef 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1147,7 +1147,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch index c6b39416d0..51c5b07b0c 100644 --- a/patches/server/0616-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0613-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -278,10 +278,10 @@ index 58ea6a1f95a09c22125a8262b1b221004ebce0e4..ea6533c1ac218aa075da3401807a06fc BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2260ce0e705d8ba5b4d2c2ebaac09deb43ec9af0..d69037ce1d69b7f67587f9ab71cb9b9b2048f4d8 100644 +index ceb18ee56a99f56997f09e9d6dd01b8b58194430..2e7c206956ded65795f5f2d36acce97381cf80ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2298,6 +2298,11 @@ public final class CraftServer implements Server { +@@ -2293,6 +2293,11 @@ public final class CraftServer implements Server { @Override public int getSpawnLimit(SpawnCategory spawnCategory) { diff --git a/patches/server/0617-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0614-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0617-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0614-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0618-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0615-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0618-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0615-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0616-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0619-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0616-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0617-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0620-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0617-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0618-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0621-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0618-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0619-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/server/0622-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/server/0619-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/server/0623-Time-scoreboard-search.patch b/patches/server/0620-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0623-Time-scoreboard-search.patch rename to patches/server/0620-Time-scoreboard-search.patch diff --git a/patches/server/0624-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0621-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0624-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0621-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0625-Add-missing-InventoryType.patch b/patches/server/0622-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/0625-Add-missing-InventoryType.patch rename to patches/server/0622-Add-missing-InventoryType.patch diff --git a/patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0623-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0626-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0623-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 94% rename from patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch index e17f65772c..11f85426c8 100644 --- a/patches/server/0627-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0624-Fix-merchant-inventory-not-closing-on-entity-removal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index efc246d405d58550104bb767a40d296e40b79d70..dd1f03109a7f8cd65f9e77de94a2a170652ce4ed 100644 +index e611857d9d29e8532b4ea3e0634c8f24a396a190..134df9ad4d5d5f85429f5e3ff6d879bc5f1fb13f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2277,6 +2277,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0625-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0628-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0625-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0626-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 92% rename from patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0626-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 17cdc399d8..1049bf5495 100644 --- a/patches/server/0629-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0626-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d5796e345b42c427e313130077092cf41c794eaa..6cd4acac1c89035ece14f07784a439960ffcfcf5 100644 +index 795e65c7c98d50ff67953ccb1ff68dac0088116e..4ac3e9cacc3c54a67da1547a319fd501ff375354 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -745,6 +745,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0630-Add-packet-limiter-config.patch b/patches/server/0627-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0630-Add-packet-limiter-config.patch rename to patches/server/0627-Add-packet-limiter-config.patch diff --git a/patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0628-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0631-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0628-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0632-Ensure-valid-vehicle-status.patch b/patches/server/0629-Ensure-valid-vehicle-status.patch similarity index 91% rename from patches/server/0632-Ensure-valid-vehicle-status.patch rename to patches/server/0629-Ensure-valid-vehicle-status.patch index 948908a5db..a46a2cb96a 100644 --- a/patches/server/0632-Ensure-valid-vehicle-status.patch +++ b/patches/server/0629-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c3e8efd58c191ac8f479f8a979e73cc390e881a4..e96bd37366ec80cb62a1a4f82c218498b98c9ed9 100644 +index 7ba28e1258006c8f897b7c94cbdf0b87ace12b5e..3f4a881a69b47e99498d4c2e53c9a20367e3887f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -567,7 +567,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0630-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0633-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0630-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0631-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0634-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0631-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0635-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0632-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0635-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0632-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0636-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0633-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0636-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0633-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0637-Preserve-overstacked-loot.patch b/patches/server/0634-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0637-Preserve-overstacked-loot.patch rename to patches/server/0634-Preserve-overstacked-loot.patch diff --git a/patches/server/0638-Update-head-rotation-in-missing-places.patch b/patches/server/0635-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0638-Update-head-rotation-in-missing-places.patch rename to patches/server/0635-Update-head-rotation-in-missing-places.patch index 88e0dccdcb..faed9c97c0 100644 --- a/patches/server/0638-Update-head-rotation-in-missing-places.patch +++ b/patches/server/0635-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index cdb69f4d5d49a2459671fa86dc39d60fdfa62489..24e4db0e80b774e5681e031f56cb7da844656f8f 100644 +index 6b66a9732f8e8b23b8d00beb9822fbb46ac76cab..f6419fe840836c3ff3c577b246d58f820b79fae2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1814,6 +1814,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0639-prevent-unintended-light-block-manipulation.patch b/patches/server/0636-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0639-prevent-unintended-light-block-manipulation.patch rename to patches/server/0636-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0640-Fix-CraftCriteria-defaults-map.patch b/patches/server/0637-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0640-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0637-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0641-Fix-upstreams-block-state-factories.patch b/patches/server/0638-Fix-upstreams-block-state-factories.patch similarity index 99% rename from patches/server/0641-Fix-upstreams-block-state-factories.patch rename to patches/server/0638-Fix-upstreams-block-state-factories.patch index ab5883e950..2b35a7c6b3 100644 --- a/patches/server/0641-Fix-upstreams-block-state-factories.patch +++ b/patches/server/0638-Fix-upstreams-block-state-factories.patch @@ -56,7 +56,7 @@ index 92133f16c192f5caf9962a08401ff914550747f8..397eb1a101bd60f49dbb2fa8eddf28f6 // Paper start @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java -index 83ac5fc6cbbd249b5865ab203b150f53f01c9f05..6a25916aec7c8e0bc5cc18e3e06c6e07e0804380 100644 +index e40973b65ece11d9c5a76abad51f72e610bf02ab..411c2de93c71e480f95229c882cdf43b8801edc8 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java @@ -22,6 +22,7 @@ import net.minecraft.world.level.block.entity.BeehiveBlockEntity; diff --git a/patches/server/0642-Configurable-feature-seeds.patch b/patches/server/0639-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0642-Configurable-feature-seeds.patch rename to patches/server/0639-Configurable-feature-seeds.patch diff --git a/patches/server/0643-Add-root-admin-user-detection.patch b/patches/server/0640-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0643-Add-root-admin-user-detection.patch rename to patches/server/0640-Add-root-admin-user-detection.patch diff --git a/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch index 0a5f77989b..a48c577460 100644 --- a/patches/server/0644-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/server/0641-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 24e4db0e80b774e5681e031f56cb7da844656f8f..555202937152abaabf4b7a6e637c9a290d180ea8 100644 +index f6419fe840836c3ff3c577b246d58f820b79fae2..e4885d1fd68955107e871dd4457df7e468348e15 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -731,7 +731,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0642-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 95% rename from patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0642-Prevent-excessive-velocity-through-repeated-crits.patch index c26ce6b90a..1cd854d74a 100644 --- a/patches/server/0645-Prevent-excessive-velocity-through-repeated-crits.patch +++ b/patches/server/0642-Prevent-excessive-velocity-through-repeated-crits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent excessive velocity through repeated crits diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 9cceee5f968d397f27b0618dcc5b5d97ac34b289..b73601d2903f327b4e7b82ccc6774731c832e941 100644 +index 3f46ca2f03142c3a7bb5928ec092c21491c1fdef..dff6e07de4d447f7d7fe0107928ea0749714ba3e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2754,16 +2754,28 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0643-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0646-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0643-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0647-Fix-Spigot-growth-modifiers.patch b/patches/server/0644-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0647-Fix-Spigot-growth-modifiers.patch rename to patches/server/0644-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0645-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0648-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0645-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0649-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0646-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0649-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0646-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0650-Optimize-HashMapPalette.patch b/patches/server/0647-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0650-Optimize-HashMapPalette.patch rename to patches/server/0647-Optimize-HashMapPalette.patch diff --git a/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 97% rename from patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch index 092085084a..8a1e49766b 100644 --- a/patches/server/0651-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/server/0648-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d69037ce1d69b7f67587f9ab71cb9b9b2048f4d8..75d7293f27d617f6c096d87eb4eb0c7f8de8a0e2 100644 +index 2e7c206956ded65795f5f2d36acce97381cf80ea..1eb46f3ef17f61d887d972e71a982b2ec216ef05 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2483,6 +2483,90 @@ public final class CraftServer implements Server { +@@ -2478,6 +2478,90 @@ public final class CraftServer implements Server { return new OldCraftChunkData(world.getMinHeight(), world.getMaxHeight(), handle.registryAccess().registryOrThrow(Registries.BIOME)); } diff --git a/patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0649-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0652-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0649-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0653-Add-more-Campfire-API.patch b/patches/server/0650-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0653-Add-more-Campfire-API.patch rename to patches/server/0650-Add-more-Campfire-API.patch diff --git a/patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0651-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0654-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0651-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0655-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0652-Forward-CraftEntity-in-teleport-command.patch index fed3943910..72ab28f06a 100644 --- a/patches/server/0655-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 555202937152abaabf4b7a6e637c9a290d180ea8..2e0dc24bf6732637b29e21c8817f0d3502a2a89a 100644 +index e4885d1fd68955107e871dd4457df7e468348e15..b488fe4ddc8a4fad42f45b2a7158766df3a85de4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3279,6 +3279,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0656-Improve-scoreboard-entries.patch b/patches/server/0653-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0656-Improve-scoreboard-entries.patch rename to patches/server/0653-Improve-scoreboard-entries.patch diff --git a/patches/server/0657-Entity-powdered-snow-API.patch b/patches/server/0654-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0657-Entity-powdered-snow-API.patch rename to patches/server/0654-Entity-powdered-snow-API.patch diff --git a/patches/server/0658-Add-API-for-item-entity-health.patch b/patches/server/0655-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0658-Add-API-for-item-entity-health.patch rename to patches/server/0655-Add-API-for-item-entity-health.patch diff --git a/patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0656-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0659-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0656-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0657-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0660-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0657-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0658-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0661-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0658-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0662-Bucketable-API.patch b/patches/server/0659-Bucketable-API.patch similarity index 100% rename from patches/server/0662-Bucketable-API.patch rename to patches/server/0659-Bucketable-API.patch diff --git a/patches/server/0663-Validate-usernames.patch b/patches/server/0660-Validate-usernames.patch similarity index 100% rename from patches/server/0663-Validate-usernames.patch rename to patches/server/0660-Validate-usernames.patch diff --git a/patches/server/0664-Make-water-animal-spawn-height-configurable.patch b/patches/server/0661-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0664-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0661-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 96% rename from patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch index 33d3178f63..0cc3bb1e2b 100644 --- a/patches/server/0665-Expose-vanilla-BiomeProvider-from-WorldInfo.patch +++ b/patches/server/0662-Expose-vanilla-BiomeProvider-from-WorldInfo.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 718a455aa70999a339cccc51d6fc4bb689c2c27b..0a206b9ff1ad235fa0805ad635c1a6caa1d3eafb 100644 +index 2986dc458ddbd642669c6c2c104df2a2446e5b11..533e1225b863ef314b7defebc4787304fd19f5a1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -608,7 +608,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver)); LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey); @@ -18,10 +18,10 @@ index 718a455aa70999a339cccc51d6fc4bb689c2c27b..0a206b9ff1ad235fa0805ad635c1a6ca biomeProvider = gen.getDefaultBiomeProvider(worldInfo); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 75d7293f27d617f6c096d87eb4eb0c7f8de8a0e2..cae178b0b4046815ab64cd4c7c0a48f3eb430aba 100644 +index 1eb46f3ef17f61d887d972e71a982b2ec216ef05..32338b8fa891262801ed45c7b64b306591e060fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1275,7 +1275,7 @@ public final class CraftServer implements Server { +@@ -1270,7 +1270,7 @@ public final class CraftServer implements Server { List list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata)); LevelStem worlddimension = iregistry.get(actualDimension); diff --git a/patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0663-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0666-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0663-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0664-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0667-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/server/0664-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0668-Multiple-Entries-with-Scoreboards.patch b/patches/server/0665-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0668-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0665-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0669-Reset-placed-block-on-exception.patch b/patches/server/0666-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0669-Reset-placed-block-on-exception.patch rename to patches/server/0666-Reset-placed-block-on-exception.patch diff --git a/patches/server/0670-Add-configurable-height-for-slime-spawn.patch b/patches/server/0667-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0670-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0667-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0671-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0668-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0671-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0668-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0672-Multi-Block-Change-API-Implementation.patch b/patches/server/0669-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0672-Multi-Block-Change-API-Implementation.patch rename to patches/server/0669-Multi-Block-Change-API-Implementation.patch index 3eee7a872a..14aac72dbe 100644 --- a/patches/server/0672-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0669-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213 buf.writeLong(this.sectionPos.asLong()); buf.writeVarInt(this.positions.length); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cc6d0b713f839d482dfba8a1e83f927923c9c690..ee31c18ae530cb064ae9d1cc3f3d68312c1f854c 100644 +index f786981e0d07d116ba901e26ed7c3de34ee9d8ea..a7c03ca87bb0d38552ea7a80b97a0ef0af394190 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -928,6 +928,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0673-Fix-NotePlayEvent.patch b/patches/server/0670-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0673-Fix-NotePlayEvent.patch rename to patches/server/0670-Fix-NotePlayEvent.patch diff --git a/patches/server/0674-Freeze-Tick-Lock-API.patch b/patches/server/0671-Freeze-Tick-Lock-API.patch similarity index 95% rename from patches/server/0674-Freeze-Tick-Lock-API.patch rename to patches/server/0671-Freeze-Tick-Lock-API.patch index 80171b8e78..064ef7f8fc 100644 --- a/patches/server/0674-Freeze-Tick-Lock-API.patch +++ b/patches/server/0671-Freeze-Tick-Lock-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Freeze Tick Lock API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 2e0dc24bf6732637b29e21c8817f0d3502a2a89a..8e09bfb7c1b4fb34e6615b0cf774bc8e6cae29fa 100644 +index b488fe4ddc8a4fad42f45b2a7158766df3a85de4..ce21885281a2bca8f363ebc6423ca65df7c13c6d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -407,6 +407,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -46,7 +46,7 @@ index 2e0dc24bf6732637b29e21c8817f0d3502a2a89a..8e09bfb7c1b4fb34e6615b0cf774bc8e } catch (Throwable throwable) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b73601d2903f327b4e7b82ccc6774731c832e941..9e5d1ebcec91c036ab176161b13766ef44f41d59 100644 +index dff6e07de4d447f7d7fe0107928ea0749714ba3e..4444e25adf854f2efdd8b29dba151d03070c3e8c 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3464,7 +3464,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0675-More-PotionEffectType-API.patch b/patches/server/0672-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0675-More-PotionEffectType-API.patch rename to patches/server/0672-More-PotionEffectType-API.patch diff --git a/patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0673-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0676-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0673-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 96% rename from patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch index 1b3cb28843..3f3181fdc7 100644 --- a/patches/server/0677-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0674-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cae178b0b4046815ab64cd4c7c0a48f3eb430aba..b90428ec620dbaea4207f39e7a44a84f34c24385 100644 +index 32338b8fa891262801ed45c7b64b306591e060fc..0796d35e5fb3fb3fac3f4f8b33624638727a55e1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2129,6 +2129,13 @@ public final class CraftServer implements Server { +@@ -2124,6 +2124,13 @@ public final class CraftServer implements Server { return this.console.console; } @@ -153,7 +153,7 @@ index 7f22950ae61436e91a59cd29a345809c42bbe739..1e3091687735b461d3b6a313ab876112 protected ServerCommandSender() { diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index bda9a0b99184adce28bb7851612ed7f4e324826d..61115db85b81e627d11a0de21691a2ca69aafe2c 100644 +index 98d314cd293d462ef109e952f3239e08e14dda59..2ee33c55890fa659f6d251e486264c85d9e89802 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java @@ -81,6 +81,11 @@ public final class VanillaCommandWrapper extends BukkitCommand { diff --git a/patches/server/0678-Add-missing-structure-set-seed-configs.patch b/patches/server/0675-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0678-Add-missing-structure-set-seed-configs.patch rename to patches/server/0675-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0679-Implement-regenerateChunk.patch b/patches/server/0676-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0679-Implement-regenerateChunk.patch rename to patches/server/0676-Implement-regenerateChunk.patch diff --git a/patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0677-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0680-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0677-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 86% rename from patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 5a0a90ce86..8f5932e5ad 100644 --- a/patches/server/0681-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0678-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b90428ec620dbaea4207f39e7a44a84f34c24385..432b711b47108a7100be31c492d151ac1eb95294 100644 +index 0796d35e5fb3fb3fac3f4f8b33624638727a55e1..7a812e65fb6a8ea9345a8e67b4a2dd033637d580 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2306,6 +2306,8 @@ public final class CraftServer implements Server { +@@ -2301,6 +2301,8 @@ public final class CraftServer implements Server { @Override public int getSpawnLimit(SpawnCategory spawnCategory) { // Paper start - Add mobcaps commands diff --git a/patches/server/0682-Add-GameEvent-tags.patch b/patches/server/0679-Add-GameEvent-tags.patch similarity index 95% rename from patches/server/0682-Add-GameEvent-tags.patch rename to patches/server/0679-Add-GameEvent-tags.patch index 3f94a012ff..d2891f7398 100644 --- a/patches/server/0682-Add-GameEvent-tags.patch +++ b/patches/server/0679-Add-GameEvent-tags.patch @@ -46,10 +46,10 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 432b711b47108a7100be31c492d151ac1eb95294..e8c90b60c0a17e11c5bb10fb4a501fdbf619533b 100644 +index 7a812e65fb6a8ea9345a8e67b4a2dd033637d580..3adf411927a168ca1fdf68bc60f894548e2fc1e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2734,6 +2734,15 @@ public final class CraftServer implements Server { +@@ -2729,6 +2729,15 @@ public final class CraftServer implements Server { return (org.bukkit.Tag) new CraftEntityTag(BuiltInRegistries.ENTITY_TYPE, entityTagKey); } } @@ -65,7 +65,7 @@ index 432b711b47108a7100be31c492d151ac1eb95294..e8c90b60c0a17e11c5bb10fb4a501fdb default -> throw new IllegalArgumentException(); } -@@ -2766,6 +2775,13 @@ public final class CraftServer implements Server { +@@ -2761,6 +2770,13 @@ public final class CraftServer implements Server { net.minecraft.core.Registry> entityTags = BuiltInRegistries.ENTITY_TYPE; return entityTags.getTags().map(pair -> (org.bukkit.Tag) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList()); } diff --git a/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 87% rename from patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index 3d074b30b4..74e1372a47 100644 --- a/patches/server/0683-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/server/0680-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,10 +9,10 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0a206b9ff1ad235fa0805ad635c1a6caa1d3eafb..ff1f1233a73b4fa8ab793e7c2bac0bab704fb60e 100644 +index 533e1225b863ef314b7defebc4787304fd19f5a1..6d80102287f3976ea7f0912bcbd5ff0a2088a0e1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1346,6 +1346,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1558,7 +1559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent -@@ -1630,6 +1633,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop(this.worlds.values()); } @@ -60,7 +60,7 @@ index d9b33e5892317370be8c129a3e54a13722967942..271b103aa0fc84ac051619ff94abbeea public DedicatedPlayerList getHandle() { return this.playerList; } -@@ -1147,6 +1152,7 @@ public final class CraftServer implements Server { +@@ -1142,6 +1147,7 @@ public final class CraftServer implements Server { @Override public World createWorld(WorldCreator creator) { Preconditions.checkState(this.console.getAllLevels().iterator().hasNext(), "Cannot create additional worlds on STARTUP"); @@ -68,7 +68,7 @@ index d9b33e5892317370be8c129a3e54a13722967942..271b103aa0fc84ac051619ff94abbeea Preconditions.checkArgument(creator != null, "WorldCreator cannot be null"); String name = creator.name(); -@@ -1323,6 +1329,7 @@ public final class CraftServer implements Server { +@@ -1318,6 +1324,7 @@ public final class CraftServer implements Server { @Override public boolean unloadWorld(World world, boolean save) { diff --git a/patches/server/0729-Dont-resent-entity-on-art-update.patch b/patches/server/0726-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0729-Dont-resent-entity-on-art-update.patch rename to patches/server/0726-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0730-Add-WardenAngerChangeEvent.patch b/patches/server/0727-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0730-Add-WardenAngerChangeEvent.patch rename to patches/server/0727-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch similarity index 96% rename from patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch index a6ef3a78f3..ff7a351ea1 100644 --- a/patches/server/0731-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/server/0728-Add-option-for-strict-advancement-dimension-checks.patch @@ -24,7 +24,7 @@ index 5be2d877162922d6f29592e723b7d5aff14e1515..37174de2319e353b2f989d8321758a08 } else { BlockPos blockPos = BlockPos.containing(x, y, z); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 00114ada4ad98e355e6c182fe49b6852bd9cf0c7..269c0f53d37e968ae25e38ef81a11c9d5284c494 100644 +index bbd5cbdae03dd3b81d5eca275c81801bd32e46ae..a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1349,6 +1349,12 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0729-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0732-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0729-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0733-Nameable-Banner-API.patch b/patches/server/0730-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0733-Nameable-Banner-API.patch rename to patches/server/0730-Nameable-Banner-API.patch diff --git a/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch similarity index 92% rename from patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch index 855a217d4c..5d9c6c3963 100644 --- a/patches/server/0734-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0731-Don-t-broadcast-messages-to-command-blocks.patch @@ -20,10 +20,10 @@ index 8c2dcc4134d96351cee75773214f3f47e71533e9..e6bfcc50cdf728216084bc00a5bb8b6b Date date = new Date(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 271b103aa0fc84ac051619ff94abbeeaa1b276c1..d9390854adf0009a5b8ccd4ff2d6175987918a0e 100644 +index 2dfa5c1d0ee75056383e52be0f55cf924f0828f0..865d330d4c707c4b649650730a66a43e3cb01936 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1892,7 +1892,7 @@ public final class CraftServer implements Server { +@@ -1887,7 +1887,7 @@ public final class CraftServer implements Server { // Paper end Set recipients = new HashSet<>(); for (Permissible permissible : this.getPluginManager().getPermissionSubscriptions(permission)) { diff --git a/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch similarity index 93% rename from patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch index f3d82c1fbd..6515705f6a 100644 --- a/patches/server/0735-Prevent-empty-items-from-being-added-to-world.patch +++ b/patches/server/0732-Prevent-empty-items-from-being-added-to-world.patch @@ -7,7 +7,7 @@ The previous solution caused a bunch of bandaid fixes inorder to resolve edge ca Just simply prevent them from being added to the world instead. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 376a03b48db954479dd3d8bdbe7f1b7c956e322b..23c9aca7c05a4457e357699c67c7780894ebe3de 100644 +index 452dfcce367470711e12ee174518359dc916a10d..e42dd32e277d8071a2c1b4411bc222a62023102d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1237,6 +1237,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 92% rename from patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch index 2c104c79c4..56d5a7ad9e 100644 --- a/patches/server/0736-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch +++ b/patches/server/0733-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch @@ -7,7 +7,7 @@ Remove in 1.19 along with the SplashPotion and LingeringPotion interfaces diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java -index 7c872f6a214d3d361aa63b06b001bde31fa54e96..93b42b970b174b800cf89cb0d12cf3d2574323bd 100644 +index 408a0a0433b97d7f97d758fd1dfa7975dbf8eccd..42462fac097aeb1cfd367f8c240da63f513ec5a8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java @@ -14,7 +14,7 @@ import org.bukkit.entity.ThrownPotion; diff --git a/patches/server/0737-Add-Player-getFishHook.patch b/patches/server/0734-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0737-Add-Player-getFishHook.patch rename to patches/server/0734-Add-Player-getFishHook.patch diff --git a/patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0735-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0738-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0735-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 98% rename from patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch index bafd157cd1..74cdba593c 100644 --- a/patches/server/0739-Add-various-missing-EntityDropItemEvent-calls.patch +++ b/patches/server/0736-Add-various-missing-EntityDropItemEvent-calls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add various missing EntityDropItemEvent calls diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bcf4e77ed17fa35d509b33568793a38278e2b718..3f2293ae7b84c9ec8455f41121adbaf7dbd7da71 100644 +index 5a6041ca0a787a945629066477f94d48ea1f1f19..e6c0dbe34790351f847a9a44aa6c733b71775318 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2519,6 +2519,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0740-Fix-Bee-flower-NPE.patch b/patches/server/0737-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0740-Fix-Bee-flower-NPE.patch rename to patches/server/0737-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 92% rename from patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 8d111565f9..dabe57eadf 100644 --- a/patches/server/0741-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0738-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 28c140d641244454d754770c06bc22d650cfcbfa..552220359917a8dfe77337122d65a3a43cfbdce5 100644 +index 535f6478453e61fa37c5e6f887d27f25ca82269b..841e9ff72bf48f9273afc14dfa636232be2c955c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2367,7 +2367,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0742-More-Teleport-API.patch b/patches/server/0739-More-Teleport-API.patch similarity index 98% rename from patches/server/0742-More-Teleport-API.patch rename to patches/server/0739-More-Teleport-API.patch index 2f7a16ac49..56d40e9b11 100644 --- a/patches/server/0742-More-Teleport-API.patch +++ b/patches/server/0739-More-Teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 552220359917a8dfe77337122d65a3a43cfbdce5..0f7a9ffe56150b29867b9ca32ea6de5a1689a0f1 100644 +index 841e9ff72bf48f9273afc14dfa636232be2c955c..01905f6db49ffe578998f4cf6d24311400a3d92b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1553,11 +1553,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -112,7 +112,7 @@ index 113ca1d16cb7650d72f488cdaa9e670d51dc85f0..b6fef2ca5b564c293cb602cb8e300d35 private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ee31c18ae530cb064ae9d1cc3f3d68312c1f854c..cfcba16427d9c562bae987abc995775c4ee2956d 100644 +index a7c03ca87bb0d38552ea7a80b97a0ef0af394190..d5d8fd34f3cbd18b2b956792ec07838b9c5e572d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1273,13 +1273,101 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0743-Add-EntityPortalReadyEvent.patch b/patches/server/0740-Add-EntityPortalReadyEvent.patch similarity index 95% rename from patches/server/0743-Add-EntityPortalReadyEvent.patch rename to patches/server/0740-Add-EntityPortalReadyEvent.patch index 50d3716266..5d1ceeb656 100644 --- a/patches/server/0743-Add-EntityPortalReadyEvent.patch +++ b/patches/server/0740-Add-EntityPortalReadyEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityPortalReadyEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3f2293ae7b84c9ec8455f41121adbaf7dbd7da71..4b54b3e121508fb1590654123e86c6c5de54a755 100644 +index e6c0dbe34790351f847a9a44aa6c733b71775318..8d80018d7bd1cdce2dafa4d0be5499f1d86c75fe 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2862,6 +2862,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0741-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0744-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0741-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0745-Send-block-entities-after-destroy-prediction.patch b/patches/server/0742-Send-block-entities-after-destroy-prediction.patch similarity index 98% rename from patches/server/0745-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0742-Send-block-entities-after-destroy-prediction.patch index 4516d3139c..e5845bc0c1 100644 --- a/patches/server/0745-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0742-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index d8c5f8e584976a97bd909bfa20023993ab776952..77e78808171daac78502ef3fcc70f035 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0f7a9ffe56150b29867b9ca32ea6de5a1689a0f1..c010d36d91066cb333f3360f278b775bacddd857 100644 +index 01905f6db49ffe578998f4cf6d24311400a3d92b..e711e3ab336b879664a885c4ec9b9e46cf71331d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1700,8 +1700,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0743-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0746-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0743-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch similarity index 94% rename from patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch index 52d9d632bf..9358628d81 100644 --- a/patches/server/0747-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/server/0744-Custom-Chat-Completion-Suggestions-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cfcba16427d9c562bae987abc995775c4ee2956d..a5b87aaa0b5ae437a44c5576ff6f7c28e07e36bf 100644 +index d5d8fd34f3cbd18b2b956792ec07838b9c5e572d..b99dc0fee6c23707785ee155c69d013facf2bc96 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -689,6 +689,24 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0745-Add-and-fix-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0748-Add-and-fix-missing-BlockFadeEvents.patch rename to patches/server/0745-Add-and-fix-missing-BlockFadeEvents.patch diff --git a/patches/server/0749-Collision-API.patch b/patches/server/0746-Collision-API.patch similarity index 100% rename from patches/server/0749-Collision-API.patch rename to patches/server/0746-Collision-API.patch diff --git a/patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0747-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0750-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0747-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0751-Block-Ticking-API.patch b/patches/server/0748-Block-Ticking-API.patch similarity index 95% rename from patches/server/0751-Block-Ticking-API.patch rename to patches/server/0748-Block-Ticking-API.patch index f1b51ee5b1..f9900a3d65 100644 --- a/patches/server/0751-Block-Ticking-API.patch +++ b/patches/server/0748-Block-Ticking-API.patch @@ -46,7 +46,7 @@ index 6d10396347b69d9243ab902ecc68ede93fa17b7d..af219df5267589300f0ad1d30fa5c81a // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 3fe60f5ee38ecb704194a8c2dd6e40c5bb57d9cc..784daa5e6c9a940966a32b6251a810e6f9664936 100644 +index 21ad2f461a5a578a2bf7fec1deeb421071245e6d..de4bbb73a78d037b99d662df130c7e122fda6cee 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -736,4 +736,11 @@ public class CraftBlockData implements BlockData { diff --git a/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch similarity index 98% rename from patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch index 87a1f24b99..b1064130c8 100644 --- a/patches/server/0752-Add-Velocity-IP-Forwarding-Support.patch +++ b/patches/server/0749-Add-Velocity-IP-Forwarding-Support.patch @@ -228,10 +228,10 @@ index 9bcded0466f3b10fafd709edc44c60f85cb48b7f..cb006ae0e5be2f1d31261bdd36964229 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d9390854adf0009a5b8ccd4ff2d6175987918a0e..99823b061d6c580336cc27be834018f9d2156a72 100644 +index 865d330d4c707c4b649650730a66a43e3cb01936..d0f4657a89c6fad5dda556ddec543bb9024952e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -816,7 +816,7 @@ public final class CraftServer implements Server { +@@ -811,7 +811,7 @@ public final class CraftServer implements Server { @Override public long getConnectionThrottle() { // Spigot Start - Automatically set connection throttle for bungee configurations diff --git a/patches/server/0753-Add-NamespacedKey-biome-methods.patch b/patches/server/0750-Add-NamespacedKey-biome-methods.patch similarity index 95% rename from patches/server/0753-Add-NamespacedKey-biome-methods.patch rename to patches/server/0750-Add-NamespacedKey-biome-methods.patch index 90058446ee..4ef9794eac 100644 --- a/patches/server/0753-Add-NamespacedKey-biome-methods.patch +++ b/patches/server/0750-Add-NamespacedKey-biome-methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add NamespacedKey biome methods Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 3e88b095260674a8383cc2646fc194c854bcf121..230ef9f3619cb3d2e750f5217df2ea19f61e25be 100644 +index a2961166695e5fe4c607c82a490ce67c2e1b5fde..77cc32eb8b3e835af229fcb78229bfc09bd0da70 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -607,6 +607,19 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch similarity index 89% rename from patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch index c0da2d76a6..8a41141be3 100644 --- a/patches/server/0754-Fix-plugin-loggers-on-server-shutdown.patch +++ b/patches/server/0751-Fix-plugin-loggers-on-server-shutdown.patch @@ -37,10 +37,10 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0775e9259c5b465306adf6b9d7ffc404da14be54..b8f2ad2541ef5d9c9c81a92460d7d4896efad335 100644 +index 803c234ec23147ed317ae4639438141462dfbd80..f67b48131ec7e18177f5daeda19389641f00193a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1235,6 +1235,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 44ce7ffd8304f0f295f632211931f5b9f6c72d17..33506e82025656df4a13aeacb788d73e5e5a4929 100644 +index 0c737b3c0a7645fddf157e1f12af14b8da34d09e..8e56fdb91fdf006e99a1464568b0d87e9e8daee1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3142,37 +3142,15 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0753-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0756-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0753-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0757-Missing-eating-regain-reason.patch b/patches/server/0754-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0757-Missing-eating-regain-reason.patch rename to patches/server/0754-Missing-eating-regain-reason.patch diff --git a/patches/server/0758-Missing-effect-cause.patch b/patches/server/0755-Missing-effect-cause.patch similarity index 100% rename from patches/server/0758-Missing-effect-cause.patch rename to patches/server/0755-Missing-effect-cause.patch diff --git a/patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0756-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0759-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0756-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0757-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0760-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0757-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0761-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0758-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0761-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0758-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0762-Configurable-chat-thread-limit.patch b/patches/server/0759-Configurable-chat-thread-limit.patch similarity index 96% rename from patches/server/0762-Configurable-chat-thread-limit.patch rename to patches/server/0759-Configurable-chat-thread-limit.patch index 255381bd14..fa5e60fd33 100644 --- a/patches/server/0762-Configurable-chat-thread-limit.patch +++ b/patches/server/0759-Configurable-chat-thread-limit.patch @@ -22,7 +22,7 @@ is actually processed, this is honestly really just exposed for the misnomers or who just wanna ensure that this won't grow over a specific size if chat gets stupidly active diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 4a34a49f12b106976ba19436f96f74ebb068249c..d12fd313730c44dcec3c73fcd8c99c0c84f46743 100644 +index 892351c3b6397b3cde6a31a6594c0e16bbe1252b..ab5089781b8866cd6ad1b9570634ba84d936cfe7 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -285,7 +285,18 @@ public class GlobalConfiguration extends ConfigurationPart { diff --git a/patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0760-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0763-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0760-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0764-fix-Jigsaw-block-kicking-user.patch b/patches/server/0761-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0764-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0761-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0762-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0765-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0762-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0766-Add-getDrops-to-BlockState.patch b/patches/server/0763-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0766-Add-getDrops-to-BlockState.patch rename to patches/server/0763-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch similarity index 99% rename from patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch index c15e6fbe0a..5145bc1511 100644 --- a/patches/server/0767-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0764-Fix-a-bunch-of-vanilla-bugs.patch @@ -117,7 +117,7 @@ index 3532febc8e34c8436a69a4c4b472b1776f21ee48..de19a5ea96fa38621513e970e04d1535 return this.anyPlayerCloseEnoughForSpawning(pos, false); } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 23c9aca7c05a4457e357699c67c7780894ebe3de..ab31102de7c43a4fc923b26d9072242453a3f199 100644 +index e42dd32e277d8071a2c1b4411bc222a62023102d..5a1493a981ba99f287fc70193bfdf04f9a01ff89 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -776,7 +776,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -130,7 +130,7 @@ index 23c9aca7c05a4457e357699c67c7780894ebe3de..ab31102de7c43a4fc923b26d90722424 if (!list.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 269c0f53d37e968ae25e38ef81a11c9d5284c494..a1636e09a7b46c333029bfdb7d1823d5dec83bbf 100644 +index a11aa87cc0bcd829dc2b52d49599eb4cd2c43f3c..9b62135df9be88b1981d2d330449d42870aaba01 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -445,14 +445,14 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 94% rename from patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch index 73e5958d98..c764e834e8 100644 --- a/patches/server/0768-Remove-unnecessary-onTrackingStart-during-navigation.patch +++ b/patches/server/0765-Remove-unnecessary-onTrackingStart-during-navigation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ab31102de7c43a4fc923b26d9072242453a3f199..93f6864c69761b70735795186cf118d1f091d092 100644 +index 5a1493a981ba99f287fc70193bfdf04f9a01ff89..9f7088691c3ab848c5095b6109d14eae947ace99 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2216,7 +2216,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0769-Fix-custom-piglin-loved-items.patch b/patches/server/0766-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0769-Fix-custom-piglin-loved-items.patch rename to patches/server/0766-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0770-EntityPickupItemEvent-fixes.patch b/patches/server/0767-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0770-EntityPickupItemEvent-fixes.patch rename to patches/server/0767-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 97% rename from patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch index abeca5857c..e9996dba57 100644 --- a/patches/server/0771-Correctly-handle-interactions-with-items-on-cooldown.patch +++ b/patches/server/0768-Correctly-handle-interactions-with-items-on-cooldown.patch @@ -30,7 +30,7 @@ index 0cfdd01778fb4f2150a4dea2d9dc6b3b830af987..ee7f36700863b9f504a70a56c5f28c8e this.interactResult = event.useItemInHand() == Event.Result.DENY; this.interactPosition = blockposition.immutable(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 70489085763475d29ddddc0bd3279974d0eb73cf..c52cb55cd1da988ec646e4e1484ec1a72513291d 100644 +index a40e6a19459cb5853f72708a0e7b8cc7334dca51..43759af5c1ddb49926cdf49b95acd65e68cffd60 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -545,6 +545,12 @@ public class CraftEventFactory { diff --git a/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch similarity index 97% rename from patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch index 40015b3b36..292fb5ad41 100644 --- a/patches/server/0772-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0769-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a1636e09a7b46c333029bfdb7d1823d5dec83bbf..d139e9e8b83ee4f075228ef0d42786c470012c2d 100644 +index 9b62135df9be88b1981d2d330449d42870aaba01..535c176eb1d7141e7f46ec2380c3ae0f012a69b3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -347,6 +347,25 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0773-Elder-Guardian-appearance-API.patch b/patches/server/0770-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0773-Elder-Guardian-appearance-API.patch rename to patches/server/0770-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0774-Allow-changing-bed-s-occupied-property.patch b/patches/server/0771-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0774-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0771-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0775-Add-entity-knockback-API.patch b/patches/server/0772-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0775-Add-entity-knockback-API.patch rename to patches/server/0772-Add-entity-knockback-API.patch diff --git a/patches/server/0776-Detect-headless-JREs.patch b/patches/server/0773-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0776-Detect-headless-JREs.patch rename to patches/server/0773-Detect-headless-JREs.patch diff --git a/patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0774-fix-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0777-fix-entity-vehicle-collision-event-not-called.patch rename to patches/server/0774-fix-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0778-Add-EntityToggleSitEvent.patch b/patches/server/0775-Add-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0778-Add-EntityToggleSitEvent.patch rename to patches/server/0775-Add-EntityToggleSitEvent.patch diff --git a/patches/server/0779-Add-fire-tick-delay-option.patch b/patches/server/0776-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0779-Add-fire-tick-delay-option.patch rename to patches/server/0776-Add-fire-tick-delay-option.patch diff --git a/patches/server/0780-Add-Moving-Piston-API.patch b/patches/server/0777-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0780-Add-Moving-Piston-API.patch rename to patches/server/0777-Add-Moving-Piston-API.patch diff --git a/patches/server/0781-Ignore-impossible-spawn-tick.patch b/patches/server/0778-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0781-Ignore-impossible-spawn-tick.patch rename to patches/server/0778-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0779-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0782-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0779-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 95% rename from patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch index 5def430ee3..038fdcd4fa 100644 --- a/patches/server/0783-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch +++ b/patches/server/0780-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix EntityCombustEvent cancellation cant fully prevent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4b54b3e121508fb1590654123e86c6c5de54a755..0a4069e6c544deb0ad576350ec371fe1ec5de8f4 100644 +index 8d80018d7bd1cdce2dafa4d0be5499f1d86c75fe..b49efb6f5f106396894831f28841d5a14d5a8c00 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3127,6 +3127,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0784-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0781-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0784-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0781-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0782-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0785-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0782-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0783-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0786-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0783-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0787-Add-Player-Warden-Warning-API.patch b/patches/server/0784-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0787-Add-Player-Warden-Warning-API.patch rename to patches/server/0784-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0785-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0788-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0785-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0789-Add-paper-dumplisteners-command.patch b/patches/server/0786-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0789-Add-paper-dumplisteners-command.patch rename to patches/server/0786-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0790-check-global-player-list-where-appropriate.patch b/patches/server/0787-check-global-player-list-where-appropriate.patch similarity index 96% rename from patches/server/0790-check-global-player-list-where-appropriate.patch rename to patches/server/0787-check-global-player-list-where-appropriate.patch index 56ca131550..beebaacc34 100644 --- a/patches/server/0790-check-global-player-list-where-appropriate.patch +++ b/patches/server/0787-check-global-player-list-where-appropriate.patch @@ -7,7 +7,7 @@ Makes certain entities check all players when searching for a player instead of just checking players in their world. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 93f6864c69761b70735795186cf118d1f091d092..3ce6604a74d7ab0b045901261d58736ca4c543a7 100644 +index 9f7088691c3ab848c5095b6109d14eae947ace99..1e122d5b49aa7f6a626e781e53de53be18afc346 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2332,4 +2332,12 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -24,7 +24,7 @@ index 93f6864c69761b70735795186cf118d1f091d092..3ce6604a74d7ab0b045901261d58736c + // Paper end - check global player list where appropriate } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 33506e82025656df4a13aeacb788d73e5e5a4929..1a88c22e6f2e85e2cb87ae20a849ac594e9be1e0 100644 +index 8e56fdb91fdf006e99a1464568b0d87e9e8daee1..f725d1f797733f7a4871aa1f84e7353fc3c3f948 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3688,7 +3688,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0788-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0791-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0788-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0792-ItemStack-damage-API.patch b/patches/server/0789-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0792-ItemStack-damage-API.patch rename to patches/server/0789-ItemStack-damage-API.patch diff --git a/patches/server/0793-Friction-API.patch b/patches/server/0790-Friction-API.patch similarity index 98% rename from patches/server/0793-Friction-API.patch rename to patches/server/0790-Friction-API.patch index 8818e0e61b..c713bd2c3a 100644 --- a/patches/server/0793-Friction-API.patch +++ b/patches/server/0790-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 1a88c22e6f2e85e2cb87ae20a849ac594e9be1e0..c5ebe3aec4f7ba484194c75f94600ba926b10abb 100644 +index f725d1f797733f7a4871aa1f84e7353fc3c3f948..205c7bdc03c86229a100bd535db16b502d99ba24 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -273,6 +273,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0791-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0794-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0791-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch similarity index 95% rename from patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch rename to patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch index d824af1bd8..7cdccaff49 100644 --- a/patches/server/0795-Fix-premature-player-kicks-on-shutdown.patch +++ b/patches/server/0792-Fix-premature-player-kicks-on-shutdown.patch @@ -47,10 +47,10 @@ index fd2a5c829899d45641a5b5d30116f4f368953c15..f57679d88cd015caa8996d44b486da69 this.disconnect(Component.translatable("multiplayer.disconnect.server_shutdown")); } catch (ClassCastException classcastexception) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b8f2ad2541ef5d9c9c81a92460d7d4896efad335..28b68ddc343059fdd98419930a8b75cca54487d0 100644 +index f67b48131ec7e18177f5daeda19389641f00193a..e463727cccc6931de822f62309090241c7abada4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2074,7 +2074,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f8bfc87b044e538e068c021cfc3f8de43b15e84d..f55255a6bab7524d37688b9fa5c9ca238fcd2656 100644 +index cb9b46ed5ff2f9aa0d322be75659c0046f38c663..b35365fce1233214a0dd7f1cf86d940f47c860d3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2041,7 +2041,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0806-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0809-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0806-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0810-Flying-Fall-Damage.patch b/patches/server/0807-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0810-Flying-Fall-Damage.patch rename to patches/server/0807-Flying-Fall-Damage.patch diff --git a/patches/server/0811-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 94% rename from patches/server/0811-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 214bb65165..8245b3b968 100644 --- a/patches/server/0811-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/server/0808-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 48103cefacf75a51619f7a3ebeb7731956a65a4f..09defe4a20c7b0794cba358c177e787f1c0273c1 100644 +index f256bd908a9683085fa47d2a84cbdee78a7ba20b..d074b9f859f6ed9ce0137c8e238de188c290fa4d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -968,6 +968,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0812-config-for-disabling-entity-tag-tags.patch b/patches/server/0809-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0812-config-for-disabling-entity-tag-tags.patch rename to patches/server/0809-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0813-Use-single-player-info-update-packet-on-join.patch b/patches/server/0810-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0813-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0810-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0814-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0811-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0814-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0811-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0815-Win-Screen-API.patch b/patches/server/0812-Win-Screen-API.patch similarity index 100% rename from patches/server/0815-Win-Screen-API.patch rename to patches/server/0812-Win-Screen-API.patch diff --git a/patches/server/0816-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0813-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0816-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0813-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0817-Fix-force-opening-enchantment-tables.patch b/patches/server/0814-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0817-Fix-force-opening-enchantment-tables.patch rename to patches/server/0814-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0818-Add-Entity-Body-Yaw-API.patch b/patches/server/0815-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0818-Add-Entity-Body-Yaw-API.patch rename to patches/server/0815-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0819-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0816-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0819-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0816-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0820-Add-EntityFertilizeEggEvent.patch b/patches/server/0817-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0820-Add-EntityFertilizeEggEvent.patch rename to patches/server/0817-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0821-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0818-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0821-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0818-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0822-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0819-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0822-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0819-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0823-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0820-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0823-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0820-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0824-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0821-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0824-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0821-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0825-Fix-text-display-error-on-spawn.patch b/patches/server/0822-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0825-Fix-text-display-error-on-spawn.patch rename to patches/server/0822-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0826-Fix-inventories-returning-null-Locations.patch b/patches/server/0823-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0826-Fix-inventories-returning-null-Locations.patch rename to patches/server/0823-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0827-Add-Shearable-API.patch b/patches/server/0824-Add-Shearable-API.patch similarity index 100% rename from patches/server/0827-Add-Shearable-API.patch rename to patches/server/0824-Add-Shearable-API.patch diff --git a/patches/server/0828-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0825-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0828-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0825-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0829-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0826-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0829-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0826-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0830-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0827-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0830-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0827-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0831-remove-duplicate-animate-packet-for-records.patch b/patches/server/0828-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0831-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0828-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0832-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0829-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0832-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0829-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0833-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0830-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0833-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0830-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0834-Use-array-for-gamerule-storage.patch b/patches/server/0831-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0834-Use-array-for-gamerule-storage.patch rename to patches/server/0831-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0835-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0832-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0835-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0832-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0836-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0833-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0836-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0833-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0837-Add-Mob-Experience-reward-API.patch b/patches/server/0834-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0837-Add-Mob-Experience-reward-API.patch rename to patches/server/0834-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0838-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0835-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0838-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0835-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0839-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0836-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0839-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0836-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0840-More-accurate-isInOpenWater-impl.patch b/patches/server/0837-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0840-More-accurate-isInOpenWater-impl.patch rename to patches/server/0837-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0841-Expand-PlayerItemMendEvent.patch b/patches/server/0838-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0841-Expand-PlayerItemMendEvent.patch rename to patches/server/0838-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0842-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0839-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0842-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0839-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0843-Add-transient-modifier-API.patch b/patches/server/0840-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0843-Add-transient-modifier-API.patch rename to patches/server/0840-Add-transient-modifier-API.patch diff --git a/patches/server/0844-Fix-block-place-logic.patch b/patches/server/0841-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0844-Fix-block-place-logic.patch rename to patches/server/0841-Fix-block-place-logic.patch diff --git a/patches/server/0845-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0842-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0845-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0842-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0846-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0843-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0846-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/server/0843-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0847-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 90% rename from patches/server/0847-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch index c99da23d4c..77e4fe6394 100644 --- a/patches/server/0847-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch +++ b/patches/server/0844-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ddc1d66ae6a292e4aaa0bdd1088dfa0f7efc1ad3..83449758a2613076d6bbd61813a9d8cd4e2c2ed4 100644 +index d0f4657a89c6fad5dda556ddec543bb9024952e2..72b9b8f0e06ced33ac76af162fff52442decb2cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -355,7 +355,11 @@ public final class CraftServer implements Server { +@@ -350,7 +350,11 @@ public final class CraftServer implements Server { } this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile()); this.commandsConfiguration.options().copyDefaults(true); diff --git a/patches/server/0848-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0845-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0848-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/server/0845-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0849-Fix-sniffer-removeExploredLocation.patch b/patches/server/0846-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0849-Fix-sniffer-removeExploredLocation.patch rename to patches/server/0846-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0850-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0847-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/server/0850-Add-method-to-remove-all-active-potion-effects.patch rename to patches/server/0847-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/server/0851-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0848-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0851-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/server/0848-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0852-Add-event-for-player-editing-sign.patch b/patches/server/0849-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/server/0852-Add-event-for-player-editing-sign.patch rename to patches/server/0849-Add-event-for-player-editing-sign.patch diff --git a/patches/server/0853-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0850-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0853-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/server/0850-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0854-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0851-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0854-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/server/0851-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0855-Add-option-to-disable-block-updates.patch b/patches/server/0852-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0855-Add-option-to-disable-block-updates.patch rename to patches/server/0852-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0856-Call-missing-BlockDispenseEvent.patch b/patches/server/0853-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0856-Call-missing-BlockDispenseEvent.patch rename to patches/server/0853-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0857-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0854-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 100% rename from patches/server/0857-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/server/0854-Don-t-load-chunks-for-supporting-block-checks.patch diff --git a/patches/server/0858-Optimize-player-lookups-for-beacons.patch b/patches/server/0855-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0858-Optimize-player-lookups-for-beacons.patch rename to patches/server/0855-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0859-Add-Sign-getInteractableSideFor.patch b/patches/server/0856-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0859-Add-Sign-getInteractableSideFor.patch rename to patches/server/0856-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0860-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0857-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0860-fix-item-meta-for-tadpole-buckets.patch rename to patches/server/0857-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0861-Fix-BanList-API.patch b/patches/server/0858-Fix-BanList-API.patch similarity index 100% rename from patches/server/0861-Fix-BanList-API.patch rename to patches/server/0858-Fix-BanList-API.patch diff --git a/patches/server/0862-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0859-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0862-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/server/0859-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0863-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0860-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0863-Fix-possible-NPE-on-painting-creation.patch rename to patches/server/0860-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0864-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0861-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0864-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0861-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0865-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0862-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 100% rename from patches/server/0865-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/server/0862-ExperienceOrb-should-call-EntitySpawnEvent.patch diff --git a/patches/server/0866-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0863-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0866-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/server/0863-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0867-Add-whitelist-events.patch b/patches/server/0864-Add-whitelist-events.patch similarity index 100% rename from patches/server/0867-Add-whitelist-events.patch rename to patches/server/0864-Add-whitelist-events.patch diff --git a/patches/server/0868-Implement-PlayerFailMoveEvent.patch b/patches/server/0865-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0868-Implement-PlayerFailMoveEvent.patch rename to patches/server/0865-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0869-Folia-scheduler-and-owned-region-API.patch b/patches/server/0866-Folia-scheduler-and-owned-region-API.patch similarity index 99% rename from patches/server/0869-Folia-scheduler-and-owned-region-API.patch rename to patches/server/0866-Folia-scheduler-and-owned-region-API.patch index b84601a478..9b99127069 100644 --- a/patches/server/0869-Folia-scheduler-and-owned-region-API.patch +++ b/patches/server/0866-Folia-scheduler-and-owned-region-API.patch @@ -1148,10 +1148,10 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index dbffff0e30713f769aa8e0fe747b8fe599442e49..1f41b2298e98d40c0419ba8220654d65174414c2 100644 +index e463727cccc6931de822f62309090241c7abada4..187421d19a6d3422612edad650ef15b40ba8c9b9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1554,6 +1554,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop true, iregistrycustom_dimension, this.console.options.has("recreateRegionFiles")); } diff --git a/patches/server/0877-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0874-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0877-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/server/0874-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0878-Cache-map-ids-on-item-frames.patch b/patches/server/0875-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0878-Cache-map-ids-on-item-frames.patch rename to patches/server/0875-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0879-Fix-custom-statistic-criteria-creation.patch b/patches/server/0876-Fix-custom-statistic-criteria-creation.patch similarity index 93% rename from patches/server/0879-Fix-custom-statistic-criteria-creation.patch rename to patches/server/0876-Fix-custom-statistic-criteria-creation.patch index 479f3f99ff..a6bd598bff 100644 --- a/patches/server/0879-Fix-custom-statistic-criteria-creation.patch +++ b/patches/server/0876-Fix-custom-statistic-criteria-creation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix custom statistic criteria creation diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 230ef9f3619cb3d2e750f5217df2ea19f61e25be..72e86de0d3e9448b5689790b054b5a672ee26311 100644 +index 77cc32eb8b3e835af229fcb78229bfc09bd0da70..2d51418612e4df40b9536ac72ba0a070d59f32d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -620,6 +620,12 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0880-Bandaid-fix-for-Effect.patch b/patches/server/0877-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0880-Bandaid-fix-for-Effect.patch rename to patches/server/0877-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0881-SculkCatalyst-bloom-API.patch b/patches/server/0878-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0881-SculkCatalyst-bloom-API.patch rename to patches/server/0878-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0882-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0879-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0882-API-for-an-entity-s-scoreboard-name.patch rename to patches/server/0879-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0883-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 92% rename from patches/server/0883-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch index 1241b20fbb..9929841a73 100644 --- a/patches/server/0883-Deprecate-and-replace-methods-with-old-StructureType.patch +++ b/patches/server/0880-Deprecate-and-replace-methods-with-old-StructureType.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 89b7dfcb22c2e59aa5723551f881b975544a0ab5..58c0778741a14c252ee01536b6fd9a3c5bcbc58f 100644 +index d17909ec98aff3222600862fe67fe866ee87e9de..d7178155e548eb027e75bb8e7f03d077cae6831e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1970,6 +1970,11 @@ public final class CraftServer implements Server { +@@ -1965,6 +1965,11 @@ public final class CraftServer implements Server { ServerLevel worldServer = ((CraftWorld) world).getHandle(); Location structureLocation = world.locateNearestStructure(location, structureType, radius, findUnexplored); @@ -20,7 +20,7 @@ index 89b7dfcb22c2e59aa5723551f881b975544a0ab5..58c0778741a14c252ee01536b6fd9a3c BlockPos structurePosition = CraftLocation.toBlockPosition(structureLocation); // Create map with trackPlayer = true, unlimitedTracking = true -@@ -1980,6 +1985,31 @@ public final class CraftServer implements Server { +@@ -1975,6 +1980,31 @@ public final class CraftServer implements Server { return CraftItemStack.asBukkitCopy(stack); } diff --git a/patches/server/0884-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0881-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0884-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/server/0881-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0885-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0882-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0885-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/server/0882-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0886-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0883-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0886-Fire-entity-death-event-for-ender-dragon.patch rename to patches/server/0883-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0887-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0884-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0887-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/server/0884-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0888-Add-Listing-API-for-Player.patch b/patches/server/0885-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/server/0888-Add-Listing-API-for-Player.patch rename to patches/server/0885-Add-Listing-API-for-Player.patch diff --git a/patches/server/0889-Configurable-Region-Compression-Format.patch b/patches/server/0886-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0889-Configurable-Region-Compression-Format.patch rename to patches/server/0886-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0890-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0887-Add-BlockFace-to-BlockDamageEvent.patch similarity index 100% rename from patches/server/0890-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/server/0887-Add-BlockFace-to-BlockDamageEvent.patch diff --git a/patches/server/0891-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0888-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0891-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/0888-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0892-Expand-Pose-API.patch b/patches/server/0889-Expand-Pose-API.patch similarity index 100% rename from patches/server/0892-Expand-Pose-API.patch rename to patches/server/0889-Expand-Pose-API.patch diff --git a/patches/server/0893-More-DragonBattle-API.patch b/patches/server/0890-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0893-More-DragonBattle-API.patch rename to patches/server/0890-More-DragonBattle-API.patch diff --git a/patches/server/0894-Add-PlayerPickItemEvent.patch b/patches/server/0891-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0894-Add-PlayerPickItemEvent.patch rename to patches/server/0891-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0895-Allow-trident-custom-damage.patch b/patches/server/0892-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0895-Allow-trident-custom-damage.patch rename to patches/server/0892-Allow-trident-custom-damage.patch diff --git a/patches/server/0896-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0893-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0896-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/server/0893-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0897-Optimize-nearest-structure-border-iteration.patch b/patches/server/0894-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0897-Optimize-nearest-structure-border-iteration.patch rename to patches/server/0894-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0898-Implement-OfflinePlayer-isConnected.patch b/patches/server/0895-Implement-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/server/0898-Implement-OfflinePlayer-isConnected.patch rename to patches/server/0895-Implement-OfflinePlayer-isConnected.patch diff --git a/patches/server/0899-Fix-inventory-desync.patch b/patches/server/0896-Fix-inventory-desync.patch similarity index 100% rename from patches/server/0899-Fix-inventory-desync.patch rename to patches/server/0896-Fix-inventory-desync.patch diff --git a/patches/server/0900-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0897-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/server/0900-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/server/0897-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/server/0901-Configure-sniffer-egg-hatch-time.patch b/patches/server/0898-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0901-Configure-sniffer-egg-hatch-time.patch rename to patches/server/0898-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0902-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0899-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0902-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/server/0899-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0903-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0900-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0903-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0900-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0904-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0901-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0904-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/server/0901-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0905-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0902-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/0905-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/server/0902-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/0906-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0903-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/server/0906-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/server/0903-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/server/0907-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0904-Fix-silent-equipment-change-for-mobs.patch similarity index 100% rename from patches/server/0907-Fix-silent-equipment-change-for-mobs.patch rename to patches/server/0904-Fix-silent-equipment-change-for-mobs.patch diff --git a/patches/server/0908-Fix-spigot-s-Forced-Stats.patch b/patches/server/0905-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0908-Fix-spigot-s-Forced-Stats.patch rename to patches/server/0905-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0909-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0906-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0909-Add-missing-InventoryHolders-to-inventories.patch rename to patches/server/0906-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0910-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0907-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0910-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/server/0907-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0911-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0908-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0911-Add-missing-logs-for-log-ips-config-option.patch rename to patches/server/0908-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0912-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0909-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0912-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/server/0909-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0913-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0910-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0913-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/server/0910-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0914-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0911-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0914-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/server/0911-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0915-Fix-missing-map-initialize-event-call.patch b/patches/server/0912-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0915-Fix-missing-map-initialize-event-call.patch rename to patches/server/0912-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0916-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0913-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0916-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/server/0913-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0917-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch similarity index 96% rename from patches/server/0917-Fix-UnsafeValues-loadAdvancement.patch rename to patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch index e79bc2f38e..4bf2224704 100644 --- a/patches/server/0917-Fix-UnsafeValues-loadAdvancement.patch +++ b/patches/server/0914-Fix-UnsafeValues-loadAdvancement.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 72e86de0d3e9448b5689790b054b5a672ee26311..8c7ab4612bd5a86ad1c722663f4831769b86b564 100644 +index 2d51418612e4df40b9536ac72ba0a070d59f32d1..34208c749621003ba3ad74894ca25e01469b66f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -323,7 +323,27 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0918-Add-player-idle-duration-API.patch b/patches/server/0915-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0918-Add-player-idle-duration-API.patch rename to patches/server/0915-Add-player-idle-duration-API.patch diff --git a/patches/server/0919-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0916-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0919-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/server/0916-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0920-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0917-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0920-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/server/0917-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0921-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0918-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 100% rename from patches/server/0921-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/server/0918-Allow-null-itemstack-for-Player-sendEquipmentChange.patch diff --git a/patches/server/0922-Optimize-VarInts.patch b/patches/server/0919-Optimize-VarInts.patch similarity index 100% rename from patches/server/0922-Optimize-VarInts.patch rename to patches/server/0919-Optimize-VarInts.patch diff --git a/patches/server/0923-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0920-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0923-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/server/0920-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0924-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0921-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0924-Add-predicate-for-blocks-when-raytracing.patch rename to patches/server/0921-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0925-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0922-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0925-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/server/0922-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0926-Expand-LingeringPotion-API.patch b/patches/server/0923-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0926-Expand-LingeringPotion-API.patch rename to patches/server/0923-Expand-LingeringPotion-API.patch diff --git a/patches/server/0927-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0924-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0927-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/server/0924-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0928-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0925-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0928-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/server/0925-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0929-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0926-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0929-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/server/0926-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0930-Add-UUID-attribute-modifier-API.patch b/patches/server/0927-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0930-Add-UUID-attribute-modifier-API.patch rename to patches/server/0927-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0931-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0928-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/0931-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/server/0928-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/0932-Lazily-create-LootContext-for-criterions.patch b/patches/server/0929-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0932-Lazily-create-LootContext-for-criterions.patch rename to patches/server/0929-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0933-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0930-Don-t-fire-sync-events-during-worldgen.patch similarity index 100% rename from patches/server/0933-Don-t-fire-sync-events-during-worldgen.patch rename to patches/server/0930-Don-t-fire-sync-events-during-worldgen.patch diff --git a/patches/server/0934-Add-Structure-check-API.patch b/patches/server/0931-Add-Structure-check-API.patch similarity index 100% rename from patches/server/0934-Add-Structure-check-API.patch rename to patches/server/0931-Add-Structure-check-API.patch diff --git a/patches/server/0935-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0932-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0935-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/server/0932-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0936-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0933-Restore-vanilla-entity-drops-behavior.patch similarity index 100% rename from patches/server/0936-Restore-vanilla-entity-drops-behavior.patch rename to patches/server/0933-Restore-vanilla-entity-drops-behavior.patch diff --git a/patches/server/0937-Dont-resend-blocks-on-interactions.patch b/patches/server/0934-Dont-resend-blocks-on-interactions.patch similarity index 100% rename from patches/server/0937-Dont-resend-blocks-on-interactions.patch rename to patches/server/0934-Dont-resend-blocks-on-interactions.patch diff --git a/patches/server/0938-add-more-scoreboard-API.patch b/patches/server/0935-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0938-add-more-scoreboard-API.patch rename to patches/server/0935-add-more-scoreboard-API.patch diff --git a/patches/server/0939-Improve-Registry.patch b/patches/server/0936-Improve-Registry.patch similarity index 100% rename from patches/server/0939-Improve-Registry.patch rename to patches/server/0936-Improve-Registry.patch diff --git a/patches/server/0940-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0937-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0940-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/server/0937-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0941-Add-experience-points-API.patch b/patches/server/0938-Add-experience-points-API.patch similarity index 100% rename from patches/server/0941-Add-experience-points-API.patch rename to patches/server/0938-Add-experience-points-API.patch diff --git a/patches/server/0942-Add-drops-to-shear-events.patch b/patches/server/0939-Add-drops-to-shear-events.patch similarity index 100% rename from patches/server/0942-Add-drops-to-shear-events.patch rename to patches/server/0939-Add-drops-to-shear-events.patch diff --git a/patches/server/0943-Add-PlayerShieldDisableEvent.patch b/patches/server/0940-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/server/0943-Add-PlayerShieldDisableEvent.patch rename to patches/server/0940-Add-PlayerShieldDisableEvent.patch diff --git a/patches/server/0944-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0941-Validate-ResourceLocation-in-NBT-reading.patch similarity index 100% rename from patches/server/0944-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/server/0941-Validate-ResourceLocation-in-NBT-reading.patch diff --git a/patches/server/0945-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0942-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0945-Properly-handle-experience-dropping-on-block-break.patch rename to patches/server/0942-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0946-Fixup-NamespacedKey-handling.patch b/patches/server/0943-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0946-Fixup-NamespacedKey-handling.patch rename to patches/server/0943-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0947-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0944-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0947-Expose-LootTable-of-DecoratedPot.patch rename to patches/server/0944-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0948-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0945-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0948-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0945-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0949-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0946-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0949-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0946-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0950-Add-ShulkerDuplicateEvent.patch b/patches/server/0947-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/0950-Add-ShulkerDuplicateEvent.patch rename to patches/server/0947-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/0951-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch similarity index 93% rename from patches/server/0951-Add-api-for-spawn-egg-texture-colors.patch rename to patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch index b7957271cb..8d65e8e614 100644 --- a/patches/server/0951-Add-api-for-spawn-egg-texture-colors.patch +++ b/patches/server/0948-Add-api-for-spawn-egg-texture-colors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add api for spawn egg texture colors diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 8c7ab4612bd5a86ad1c722663f4831769b86b564..f45604d9193e7f1a646ff98b2e110f4e334a4368 100644 +index 34208c749621003ba3ad74894ca25e01469b66f2..0e23219206d94308e0d5d1519d7f80678ffa4f73 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -663,6 +663,15 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0952-Add-Lifecycle-Event-system.patch b/patches/server/0949-Add-Lifecycle-Event-system.patch similarity index 99% rename from patches/server/0952-Add-Lifecycle-Event-system.patch rename to patches/server/0949-Add-Lifecycle-Event-system.patch index 62b493a87f..fb9a2d78c8 100644 --- a/patches/server/0952-Add-Lifecycle-Event-system.patch +++ b/patches/server/0949-Add-Lifecycle-Event-system.patch @@ -707,10 +707,10 @@ index 2e96308696e131f3f013469a395e5ddda2c5d529..65a66e484c1c39c5f41d97db52f31c67 } catch (Throwable e) { LOGGER.error("Failed to run bootstrapper for %s. This plugin will not be loaded.".formatted(provider.getSource()), e); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 58c0778741a14c252ee01536b6fd9a3c5bcbc58f..2e026aca8e545b857b3ed0eaf3c57acc3657635c 100644 +index d7178155e548eb027e75bb8e7f03d077cae6831e..34242fa907bb87ef78cf96ca81ae224de750956f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -1018,6 +1018,11 @@ public final class CraftServer implements Server { +@@ -1013,6 +1013,11 @@ public final class CraftServer implements Server { @Override public void reload() { @@ -739,7 +739,7 @@ index d96399e9bf1a58db5a4a22e58abb99e7660e0694..66bdac50130f523f9dc4379b103b7a46 + // Paper end - lifecycle events } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index f45604d9193e7f1a646ff98b2e110f4e334a4368..5688847458dde4cd9371e465ba73b2794639fa4d 100644 +index 0e23219206d94308e0d5d1519d7f80678ffa4f73..89e4f53598c14ea2ca2b6678edc97366649d0145 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -672,6 +672,13 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0953-ItemStack-Tooltip-API.patch b/patches/server/0950-ItemStack-Tooltip-API.patch similarity index 95% rename from patches/server/0953-ItemStack-Tooltip-API.patch rename to patches/server/0950-ItemStack-Tooltip-API.patch index 99c3106c3d..19ecf1997e 100644 --- a/patches/server/0953-ItemStack-Tooltip-API.patch +++ b/patches/server/0950-ItemStack-Tooltip-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack Tooltip API diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 5688847458dde4cd9371e465ba73b2794639fa4d..a9ab74da54cdec04e2df12ab3c3332bb675ccae1 100644 +index 89e4f53598c14ea2ca2b6678edc97366649d0145..9bd51aeedf2556e714960b081029f48afbc0f3f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -647,6 +647,20 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0954-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0951-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/0954-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/server/0951-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/0955-Add-FluidState-API.patch b/patches/server/0952-Add-FluidState-API.patch similarity index 100% rename from patches/server/0955-Add-FluidState-API.patch rename to patches/server/0952-Add-FluidState-API.patch diff --git a/patches/server/0956-add-number-format-api.patch b/patches/server/0953-add-number-format-api.patch similarity index 100% rename from patches/server/0956-add-number-format-api.patch rename to patches/server/0953-add-number-format-api.patch diff --git a/patches/server/0957-improve-BanList-types.patch b/patches/server/0954-improve-BanList-types.patch similarity index 89% rename from patches/server/0957-improve-BanList-types.patch rename to patches/server/0954-improve-BanList-types.patch index e4c96f87eb..b9db6bb6e6 100644 --- a/patches/server/0957-improve-BanList-types.patch +++ b/patches/server/0954-improve-BanList-types.patch @@ -5,10 +5,10 @@ Subject: [PATCH] improve BanList types diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2e026aca8e545b857b3ed0eaf3c57acc3657635c..767bbe5e6e558a3e8913740a8016037356b8ede2 100644 +index 34242fa907bb87ef78cf96ca81ae224de750956f..927c3110a64cfab665137a6f0c8b72075168f2bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2223,6 +2223,21 @@ public final class CraftServer implements Server { +@@ -2218,6 +2218,21 @@ public final class CraftServer implements Server { }; } diff --git a/patches/server/0958-Expanded-Hopper-API.patch b/patches/server/0955-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/0958-Expanded-Hopper-API.patch rename to patches/server/0955-Expanded-Hopper-API.patch diff --git a/patches/server/0959-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0956-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/server/0959-Add-BlockBreakProgressUpdateEvent.patch rename to patches/server/0956-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/0960-Deprecate-ItemStack-setType.patch b/patches/server/0957-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/server/0960-Deprecate-ItemStack-setType.patch rename to patches/server/0957-Deprecate-ItemStack-setType.patch diff --git a/patches/server/0961-Add-CartographyItemEvent.patch b/patches/server/0958-Add-CartographyItemEvent.patch similarity index 100% rename from patches/server/0961-Add-CartographyItemEvent.patch rename to patches/server/0958-Add-CartographyItemEvent.patch diff --git a/patches/server/0962-More-Raid-API.patch b/patches/server/0959-More-Raid-API.patch similarity index 100% rename from patches/server/0962-More-Raid-API.patch rename to patches/server/0959-More-Raid-API.patch diff --git a/patches/server/0963-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0960-Add-onboarding-message-for-initial-server-start.patch similarity index 97% rename from patches/server/0963-Add-onboarding-message-for-initial-server-start.patch rename to patches/server/0960-Add-onboarding-message-for-initial-server-start.patch index f208eae1d5..a409b84b72 100644 --- a/patches/server/0963-Add-onboarding-message-for-initial-server-start.patch +++ b/patches/server/0960-Add-onboarding-message-for-initial-server-start.patch @@ -29,10 +29,10 @@ index ab5089781b8866cd6ad1b9570634ba84d936cfe7..4de88f74182bb596c6b5ad0351cc0dac return instance; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1f41b2298e98d40c0419ba8220654d65174414c2..f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5 100644 +index 187421d19a6d3422612edad650ef15b40ba8c9b9..093a5d49d1a001b3ad5b4a880c60c0cb18874531 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1132,6 +1132,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); @@ -15696,7 +15696,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20 ((MinecraftServer) atomicreference.get()).runServer(); }, "Server thread"); -@@ -654,7 +654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { @@ -15831,7 +15831,7 @@ index f87e3b00208aa0bec8f2219a8f1f96f20d3f12c5..81dd728d7193acb6cc87a7f54c7d7a20 if (entity.isRemoved()) { continue; } -@@ -2625,6 +2620,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; public Commands vanillaCommandDispatcher; @@ -83,7 +83,7 @@ index c0d5190ee653bf2bbe2858b1a142d5409ed322ee..4213f8424fa19eead42a307a3a33ab25 // CraftBukkit end // Spigot start public static final int TPS = 20; -@@ -316,6 +316,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system -@@ -933,6 +936,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent diff --git a/patches/server/1020-Improve-performance-of-mass-crafts.patch b/patches/server/1017-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1020-Improve-performance-of-mass-crafts.patch rename to patches/server/1017-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1021-Actually-optimise-explosions.patch b/patches/server/1018-Actually-optimise-explosions.patch similarity index 100% rename from patches/server/1021-Actually-optimise-explosions.patch rename to patches/server/1018-Actually-optimise-explosions.patch diff --git a/patches/server/1022-Optimise-chunk-tick-iteration.patch b/patches/server/1019-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/1022-Optimise-chunk-tick-iteration.patch rename to patches/server/1019-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/1023-Lag-compensation-ticks.patch b/patches/server/1020-Lag-compensation-ticks.patch similarity index 97% rename from patches/server/1023-Lag-compensation-ticks.patch rename to patches/server/1020-Lag-compensation-ticks.patch index dffba28e9e..8b870b4b4f 100644 --- a/patches/server/1023-Lag-compensation-ticks.patch +++ b/patches/server/1020-Lag-compensation-ticks.patch @@ -8,10 +8,10 @@ Areas affected by lag comepnsation: - Eating food items diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7f18dfcf3e8edfceaa4dfd96e3b70945693b1c3e..9c3de11be9f655d97d63ec8c535cabf04d9db0b5 100644 +index 810b6099e734a5524e696beb3f25d6ca686625ea..0408d5d54fef7767ecf70e70686ad520d890ff26 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -318,6 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -1757,6 +1758,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper - BlockPhysicsEvent worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers diff --git a/patches/server/1024-Optimise-nearby-player-retrieval.patch b/patches/server/1021-Optimise-nearby-player-retrieval.patch similarity index 100% rename from patches/server/1024-Optimise-nearby-player-retrieval.patch rename to patches/server/1021-Optimise-nearby-player-retrieval.patch diff --git a/patches/server/1025-Distance-manager-tick-timings.patch b/patches/server/1022-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/1025-Distance-manager-tick-timings.patch rename to patches/server/1022-Distance-manager-tick-timings.patch diff --git a/patches/server/1026-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1023-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1026-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1023-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1027-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1024-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/1027-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/1024-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/1028-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1025-Fix-and-optimise-world-force-upgrading.patch similarity index 97% rename from patches/server/1028-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/1025-Fix-and-optimise-world-force-upgrading.patch index c00097bdf4..ce0b75bfbb 100644 --- a/patches/server/1028-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/1025-Fix-and-optimise-world-force-upgrading.patch @@ -280,10 +280,10 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..5443013060b62e3bfcc51cddca96d1c0 Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dynamicRegistryManager, eraseCache, recreateRegionFiles); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9c3de11be9f655d97d63ec8c535cabf04d9db0b5..cac41b5cea8c6362946c6bd5e50b449d033ab6a9 100644 +index 0408d5d54fef7767ecf70e70686ad520d890ff26..f525a8735e5cf5eb1278e2a3002ac81d9fff7b1a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -599,11 +599,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(worlddata)); -@@ -1379,6 +1377,13 @@ public final class CraftServer implements Server { +@@ -1374,6 +1372,13 @@ public final class CraftServer implements Server { biomeProvider = generator.getDefaultBiomeProvider(worldInfo); } diff --git a/patches/server/1029-API-for-checking-sent-chunks.patch b/patches/server/1026-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/server/1029-API-for-checking-sent-chunks.patch rename to patches/server/1026-API-for-checking-sent-chunks.patch diff --git a/patches/server/1030-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1027-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/1030-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/1027-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/1031-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1028-Deep-clone-nbt-tags-in-PDC.patch similarity index 100% rename from patches/server/1031-Deep-clone-nbt-tags-in-PDC.patch rename to patches/server/1028-Deep-clone-nbt-tags-in-PDC.patch diff --git a/patches/server/1032-Support-old-UUID-format-for-NBT.patch b/patches/server/1029-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/1032-Support-old-UUID-format-for-NBT.patch rename to patches/server/1029-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/1033-Fix-shield-disable-inconsistency.patch b/patches/server/1030-Fix-shield-disable-inconsistency.patch similarity index 100% rename from patches/server/1033-Fix-shield-disable-inconsistency.patch rename to patches/server/1030-Fix-shield-disable-inconsistency.patch diff --git a/patches/server/1034-Write-SavedData-IO-async.patch b/patches/server/1031-Write-SavedData-IO-async.patch similarity index 100% rename from patches/server/1034-Write-SavedData-IO-async.patch rename to patches/server/1031-Write-SavedData-IO-async.patch diff --git a/patches/server/1035-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/server/1032-Don-t-lose-removed-data-components-in-ItemMeta.patch similarity index 100% rename from patches/server/1035-Don-t-lose-removed-data-components-in-ItemMeta.patch rename to patches/server/1032-Don-t-lose-removed-data-components-in-ItemMeta.patch diff --git a/patches/server/1036-Add-experimental-improved-give-command.patch b/patches/server/1033-Add-experimental-improved-give-command.patch similarity index 100% rename from patches/server/1036-Add-experimental-improved-give-command.patch rename to patches/server/1033-Add-experimental-improved-give-command.patch diff --git a/patches/server/1037-Handle-Large-Packets-disconnecting-client.patch b/patches/server/1034-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/1037-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/1034-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/1038-Fix-ItemFlags.patch b/patches/server/1035-Fix-ItemFlags.patch similarity index 100% rename from patches/server/1038-Fix-ItemFlags.patch rename to patches/server/1035-Fix-ItemFlags.patch diff --git a/patches/server/1039-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/1036-Fix-helmet-damage-reduction-inconsistencies.patch similarity index 100% rename from patches/server/1039-Fix-helmet-damage-reduction-inconsistencies.patch rename to patches/server/1036-Fix-helmet-damage-reduction-inconsistencies.patch diff --git a/patches/server/1040-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/1037-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch similarity index 100% rename from patches/server/1040-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch rename to patches/server/1037-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch diff --git a/patches/server/1041-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/1038-improve-checking-handled-tags-in-itemmeta.patch similarity index 100% rename from patches/server/1041-improve-checking-handled-tags-in-itemmeta.patch rename to patches/server/1038-improve-checking-handled-tags-in-itemmeta.patch diff --git a/patches/server/1042-General-ItemMeta-fixes.patch b/patches/server/1039-General-ItemMeta-fixes.patch similarity index 100% rename from patches/server/1042-General-ItemMeta-fixes.patch rename to patches/server/1039-General-ItemMeta-fixes.patch diff --git a/patches/server/1043-Expose-hasColor-to-leather-armor.patch b/patches/server/1040-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/server/1043-Expose-hasColor-to-leather-armor.patch rename to patches/server/1040-Expose-hasColor-to-leather-armor.patch diff --git a/patches/server/1044-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/1041-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/server/1044-Added-API-to-get-player-ha-proxy-address.patch rename to patches/server/1041-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/server/1045-More-Chest-Block-API.patch b/patches/server/1042-More-Chest-Block-API.patch similarity index 100% rename from patches/server/1045-More-Chest-Block-API.patch rename to patches/server/1042-More-Chest-Block-API.patch diff --git a/patches/server/1046-Print-data-component-type-on-encoding-error.patch b/patches/server/1043-Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/server/1046-Print-data-component-type-on-encoding-error.patch rename to patches/server/1043-Print-data-component-type-on-encoding-error.patch diff --git a/patches/server/1047-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1044-Fix-entity-tracker-desync-when-new-players-are-added.patch similarity index 100% rename from patches/server/1047-Fix-entity-tracker-desync-when-new-players-are-added.patch rename to patches/server/1044-Fix-entity-tracker-desync-when-new-players-are-added.patch diff --git a/patches/server/1048-Brigadier-based-command-API.patch b/patches/server/1045-Brigadier-based-command-API.patch similarity index 99% rename from patches/server/1048-Brigadier-based-command-API.patch rename to patches/server/1045-Brigadier-based-command-API.patch index b3aa5f1dc0..638a5b18f4 100644 --- a/patches/server/1048-Brigadier-based-command-API.patch +++ b/patches/server/1045-Brigadier-based-command-API.patch @@ -2154,10 +2154,10 @@ index 982b2bab27e3d55d0ba07060862c0c3183ad91b0..5fa8a3343ffc11e82c20b78a73205fd8 Component component = message.resolveComponent(commandSourceStack); CommandSigningContext commandSigningContext = commandSourceStack.getSigningContext(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b609bbb134 100644 +index f525a8735e5cf5eb1278e2a3002ac81d9fff7b1a..dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -302,7 +302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; @@ -2166,7 +2166,7 @@ index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b6 public boolean forceTicks; // Paper // CraftBukkit end // Spigot start -@@ -393,7 +393,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { @@ -2195,7 +2195,7 @@ index cac41b5cea8c6362946c6bd5e50b449d033ab6a9..39303bb4e336732db0ab19dee0c1f8b6 this.packRepository.setSelected(dataPacks); WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(MinecraftServer.getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures()); -@@ -2323,8 +2325,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop