diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index 286eef9c75..0c3c77d746 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES diff --git a/build.gradle.kts b/build.gradle.kts -index f3f20b34a3ebcbb75004003892e903ee4fd0edd3..d8da21801eda8ea5d04c8eb2941bbef968cb7951 100644 +index 952dde5d0d9fa6bcf97ae5cafe482cca1f5b3a78..9ab4d3e462c02e4d23b45adb46965eb75eb2178e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { @@ -440,10 +440,10 @@ index 0000000000000000000000000000000000000000..9ef6712c70fcd8912a79f3f61e351aac +} diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java new file mode 100644 -index 0000000000000000000000000000000000000000..52b02cb1f02d1c65b840f38cfc8baee500aa2259 +index 0000000000000000000000000000000000000000..8633fdfa7e8aeac7414c232006fc298b3bfe1b58 --- /dev/null +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -@@ -0,0 +1,277 @@ +@@ -0,0 +1,276 @@ +package io.papermc.paper.configuration; + +import co.aikar.timings.MinecraftTimings; @@ -604,7 +604,6 @@ index 0000000000000000000000000000000000000000..52b02cb1f02d1c65b840f38cfc8baee5 + public class Logging extends ConfigurationPart { + public boolean logPlayerIpAddresses = true; + public boolean deobfuscateStacktraces = true; -+ public boolean useRgbForNamedTextColors = true; + } + + public Scoreboards scoreboards; @@ -1379,10 +1378,10 @@ index 0000000000000000000000000000000000000000..f6b9d216c24d8858802f85209fe1a869 +} diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java new file mode 100644 -index 0000000000000000000000000000000000000000..1bb16fc7598cd53e822d84b69d6a9727b37f484f +index 0000000000000000000000000000000000000000..efe7fc0bb92b70ef244875219f285724af9bfa24 --- /dev/null +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java -@@ -0,0 +1,63 @@ +@@ -0,0 +1,64 @@ +package io.papermc.paper.configuration; + +import org.spongepowered.configurate.NodePath; @@ -1442,7 +1441,8 @@ index 0000000000000000000000000000000000000000..1bb16fc7598cd53e822d84b69d6a9727 + path("commandErrorMessage"), + path("baby-zombie-movement-speed"), + path("limit-player-interactions"), -+ path("warnWhenSettingExcessiveVelocity") ++ path("warnWhenSettingExcessiveVelocity"), ++ path("logging", "use-rgb-for-named-text-colors") + }; + +} diff --git a/patches/server/0019-Rewrite-chunk-system.patch b/patches/server/0019-Rewrite-chunk-system.patch index 59092bf1f4..8821599536 100644 --- a/patches/server/0019-Rewrite-chunk-system.patch +++ b/patches/server/0019-Rewrite-chunk-system.patch @@ -15660,7 +15660,7 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629 + +} diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index 52b02cb1f02d1c65b840f38cfc8baee500aa2259..3294da27227b5a332904398afa56d21ea97d55f0 100644 +index 8633fdfa7e8aeac7414c232006fc298b3bfe1b58..eb12227b009b1fb766a5f9e338e5d2394d498376 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -116,21 +116,6 @@ public class GlobalConfiguration extends ConfigurationPart { @@ -15685,7 +15685,7 @@ index 52b02cb1f02d1c65b840f38cfc8baee500aa2259..3294da27227b5a332904398afa56d21e public UnsupportedSettings unsupportedSettings; public class UnsupportedSettings extends ConfigurationPart { -@@ -274,4 +259,43 @@ public class GlobalConfiguration extends ConfigurationPart { +@@ -273,4 +258,43 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean useDimensionTypeForCustomSpawners = false; public boolean strictAdvancementDimensionCheck = false; } diff --git a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch index b8a5fb9a59..73f833a46a 100644 --- a/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -6,6 +6,10 @@ Subject: [PATCH] Use TerminalConsoleAppender for console improvements Rewrite console improvements (console colors, tab completion, persistent input line, ...) using JLine 3.x and TerminalConsoleAppender. +Also uses the new ANSIComponentSerializer to serialize components when +logging them via the ComponentLogger, or when sending messages to the +console, for hex color support. + New features: - Support console colors for Vanilla commands - Add console colors for warnings and errors @@ -18,11 +22,13 @@ Other changes: - Server starts 1-2 seconds faster thanks to optimizations in Log4j configuration +Co-Authored-By: Emilia Kond + diff --git a/build.gradle.kts b/build.gradle.kts -index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e3563609e3c0 100644 +index 9ab4d3e462c02e4d23b45adb46965eb75eb2178e..700be2fdc10d14222f06e482681bb3a2e9a0aee6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -8,7 +8,17 @@ plugins { +@@ -8,7 +8,19 @@ plugins { dependencies { implementation(project(":paper-api")) @@ -30,6 +36,7 @@ index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e356 + // Paper start + implementation("org.jline:jline-terminal-jansi:3.21.0") + implementation("net.minecrell:terminalconsoleappender:1.3.0") ++ implementation("net.kyori:adventure-text-serializer-ansi") + /* + Required to add the missing Log4j2Plugins.dat file from log4j-core + which has been removed by Mojang. Without it, log4j has to classload @@ -37,6 +44,7 @@ index d8da21801eda8ea5d04c8eb2941bbef968cb7951..38c08ee8e935d3fdf5ad4e443352e356 + Scanning takes about 1-2 seconds so adding this speeds up the server start. + */ + runtimeOnly("org.apache.logging.log4j:log4j-core:2.14.1") ++ annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins + // Paper end implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion implementation("org.ow2.asm:asm:9.4") @@ -90,29 +98,141 @@ index 0000000000000000000000000000000000000000..a4070b59e261f0f1ac4beec47b11492f +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869 +index 0000000000000000000000000000000000000000..8f07539a82f449ad217e316a7513a1708781fb63 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java -@@ -0,0 +1,17 @@ +@@ -0,0 +1,26 @@ +package com.destroystokyo.paper.console; + ++import net.kyori.adventure.audience.MessageType; ++import net.kyori.adventure.identity.Identity; ++import net.kyori.adventure.text.Component; ++import net.kyori.adventure.text.logger.slf4j.ComponentLogger; ++import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; +import org.apache.logging.log4j.LogManager; -+import org.apache.logging.log4j.Logger; +import org.bukkit.craftbukkit.command.CraftConsoleCommandSender; + +public class TerminalConsoleCommandSender extends CraftConsoleCommandSender { + -+ private static final Logger LOGGER = LogManager.getRootLogger(); ++ private static final ComponentLogger LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName()); + + @Override + public void sendRawMessage(String message) { -+ // TerminalConsoleAppender supports color codes directly in log messages ++ final Component msg = LegacyComponentSerializer.legacySection().deserialize(message); ++ this.sendMessage(Identity.nil(), msg, MessageType.SYSTEM); ++ } ++ ++ @Override ++ public void sendMessage(Identity identity, Component message, MessageType type) { + LOGGER.info(message); + } + +} +diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java +index 3dc613116c086444ece88bcb0a569eeea953074f..db54a9c32578defa02fa58dc694c96684a4885ac 100644 +--- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java ++++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java +@@ -20,6 +20,7 @@ import net.kyori.adventure.text.TranslatableComponent; + import net.kyori.adventure.text.flattener.ComponentFlattener; + import net.kyori.adventure.text.format.TextColor; + import net.kyori.adventure.text.serializer.ComponentSerializer; ++import net.kyori.adventure.text.serializer.ansi.ANSIComponentSerializer; + import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; + import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer; + import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +@@ -107,6 +108,9 @@ public final class PaperAdventure { + public static final AttributeKey LOCALE_ATTRIBUTE = AttributeKey.valueOf("adventure:locale"); // init after FLATTENER because classloading triggered here might create a logger + @Deprecated + public static final PlainComponentSerializer PLAIN = PlainComponentSerializer.builder().flattener(FLATTENER).build(); ++ ++ public static final ANSIComponentSerializer ANSI_SERIALIZER = ANSIComponentSerializer.builder().flattener(FLATTENER).build(); ++ + private static final Codec NBT_CODEC = new Codec() { + @Override + public @NotNull CompoundTag decode(final @NotNull String encoded) throws IOException { +diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java +index c3631efda9c7fa531a8a9f18fbee7b5f8655382b..769f6489632302627fa1730cc08e77f51eb54eb4 100644 +--- a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java ++++ b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java +@@ -1,9 +1,11 @@ + package io.papermc.paper.adventure.providers; + + import io.papermc.paper.adventure.PaperAdventure; ++import java.util.Locale; + import net.kyori.adventure.text.Component; + import net.kyori.adventure.text.logger.slf4j.ComponentLogger; + import net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider; ++import net.kyori.adventure.translation.GlobalTranslator; + import org.jetbrains.annotations.NotNull; + import org.slf4j.LoggerFactory; + +@@ -14,6 +16,6 @@ public class ComponentLoggerProviderImpl implements ComponentLoggerProvider { + } + + private String serialize(final Component message) { +- return PaperAdventure.asPlain(message, null); ++ return PaperAdventure.ANSI_SERIALIZER.serialize(GlobalTranslator.render(message, Locale.getDefault())); + } + } +diff --git a/src/main/java/io/papermc/paper/console/StripANSIConverter.java b/src/main/java/io/papermc/paper/console/StripANSIConverter.java +new file mode 100644 +index 0000000000000000000000000000000000000000..91547f6e6fe90006713beb2818da634304bdd236 +--- /dev/null ++++ b/src/main/java/io/papermc/paper/console/StripANSIConverter.java +@@ -0,0 +1,51 @@ ++package io.papermc.paper.console; ++ ++import org.apache.logging.log4j.core.LogEvent; ++import org.apache.logging.log4j.core.config.Configuration; ++import org.apache.logging.log4j.core.config.plugins.Plugin; ++import org.apache.logging.log4j.core.layout.PatternLayout; ++import org.apache.logging.log4j.core.pattern.ConverterKeys; ++import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; ++import org.apache.logging.log4j.core.pattern.PatternConverter; ++import org.apache.logging.log4j.core.pattern.PatternFormatter; ++import org.apache.logging.log4j.core.pattern.PatternParser; ++ ++import java.util.List; ++import java.util.regex.Pattern; ++ ++@Plugin(name = "stripAnsi", category = PatternConverter.CATEGORY) ++@ConverterKeys({"stripAnsi"}) ++public final class StripANSIConverter extends LogEventPatternConverter { ++ final private Pattern ANSI_PATTERN = Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); ++ ++ private final List formatters; ++ ++ private StripANSIConverter(List formatters) { ++ super("stripAnsi", null); ++ this.formatters = formatters; ++ } ++ ++ @Override ++ public void format(LogEvent event, StringBuilder toAppendTo) { ++ int start = toAppendTo.length(); ++ for (PatternFormatter formatter : formatters) { ++ formatter.format(event, toAppendTo); ++ } ++ String content = toAppendTo.substring(start); ++ content = ANSI_PATTERN.matcher(content).replaceAll(""); ++ ++ toAppendTo.setLength(start); ++ toAppendTo.append(content); ++ } ++ ++ public static StripANSIConverter newInstance(Configuration config, String[] options) { ++ if (options.length != 1) { ++ LOGGER.error("Incorrect number of options on stripAnsi. Expected exactly 1, received " + options.length); ++ return null; ++ } ++ ++ PatternParser parser = PatternLayout.createPatternParser(config); ++ List formatters = parser.parse(options[0]); ++ return new StripANSIConverter(formatters); ++ } ++} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 79b4139b653a09142e1b624849ad7c529c35450d..bc96a5c546c01b092f513f202e833b7b5f320e72 100644 +index 79b4139b653a09142e1b624849ad7c529c35450d..54108afdf1f88f8d9056b744ee9b0d3ebf009fcb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -165,7 +165,7 @@ import com.mojang.datafixers.util.Pair; @@ -166,7 +286,7 @@ index 79b4139b653a09142e1b624849ad7c529c35450d..bc96a5c546c01b092f513f202e833b7b @Override public void sendSystemMessage(Component message) { - MinecraftServer.LOGGER.info(message.getString()); -+ MinecraftServer.LOGGER.info(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors ++ MinecraftServer.LOGGER.info(io.papermc.paper.adventure.PaperAdventure.ANSI_SERIALIZER.serialize(io.papermc.paper.adventure.PaperAdventure.asAdventure(message))); // Paper - Log message with colors } public KeyPair getKeyPair() { @@ -221,6 +341,19 @@ index 81a0a897a1fd2a408bfe43f24ed5e5f4bbefe161..24f62f9c4d288297d7a324e806745cc1 System.setOut(IoBuilder.forLogger(logger).setLevel(Level.INFO).buildPrintStream()); System.setErr(IoBuilder.forLogger(logger).setLevel(Level.WARN).buildPrintStream()); +diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java +index 75083eeb9b413e6dd5375007360dce6857a08fff..d292fdb165436f0b9b46b32110f5e09ad0e517a1 100644 +--- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java ++++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java +@@ -166,7 +166,7 @@ public class MinecraftServerGui extends JComponent { + this.finalizers.forEach(Runnable::run); + } + +- private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})*)?[m|K]"); // CraftBukkit ++ private static final java.util.regex.Pattern ANSI = java.util.regex.Pattern.compile("\\e\\[[\\d;]*[^\\d;]"); // CraftBukkit // Paper + public void print(JTextArea textArea, JScrollPane scrollPane, String message) { + if (!SwingUtilities.isEventDispatchThread()) { + SwingUtilities.invokeLater(() -> { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index a9cab02b97f85fec31ad636f7a340066d409be36..03ea44619bc3445956f3e4539fc0e2923a29a92d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java @@ -478,7 +611,7 @@ index 0000000000000000000000000000000000000000..0694b21465fb9e4164e71862ff24b622 @@ -0,0 +1 @@ +log4j.skipJansi=true diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 722ca84968cbbbdeffd09939abff0cccd0a84010..620b9490e5f159080e50289d127404a1b56adbef 100644 +index 722ca84968cbbbdeffd09939abff0cccd0a84010..a994ec0f8621b1f267b40049306f63479c050e2f 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,17 +1,14 @@ @@ -495,11 +628,11 @@ index 722ca84968cbbbdeffd09939abff0cccd0a84010..620b9490e5f159080e50289d127404a1 - - + -+ ++ + - -+ ++ diff --git a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch index da2d8e20f1..f502abb948 100644 --- a/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -15,18 +15,18 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/build.gradle.kts b/build.gradle.kts -index 38c08ee8e935d3fdf5ad4e443352e3563609e3c0..97f1a5bafdd1f520fee5f31fda87b4c251aea33f 100644 +index 700be2fdc10d14222f06e482681bb3a2e9a0aee6..5524d44f8b97480bce3ed5ec7e154aae1fb13a2d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -17,7 +17,7 @@ dependencies { +@@ -18,7 +18,7 @@ dependencies { all its classes to check if they are plugins. Scanning takes about 1-2 seconds so adding this speeds up the server start. */ - runtimeOnly("org.apache.logging.log4j:log4j-core:2.14.1") + implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation + annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins // Paper end implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion - implementation("org.ow2.asm:asm:9.4") diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index 0a0aa6de31a94a701074cc5f43c94be7515a185c..489ce6f439778b26eb33ede9432681d4bf9e0116 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java @@ -41,29 +41,29 @@ index 0a0aa6de31a94a701074cc5f43c94be7515a185c..489ce6f439778b26eb33ede9432681d4 public static int playerShuffle; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 620b9490e5f159080e50289d127404a1b56adbef..a8bdaaeaa1a9316848416f0533739b9b083ca151 100644 +index a994ec0f8621b1f267b40049306f63479c050e2f..bba2de3f3feb5e6a876f9df1eee6da0c7d93e271 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -5,10 +5,22 @@ -- +- + -+ ++ + + ++ pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" /> + + -- +- + -+ ++ + + ++ pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" /> + + diff --git a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch index 5afb9562c0..06b30f0a00 100644 --- a/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch +++ b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch @@ -14,34 +14,34 @@ log. Disable the logger prefix for these plugins so the messages show up correctly. diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index a8bdaaeaa1a9316848416f0533739b9b083ca151..476f4a5cbe664ddd05474cb88553018bd334a5b8 100644 +index bba2de3f3feb5e6a876f9df1eee6da0c7d93e271..88957220d5574e5590e8a545605d76c0c7b0a10e 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -6,19 +6,21 @@ -- -+ +- ++ - +- pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx}" /> + + ++ pattern="%highlightError{[%d{HH:mm:ss} %level]: %msg%n%xEx{full}}" /> -- -+ +- ++ - +- pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n" /> + + ++ pattern="[%d{HH:mm:ss}] [%t/%level]: %stripAnsi{%msg}%n%xEx{full}" /> diff --git a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch index e7ee569d1e..4e4cf25665 100644 --- a/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch +++ b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread diff --git a/build.gradle.kts b/build.gradle.kts -index 97f1a5bafdd1f520fee5f31fda87b4c251aea33f..41485437cdf438cfb837a9fcd276c2dd70b84b42 100644 +index 5524d44f8b97480bce3ed5ec7e154aae1fb13a2d..02f26dd4a4a75ca35a124ab2e6e426e72121f55b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -27,6 +27,7 @@ dependencies { +@@ -29,6 +29,7 @@ dependencies { implementation("commons-lang:commons-lang:2.6") runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") runtimeOnly("com.mysql:mysql-connector-j:8.0.33") @@ -17,7 +17,7 @@ index 97f1a5bafdd1f520fee5f31fda87b4c251aea33f..41485437cdf438cfb837a9fcd276c2dd runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 476f4a5cbe664ddd05474cb88553018bd334a5b8..3dc317e466e1b93dff030794dd7f29ca1b266778 100644 +index 88957220d5574e5590e8a545605d76c0c7b0a10e..ea4e2161c0bd43884055cc6b8d70b2139f70e720 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -29,15 +29,18 @@ diff --git a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 2be0b10356..16a9f30507 100644 --- a/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0392-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -6,18 +6,10 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and diff --git a/build.gradle.kts b/build.gradle.kts -index 9617477e8ef0ef5b1af4733ce4e87ddd796a7be2..e6731ada5a7f0f66322fd958f6244b3d5b8887bf 100644 +index 9183b71f6ca78b4a3bc7d804f8d9c4c6db65d5cc..f1fd98bd3d39b4c34043b269e8c43cff073f2726 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -19,6 +19,7 @@ dependencies { - Scanning takes about 1-2 seconds so adding this speeds up the server start. - */ - implementation("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - implementation -+ annotationProcessor("org.apache.logging.log4j:log4j-core:2.14.1") // Paper - Needed to generate meta for our Log4j plugins - // Paper end - implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion - implementation("org.ow2.asm:asm:9.4") -@@ -26,6 +27,7 @@ dependencies { +@@ -28,6 +28,7 @@ dependencies { testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files implementation("commons-lang:commons-lang:2.6") @@ -25,7 +17,7 @@ index 9617477e8ef0ef5b1af4733ce4e87ddd796a7be2..e6731ada5a7f0f66322fd958f6244b3d runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") runtimeOnly("com.mysql:mysql-connector-j:8.0.33") runtimeOnly("com.lmax:disruptor:3.4.4") // Paper -@@ -105,6 +107,18 @@ tasks.check { +@@ -107,6 +108,18 @@ tasks.check { } // Paper end @@ -504,7 +496,7 @@ index 5308f016baf3001ffd1468633cde446493ca581e..1b6d090afea5b0a49b601b73cefeedc0 protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet packet) { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 71b395db734c257a64ec3297eebbe52883ea4cc7..072888f891c8e25a2b4daaf561e124930df2be1e 100644 +index aaad6b0de19872c6e54591adf90c30d2c2ed5223..6a4c7783146ff6b6703e9ae814134a8d1086cf7f 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -195,6 +195,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -643,7 +635,7 @@ index 383c52c62f49b17db2fbf58009d6ea132d124bea..e0a71bfc1498a517456b21747ab6ef3f log.log( Level.SEVERE, "\t\t" + stack ); } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index d285dbec16272db6b8a71865e05924ad66087407..1a05d23ff886b015fb9396f119822c678a47ec6f 100644 +index 266b4e6fb3988b5848021c83fdc68e342c70b188..2b247d55e39246fbef31279b14c45fc40f956bfb 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -30,10 +30,14 @@ diff --git a/patches/server/0393-Implement-Mob-Goal-API.patch b/patches/server/0393-Implement-Mob-Goal-API.patch index b8706e49a0..5781049a4c 100644 --- a/patches/server/0393-Implement-Mob-Goal-API.patch +++ b/patches/server/0393-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 e6731ada5a7f0f66322fd958f6244b3d5b8887bf..f57bd7863e90afb461158ab54ce4e3bcd6deb6cf 100644 +index f1fd98bd3d39b4c34043b269e8c43cff073f2726..b65278b9addf9a26b0f63975f439d333fd3fdf87 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -36,6 +36,7 @@ dependencies { +@@ -37,6 +37,7 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") diff --git a/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch deleted file mode 100644 index 3182b003b4..0000000000 --- a/patches/server/0561-Add-support-for-hex-color-codes-in-console.patch +++ /dev/null @@ -1,327 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Josh Roy <10731363+JRoy@users.noreply.github.com> -Date: Sat, 20 Feb 2021 13:09:59 -0500 -Subject: [PATCH] Add support for hex color codes in console - -Converts upstream's hex color code legacy format into actual hex color codes in the console. - -diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java -index 685deaa0e5d1ddc13e3a7c0471b1cfcf1710c869..8f07539a82f449ad217e316a7513a1708781fb63 100644 ---- a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java -+++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java -@@ -1,16 +1,25 @@ - package com.destroystokyo.paper.console; - -+import net.kyori.adventure.audience.MessageType; -+import net.kyori.adventure.identity.Identity; -+import net.kyori.adventure.text.Component; -+import net.kyori.adventure.text.logger.slf4j.ComponentLogger; -+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; - import org.apache.logging.log4j.LogManager; --import org.apache.logging.log4j.Logger; - import org.bukkit.craftbukkit.command.CraftConsoleCommandSender; - - public class TerminalConsoleCommandSender extends CraftConsoleCommandSender { - -- private static final Logger LOGGER = LogManager.getRootLogger(); -+ private static final ComponentLogger LOGGER = ComponentLogger.logger(LogManager.getRootLogger().getName()); - - @Override - public void sendRawMessage(String message) { -- // TerminalConsoleAppender supports color codes directly in log messages -+ final Component msg = LegacyComponentSerializer.legacySection().deserialize(message); -+ this.sendMessage(Identity.nil(), msg, MessageType.SYSTEM); -+ } -+ -+ @Override -+ public void sendMessage(Identity identity, Component message, MessageType type) { - LOGGER.info(message); - } - -diff --git a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java -index c3631efda9c7fa531a8a9f18fbee7b5f8655382b..9a3c1314d5a0aa20380662595359580b1a97be89 100644 ---- a/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java -+++ b/src/main/java/io/papermc/paper/adventure/providers/ComponentLoggerProviderImpl.java -@@ -1,9 +1,11 @@ - package io.papermc.paper.adventure.providers; - --import io.papermc.paper.adventure.PaperAdventure; -+import io.papermc.paper.console.HexFormattingConverter; -+import java.util.Locale; - import net.kyori.adventure.text.Component; - import net.kyori.adventure.text.logger.slf4j.ComponentLogger; - import net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider; -+import net.kyori.adventure.translation.GlobalTranslator; - import org.jetbrains.annotations.NotNull; - import org.slf4j.LoggerFactory; - -@@ -14,6 +16,6 @@ public class ComponentLoggerProviderImpl implements ComponentLoggerProvider { - } - - private String serialize(final Component message) { -- return PaperAdventure.asPlain(message, null); -+ return HexFormattingConverter.SERIALIZER.serialize(GlobalTranslator.render(message, Locale.getDefault())); - } - } -diff --git a/src/main/java/io/papermc/paper/console/HexFormattingConverter.java b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java -new file mode 100644 -index 0000000000000000000000000000000000000000..b9922b07cb105618390187d98acdf89e728e1f5a ---- /dev/null -+++ b/src/main/java/io/papermc/paper/console/HexFormattingConverter.java -@@ -0,0 +1,213 @@ -+package io.papermc.paper.console; -+ -+import io.papermc.paper.configuration.GlobalConfiguration; -+import io.papermc.paper.adventure.PaperAdventure; -+import net.kyori.adventure.text.format.NamedTextColor; -+import net.kyori.adventure.text.format.TextColor; -+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -+import net.minecrell.terminalconsole.TerminalConsoleAppender; -+import org.apache.logging.log4j.core.LogEvent; -+import org.apache.logging.log4j.core.config.Configuration; -+import org.apache.logging.log4j.core.config.plugins.Plugin; -+import org.apache.logging.log4j.core.layout.PatternLayout; -+import org.apache.logging.log4j.core.pattern.ConverterKeys; -+import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; -+import org.apache.logging.log4j.core.pattern.PatternConverter; -+import org.apache.logging.log4j.core.pattern.PatternFormatter; -+import org.apache.logging.log4j.core.pattern.PatternParser; -+import org.apache.logging.log4j.util.PerformanceSensitive; -+import org.apache.logging.log4j.util.PropertiesUtil; -+ -+import java.util.List; -+import java.util.regex.Matcher; -+import java.util.regex.Pattern; -+ -+import static net.minecrell.terminalconsole.MinecraftFormattingConverter.KEEP_FORMATTING_PROPERTY; -+ -+/** -+ * Modified version of -+ * TerminalConsoleAppender's MinecraftFormattingConverter to support hex color codes using the Adventure [char]#rrggbb format. -+ */ -+@Plugin(name = "paperMinecraftFormatting", category = PatternConverter.CATEGORY) -+@ConverterKeys({"paperMinecraftFormatting"}) -+@PerformanceSensitive("allocation") -+public final class HexFormattingConverter extends LogEventPatternConverter { -+ -+ private static final boolean KEEP_FORMATTING = PropertiesUtil.getProperties().getBooleanProperty(KEEP_FORMATTING_PROPERTY); -+ -+ private static final String ANSI_RESET = "\u001B[m"; -+ -+ private static final char COLOR_CHAR = 0x7f; -+ public static final LegacyComponentSerializer SERIALIZER = LegacyComponentSerializer.builder() -+ .hexColors() -+ .flattener(PaperAdventure.FLATTENER) -+ .character(HexFormattingConverter.COLOR_CHAR) -+ .build(); -+ private static final String LOOKUP = "0123456789abcdefklmnor"; -+ -+ private static final String RGB_ANSI = "\u001B[38;2;%d;%d;%dm"; -+ private static final String RESET_RGB_ANSI = ANSI_RESET + RGB_ANSI; -+ private static final Pattern NAMED_PATTERN = Pattern.compile(COLOR_CHAR + "[0-9a-fk-orA-FK-OR]"); -+ private static final Pattern RGB_PATTERN = Pattern.compile(COLOR_CHAR + "#([0-9a-fA-F]){6}"); -+ -+ private static final String[] RGB_ANSI_CODES = new String[]{ -+ formatHexAnsi(NamedTextColor.BLACK), // Black §0 -+ formatHexAnsi(NamedTextColor.DARK_BLUE), // Dark Blue §1 -+ formatHexAnsi(NamedTextColor.DARK_GREEN), // Dark Green §2 -+ formatHexAnsi(NamedTextColor.DARK_AQUA), // Dark Aqua §3 -+ formatHexAnsi(NamedTextColor.DARK_RED), // Dark Red §4 -+ formatHexAnsi(NamedTextColor.DARK_PURPLE), // Dark Purple §5 -+ formatHexAnsi(NamedTextColor.GOLD), // Gold §6 -+ formatHexAnsi(NamedTextColor.GRAY), // Gray §7 -+ formatHexAnsi(NamedTextColor.DARK_GRAY), // Dark Gray §8 -+ formatHexAnsi(NamedTextColor.BLUE), // Blue §9 -+ formatHexAnsi(NamedTextColor.GREEN), // Green §a -+ formatHexAnsi(NamedTextColor.AQUA), // Aqua §b -+ formatHexAnsi(NamedTextColor.RED), // Red §c -+ formatHexAnsi(NamedTextColor.LIGHT_PURPLE), // Light Purple §d -+ formatHexAnsi(NamedTextColor.YELLOW), // Yellow §e -+ formatHexAnsi(NamedTextColor.WHITE), // White §f -+ "\u001B[5m", // Obfuscated §k -+ "\u001B[1m", // Bold §l -+ "\u001B[9m", // Strikethrough §m -+ "\u001B[4m", // Underline §n -+ "\u001B[3m", // Italic §o -+ ANSI_RESET, // Reset §r -+ }; -+ private static final String[] ANSI_ANSI_CODES = new String[]{ -+ ANSI_RESET + "\u001B[0;30m", // Black §0 -+ ANSI_RESET + "\u001B[0;34m", // Dark Blue §1 -+ ANSI_RESET + "\u001B[0;32m", // Dark Green §2 -+ ANSI_RESET + "\u001B[0;36m", // Dark Aqua §3 -+ ANSI_RESET + "\u001B[0;31m", // Dark Red §4 -+ ANSI_RESET + "\u001B[0;35m", // Dark Purple §5 -+ ANSI_RESET + "\u001B[0;33m", // Gold §6 -+ ANSI_RESET + "\u001B[0;37m", // Gray §7 -+ ANSI_RESET + "\u001B[0;30;1m", // Dark Gray §8 -+ ANSI_RESET + "\u001B[0;34;1m", // Blue §9 -+ ANSI_RESET + "\u001B[0;32;1m", // Green §a -+ ANSI_RESET + "\u001B[0;36;1m", // Aqua §b -+ ANSI_RESET + "\u001B[0;31;1m", // Red §c -+ ANSI_RESET + "\u001B[0;35;1m", // Light Purple §d -+ ANSI_RESET + "\u001B[0;33;1m", // Yellow §e -+ ANSI_RESET + "\u001B[0;37;1m", // White §f -+ "\u001B[5m", // Obfuscated §k -+ "\u001B[1m", // Bold §l -+ "\u001B[9m", // Strikethrough §m -+ "\u001B[4m", // Underline §n -+ "\u001B[3m", // Italic §o -+ ANSI_RESET, // Reset §r -+ }; -+ -+ private final boolean ansi; -+ private final List formatters; -+ -+ /** -+ * Construct the converter. -+ * -+ * @param formatters The pattern formatters to generate the text to manipulate -+ * @param strip If true, the converter will strip all formatting codes -+ */ -+ protected HexFormattingConverter(List formatters, boolean strip) { -+ super("paperMinecraftFormatting", null); -+ this.formatters = formatters; -+ this.ansi = !strip; -+ } -+ -+ @Override -+ public void format(LogEvent event, StringBuilder toAppendTo) { -+ int start = toAppendTo.length(); -+ //noinspection ForLoopReplaceableByForEach -+ for (int i = 0, size = formatters.size(); i < size; i++) { -+ formatters.get(i).format(event, toAppendTo); -+ } -+ -+ if (KEEP_FORMATTING || toAppendTo.length() == start) { -+ // Skip replacement if disabled or if the content is empty -+ return; -+ } -+ -+ boolean useAnsi = ansi && TerminalConsoleAppender.isAnsiSupported(); -+ String content = toAppendTo.substring(start); -+ content = useAnsi ? convertRGBColors(content) : stripRGBColors(content); -+ format(content, toAppendTo, start, useAnsi); -+ } -+ -+ private static String convertRGBColors(final String input) { -+ return RGB_PATTERN.matcher(input).replaceAll(result -> { -+ final int hex = Integer.decode(result.group().substring(1)); -+ return formatHexAnsi(hex); -+ }); -+ } -+ -+ private static String formatHexAnsi(final TextColor color) { -+ return formatHexAnsi(color.value()); -+ } -+ -+ private static String formatHexAnsi(final int color) { -+ final int red = color >> 16 & 0xFF; -+ final int green = color >> 8 & 0xFF; -+ final int blue = color & 0xFF; -+ return String.format(RESET_RGB_ANSI, red, green, blue); -+ } -+ -+ private static String stripRGBColors(final String input) { -+ return RGB_PATTERN.matcher(input).replaceAll(""); -+ } -+ -+ static void format(String content, StringBuilder result, int start, boolean ansi) { -+ int next = content.indexOf(COLOR_CHAR); -+ int last = content.length() - 1; -+ if (next == -1 || next == last) { -+ result.setLength(start); -+ result.append(content); -+ if (ansi) { -+ result.append(ANSI_RESET); -+ } -+ return; -+ } -+ -+ Matcher matcher = NAMED_PATTERN.matcher(content); -+ StringBuilder buffer = new StringBuilder(); -+ final String[] ansiCodes = GlobalConfiguration.get().logging.useRgbForNamedTextColors ? RGB_ANSI_CODES : ANSI_ANSI_CODES; -+ while (matcher.find()) { -+ int format = LOOKUP.indexOf(Character.toLowerCase(matcher.group().charAt(1))); -+ if (format != -1) { -+ matcher.appendReplacement(buffer, ansi ? ansiCodes[format] : ""); -+ } -+ } -+ matcher.appendTail(buffer); -+ -+ result.setLength(start); -+ result.append(buffer); -+ if (ansi) { -+ result.append(ANSI_RESET); -+ } -+ } -+ -+ /** -+ * Gets a new instance of the {@link HexFormattingConverter} with the -+ * specified options. -+ * -+ * @param config The current configuration -+ * @param options The pattern options -+ * @return The new instance -+ * @see HexFormattingConverter -+ */ -+ public static HexFormattingConverter newInstance(Configuration config, String[] options) { -+ if (options.length < 1 || options.length > 2) { -+ LOGGER.error("Incorrect number of options on paperMinecraftFormatting. Expected at least 1, max 2 received " + options.length); -+ return null; -+ } -+ if (options[0] == null) { -+ LOGGER.error("No pattern supplied on paperMinecraftFormatting"); -+ return null; -+ } -+ -+ PatternParser parser = PatternLayout.createPatternParser(config); -+ List formatters = parser.parse(options[0]); -+ boolean strip = options.length > 1 && "strip".equals(options[1]); -+ return new HexFormattingConverter(formatters, strip); -+ } -+ -+} -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5ac5937c72286d96c394a4da90cbc4436e22ed59..607651ca570483e98786aded8986a535301f3e80 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1706,7 +1706,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop - - -- -+ - - - -+ pattern="%highlightError{[%d{HH:mm:ss} %level]: %paperMinecraftFormatting{%msg}%n%xEx{full}}" /> - - - - - -- -+ - - - -+ pattern="[%d{HH:mm:ss}] [%t/%level]: %paperMinecraftFormatting{%msg}{strip}%n%xEx{full}" /> - - - diff --git a/patches/server/0562-Expose-Tracked-Players.patch b/patches/server/0561-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0562-Expose-Tracked-Players.patch rename to patches/server/0561-Expose-Tracked-Players.patch diff --git a/patches/server/0563-Remove-streams-from-SensorNearest.patch b/patches/server/0562-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0563-Remove-streams-from-SensorNearest.patch rename to patches/server/0562-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0564-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0564-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0563-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0565-Improve-ServerGUI.patch b/patches/server/0564-Improve-ServerGUI.patch similarity index 99% rename from patches/server/0565-Improve-ServerGUI.patch rename to patches/server/0564-Improve-ServerGUI.patch index e573bd2f58..9606c8a72f 100644 --- a/patches/server/0565-Improve-ServerGUI.patch +++ b/patches/server/0564-Improve-ServerGUI.patch @@ -39,7 +39,7 @@ index 23239679d6584f1088b2b94c46eb9a5c1f9ad91d..fa56cd09102a89692b42f1d142579905 + } } diff --git a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java -index 66464c10a6b33414c6d1b67b926a66c343d5f887..c07918aa1ed2469ad7a76a0add60ab648ff7f421 100644 +index 2e93eec8733c5b548a15269a322fe4dd1f189b7d..dd9f611efc95f7d06fd3011fedd5d0317b1d0a85 100644 --- a/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java +++ b/src/main/java/net/minecraft/server/gui/MinecraftServerGui.java @@ -59,6 +59,15 @@ public class MinecraftServerGui extends JComponent { diff --git a/patches/server/0566-fix-converting-txt-to-json-file.patch b/patches/server/0565-fix-converting-txt-to-json-file.patch similarity index 97% rename from patches/server/0566-fix-converting-txt-to-json-file.patch rename to patches/server/0565-fix-converting-txt-to-json-file.patch index 5115096195..5c89a8730e 100644 --- a/patches/server/0566-fix-converting-txt-to-json-file.patch +++ b/patches/server/0565-fix-converting-txt-to-json-file.patch @@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315 this.saveUserBanList(); this.loadIpBanList(); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 6c1db5d6bf11184205073a4ce755e7f4e987643a..01e67001435dfa74062fda386072c552b39f2377 100644 +index 1ffd3854239862414e6ceecf2764ba3d6bd7942a..030b6e33fe80f6c50c473dbaa8f9aa9d4384a6b2 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0567-Add-worldborder-events.patch b/patches/server/0566-Add-worldborder-events.patch similarity index 100% rename from patches/server/0567-Add-worldborder-events.patch rename to patches/server/0566-Add-worldborder-events.patch diff --git a/patches/server/0568-added-PlayerNameEntityEvent.patch b/patches/server/0567-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0568-added-PlayerNameEntityEvent.patch rename to patches/server/0567-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0569-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0568-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0569-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0568-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0570-Add-recipe-to-cook-events.patch b/patches/server/0569-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0570-Add-recipe-to-cook-events.patch rename to patches/server/0569-Add-recipe-to-cook-events.patch diff --git a/patches/server/0571-Add-Block-isValidTool.patch b/patches/server/0570-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0571-Add-Block-isValidTool.patch rename to patches/server/0570-Add-Block-isValidTool.patch diff --git a/patches/server/0572-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0571-Allow-using-signs-inside-spawn-protection.patch similarity index 94% rename from patches/server/0572-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0571-Allow-using-signs-inside-spawn-protection.patch index 740ba7d58f..d2ff2b0366 100644 --- a/patches/server/0572-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0571-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 df9d65167346152d9c589e3072e3d3d6882db5c6..6c695a80b1e175a6207a89c3f38e6c5faa3742e6 100644 +index ad19b3870fcc8ebd20fe429de3123731a0c2df07..fa808d6e3288996fab06e4b577957185e0009bce 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1826,7 +1826,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0573-Expand-world-key-API.patch b/patches/server/0572-Expand-world-key-API.patch similarity index 100% rename from patches/server/0573-Expand-world-key-API.patch rename to patches/server/0572-Expand-world-key-API.patch diff --git a/patches/server/0574-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0574-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0573-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0575-Item-Rarity-API.patch b/patches/server/0574-Item-Rarity-API.patch similarity index 100% rename from patches/server/0575-Item-Rarity-API.patch rename to patches/server/0574-Item-Rarity-API.patch diff --git a/patches/server/0576-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0576-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0575-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0577-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0576-forced-whitelist-use-configurable-kick-message.patch similarity index 92% rename from patches/server/0577-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0576-forced-whitelist-use-configurable-kick-message.patch index e1def93afa..5b96e8d5dd 100644 --- a/patches/server/0577-forced-whitelist-use-configurable-kick-message.patch +++ b/patches/server/0576-forced-whitelist-use-configurable-kick-message.patch @@ -5,7 +5,7 @@ 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 607651ca570483e98786aded8986a535301f3e80..cd531eff22742cff16ce4888853cba53861792dd 100644 +index 34658ffabd88abbc84bfc19f44c9cd391f2cb1bb..b3f04bb7afee65584566591b302feb8dfa850e87 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2150,7 +2150,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Reviewed-by: Mariell Hoversholm diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 91ed7311d365c9134c9a2598ca5ed9f94263b6e9..4757d6432631f0c5379597b40fda169ac7cd8621 100644 +index 75c0ea2a59963334555efa1af03693fdff0fac32..1fbe7a58707ddd40f80d71e3703ff3fefff672f4 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -91,7 +91,7 @@ index 29a0a720f22f56ca3d844efef1ecde3980fb1c12..838244e3680ea6020701e10bafbde7f5 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2060f20a4da4c4005b8de03f82f497626f83d9b0..707f0e0bdd3617fac987dacea36df6c363ca71ca 100644 +index aaeacc33183774aa3969aaff2e5304936f7041d4..1349efcfb368305d5437ec464a5f32a17177f0ca 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2624,6 +2624,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0615-Add-EntityInsideBlockEvent.patch b/patches/server/0614-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0615-Add-EntityInsideBlockEvent.patch rename to patches/server/0614-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0616-Attributes-API-for-item-defaults.patch b/patches/server/0615-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0616-Attributes-API-for-item-defaults.patch rename to patches/server/0615-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0617-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0616-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0618-More-Lidded-Block-API.patch b/patches/server/0617-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0618-More-Lidded-Block-API.patch rename to patches/server/0617-More-Lidded-Block-API.patch diff --git a/patches/server/0619-Limit-item-frame-cursors-on-maps.patch b/patches/server/0618-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0619-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0618-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0620-Add-PlayerKickEvent-causes.patch b/patches/server/0619-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0620-Add-PlayerKickEvent-causes.patch rename to patches/server/0619-Add-PlayerKickEvent-causes.patch index 0089d0d1da..1445892a9d 100644 --- a/patches/server/0620-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0619-Add-PlayerKickEvent-causes.patch @@ -36,7 +36,7 @@ index b5f54ee82905e3e6ab5bfde35ab625f5feeb1393..c0a80824a0307ea673805015119cc834 public boolean shouldDisconnect() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e1ca7910cb7c605e8aa175ff6b978e901f405f56..b800249823e413933a5d469e431a003f977f59e7 100644 +index 21d893bb1867aa5cae7924734a0e843d4c35aa94..76bdca305277d8d2a659b029f035bb4da25a076e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2153,7 +2153,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 54bbe187860c8aecd4da8bd3eb1c25c18b29dddf..f0aa3519f90d00e5f1d3bcc3cd431f3c57744412 100644 +index 4d2c3a03236e95283473e3290f5efe95f2a196bb..8141d09c2b31053f0fbf3696dbc857d743873454 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -514,7 +514,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch similarity index 97% rename from patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch index acf783ec1b..004b00f0db 100644 --- a/patches/server/0643-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0642-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c65aa2ed46ac8cef2306eb4035c7a0742a3e8b08..f82323c18792882dbbadc78a382dc7ffa9a4612f 100644 +index 62e8586d30950eed81868ccbb48212a426774da3..9cc26c870d3785c7ab798cf53f10ad8fd942bfb0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1164,7 +1164,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0644-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0643-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0644-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0643-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0645-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0644-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0645-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0644-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0646-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0646-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0645-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0647-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0647-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0646-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0648-Stinger-API.patch b/patches/server/0647-Stinger-API.patch similarity index 100% rename from patches/server/0648-Stinger-API.patch rename to patches/server/0647-Stinger-API.patch diff --git a/patches/server/0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0649-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0648-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0650-Add-System.out-err-catcher.patch b/patches/server/0649-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0650-Add-System.out-err-catcher.patch rename to patches/server/0649-Add-System.out-err-catcher.patch diff --git a/patches/server/0651-Fix-test-not-bootstrapping.patch b/patches/server/0650-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0651-Fix-test-not-bootstrapping.patch rename to patches/server/0650-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 98% rename from patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch index 10cd90749d..a02cafdd72 100644 --- a/patches/server/0652-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch +++ b/patches/server/0651-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch @@ -230,7 +230,7 @@ index 0000000000000000000000000000000000000000..34734bb969a1a74c7a4f9c17d40ebf00 + } +} diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 2e421eaac80cf251b32e0bb504dd54a73edf4986..74ccc67e3c12dc5182602fb691ef3ddeb5b53280 100644 +index 2b247d55e39246fbef31279b14c45fc40f956bfb..675cd61221e807aadf28322b46c3daa1370241b5 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -34,6 +34,10 @@ diff --git a/patches/server/0653-Improve-boat-collision-performance.patch b/patches/server/0652-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0653-Improve-boat-collision-performance.patch rename to patches/server/0652-Improve-boat-collision-performance.patch diff --git a/patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 93% rename from patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0653-Prevent-AFK-kick-while-watching-end-credits.patch index f982d9439c..d77603e26d 100644 --- a/patches/server/0654-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0653-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 f0aa3519f90d00e5f1d3bcc3cd431f3c57744412..ee3325c1035a0427e608ce22c462085c3c677e48 100644 +index 8141d09c2b31053f0fbf3696dbc857d743873454..ce1a8355e155faaec9d8eebf89a41b7929dcbd12 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -431,7 +431,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0655-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0655-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0654-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0656-Add-PlayerSetSpawnEvent.patch b/patches/server/0655-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0656-Add-PlayerSetSpawnEvent.patch rename to patches/server/0655-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0657-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0657-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0656-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0658-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0657-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0658-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0657-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0659-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0658-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0659-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0658-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0660-Added-EntityDamageItemEvent.patch b/patches/server/0659-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0660-Added-EntityDamageItemEvent.patch rename to patches/server/0659-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0661-Optimize-indirect-passenger-iteration.patch b/patches/server/0660-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0661-Optimize-indirect-passenger-iteration.patch rename to patches/server/0660-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0662-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0662-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0661-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0663-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0662-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0663-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0662-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0664-Clear-bucket-NBT-after-dispense.patch b/patches/server/0663-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0664-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0663-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0665-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0665-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0664-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0666-Add-BlockBreakBlockEvent.patch b/patches/server/0665-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0666-Add-BlockBreakBlockEvent.patch rename to patches/server/0665-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0667-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0666-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0668-More-CommandBlock-API.patch b/patches/server/0667-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0668-More-CommandBlock-API.patch rename to patches/server/0667-More-CommandBlock-API.patch diff --git a/patches/server/0669-Add-missing-team-sidebar-display-slots.patch b/patches/server/0668-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0669-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0668-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0670-Add-back-EntityPortalExitEvent.patch b/patches/server/0669-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0670-Add-back-EntityPortalExitEvent.patch rename to patches/server/0669-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0671-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0670-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0672-Get-entity-default-attributes.patch b/patches/server/0671-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0672-Get-entity-default-attributes.patch rename to patches/server/0671-Get-entity-default-attributes.patch diff --git a/patches/server/0673-Left-handed-API.patch b/patches/server/0672-Left-handed-API.patch similarity index 100% rename from patches/server/0673-Left-handed-API.patch rename to patches/server/0672-Left-handed-API.patch diff --git a/patches/server/0674-Add-more-advancement-API.patch b/patches/server/0673-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0674-Add-more-advancement-API.patch rename to patches/server/0673-Add-more-advancement-API.patch diff --git a/patches/server/0675-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0675-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0674-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0676-Add-critical-damage-API.patch b/patches/server/0675-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0676-Add-critical-damage-API.patch rename to patches/server/0675-Add-critical-damage-API.patch diff --git a/patches/server/0677-Fix-issues-with-mob-conversion.patch b/patches/server/0676-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0677-Fix-issues-with-mob-conversion.patch rename to patches/server/0676-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0678-Add-isCollidable-methods-to-various-places.patch b/patches/server/0677-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0678-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0677-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0679-Goat-ram-API.patch b/patches/server/0678-Goat-ram-API.patch similarity index 100% rename from patches/server/0679-Goat-ram-API.patch rename to patches/server/0678-Goat-ram-API.patch diff --git a/patches/server/0680-Add-API-for-resetting-a-single-score.patch b/patches/server/0679-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0680-Add-API-for-resetting-a-single-score.patch rename to patches/server/0679-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0681-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0681-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0680-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0682-Vanilla-command-permission-fixes.patch b/patches/server/0681-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0682-Vanilla-command-permission-fixes.patch rename to patches/server/0681-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0683-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0682-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0684-Fix-GameProfileCache-concurrency.patch b/patches/server/0683-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0684-Fix-GameProfileCache-concurrency.patch rename to patches/server/0683-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0685-Improve-and-expand-AsyncCatcher.patch b/patches/server/0684-Improve-and-expand-AsyncCatcher.patch similarity index 98% rename from patches/server/0685-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0684-Improve-and-expand-AsyncCatcher.patch index 7ebc09e231..822bef6e4f 100644 --- a/patches/server/0685-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0684-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 ee3325c1035a0427e608ce22c462085c3c677e48..cbf76edc482c51a0b0f0633f65186e0933dee599 100644 +index ce1a8355e155faaec9d8eebf89a41b7929dcbd12..8b85b4ea7411e9b523647e39c366bf63e27d0d2b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1653,6 +1653,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -29,7 +29,7 @@ index ee3325c1035a0427e608ce22c462085c3c677e48..cbf76edc482c51a0b0f0633f65186e09 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 090d256dc5594edf1b053cc072b177cbf92143bb..27da81c4577ea3c4efaf4e719c2b8256d4707920 100644 +index 0378b20decc9f22a480f68e8062c3b60d01d966e..dd95550877d67d8521a96f1e31994cff894502e1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1120,7 +1120,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0686-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0685-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0687-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0686-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0687-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0686-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0688-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0687-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0688-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0687-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0689-Optimise-general-POI-access.patch b/patches/server/0688-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0689-Optimise-general-POI-access.patch rename to patches/server/0688-Optimise-general-POI-access.patch diff --git a/patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0690-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0689-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0691-Optimise-chunk-tick-iteration.patch b/patches/server/0690-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0691-Optimise-chunk-tick-iteration.patch rename to patches/server/0690-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0692-Execute-chunk-tasks-mid-tick.patch b/patches/server/0691-Execute-chunk-tasks-mid-tick.patch similarity index 98% rename from patches/server/0692-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0691-Execute-chunk-tasks-mid-tick.patch index edd4022302..2172f471d7 100644 --- a/patches/server/0692-Execute-chunk-tasks-mid-tick.patch +++ b/patches/server/0691-Execute-chunk-tasks-mid-tick.patch @@ -19,7 +19,7 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..efbf77024d235d8af9f7efc938c17afd private MinecraftTimings() {} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b800249823e413933a5d469e431a003f977f59e7..d8fa1cb0b340f97debceb7e5b90051d29448fc58 100644 +index 76bdca305277d8d2a659b029f035bb4da25a076e..e5612808261f5e94ed02afa2bd070db56496fa79 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1305,6 +1305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/patches/server/0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0898-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0897-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0899-Prevent-compass-from-loading-chunks.patch b/patches/server/0898-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0899-Prevent-compass-from-loading-chunks.patch rename to patches/server/0898-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0900-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0899-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0900-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0899-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0901-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0901-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0900-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0902-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0902-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0901-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0903-Add-Player-Warden-Warning-API.patch b/patches/server/0902-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0903-Add-Player-Warden-Warning-API.patch rename to patches/server/0902-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0904-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0904-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0903-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0905-Add-paper-dumplisteners-command.patch b/patches/server/0904-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0905-Add-paper-dumplisteners-command.patch rename to patches/server/0904-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0906-check-global-player-list-where-appropriate.patch b/patches/server/0905-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0906-check-global-player-list-where-appropriate.patch rename to patches/server/0905-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0907-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0907-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0906-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0908-ItemStack-damage-API.patch b/patches/server/0907-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0908-ItemStack-damage-API.patch rename to patches/server/0907-ItemStack-damage-API.patch diff --git a/patches/server/0909-Friction-API.patch b/patches/server/0908-Friction-API.patch similarity index 98% rename from patches/server/0909-Friction-API.patch rename to patches/server/0908-Friction-API.patch index a8d5128969..c9cd1ef7ef 100644 --- a/patches/server/0909-Friction-API.patch +++ b/patches/server/0908-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 d688308e12f44100e6296740f600ec3b064efe88..bbb062f6a9e340492fb8535b259ddebe1e85cae9 100644 +index e59738a15c3db0d11bb7007af160aa1845cafd28..6e955e940ab95c5be22a8fb331b3c61347a77f92 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -263,6 +263,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0910-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0910-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0909-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0911-Fix-player-kick-on-shutdown.patch b/patches/server/0910-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0911-Fix-player-kick-on-shutdown.patch rename to patches/server/0910-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0912-Sync-offhand-slot-in-menus.patch b/patches/server/0911-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0912-Sync-offhand-slot-in-menus.patch rename to patches/server/0911-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0913-Player-Entity-Tracking-Events.patch b/patches/server/0912-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0913-Player-Entity-Tracking-Events.patch rename to patches/server/0912-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0914-Limit-pet-look-distance.patch b/patches/server/0913-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0914-Limit-pet-look-distance.patch rename to patches/server/0913-Limit-pet-look-distance.patch diff --git a/patches/server/0915-Properly-resend-entities.patch b/patches/server/0914-Properly-resend-entities.patch similarity index 98% rename from patches/server/0915-Properly-resend-entities.patch rename to patches/server/0914-Properly-resend-entities.patch index 012882a5e1..0baf83a9a0 100644 --- a/patches/server/0915-Properly-resend-entities.patch +++ b/patches/server/0914-Properly-resend-entities.patch @@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..bf6a70a69bb695ec1a202cd1e863c468 public static class DataItem { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f525320635dc428610c0ff5259c9ea9a0115ac9e..6c850f8a39f20f30ad744ef946420de453f8ce45 100644 +index b46c46fcde19aff16321876bf50b6725233bb09a..5654777aa3ed772cd5e37c1c630c68a83194f6bb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2796,7 +2796,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0916-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0916-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0915-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0917-fix-Instruments.patch b/patches/server/0916-fix-Instruments.patch similarity index 100% rename from patches/server/0917-fix-Instruments.patch rename to patches/server/0916-fix-Instruments.patch diff --git a/patches/server/0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0918-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0917-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0919-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0918-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0920-Improve-logging-and-errors.patch b/patches/server/0919-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0920-Improve-logging-and-errors.patch rename to patches/server/0919-Improve-logging-and-errors.patch diff --git a/patches/server/0921-Add-BlockLockCheckEvent.patch b/patches/server/0920-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0921-Add-BlockLockCheckEvent.patch rename to patches/server/0920-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0922-Add-Sneaking-API-for-Entities.patch b/patches/server/0921-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0922-Add-Sneaking-API-for-Entities.patch rename to patches/server/0921-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0923-Improve-PortalEvents.patch b/patches/server/0922-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0923-Improve-PortalEvents.patch rename to patches/server/0922-Improve-PortalEvents.patch diff --git a/patches/server/0924-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0924-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0923-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch similarity index 92% rename from patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch index 5de7e7c74a..3c61f54554 100644 --- a/patches/server/0925-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0924-Add-missing-SpigotConfig-logCommands-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6c850f8a39f20f30ad744ef946420de453f8ce45..b9d86e030aafe526f07e4335e772bcd9c0d8fe2a 100644 +index 5654777aa3ed772cd5e37c1c630c68a83194f6bb..1572c2b682c44d1445e97c3ebdc7df3f9c3bb7c4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2254,7 +2254,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0926-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0925-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0927-Flying-Fall-Damage.patch b/patches/server/0926-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0927-Flying-Fall-Damage.patch rename to patches/server/0926-Flying-Fall-Damage.patch diff --git a/patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 98% rename from patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch index 333c886d63..a968490b2b 100644 --- a/patches/server/0928-Add-exploded-block-state-to-BlockExplodeEvent.patch +++ b/patches/server/0927-Add-exploded-block-state-to-BlockExplodeEvent.patch @@ -112,7 +112,7 @@ index b9903c29bdea8d1e3b6fce0e97be6bd9493cfdf4..2ed78cf83c0ae66a6ddba1ff307da89a public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java -index dc8e173ff40c164bf6149db4caedf0ee8dce727b..f0acbb472830350f803b41f19126f3613d39e322 100644 +index da4609caecc8183d02c301c7cedbca52ed39323f..716021520c228b5bbced525b751f5d4126d882eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockStates.java @@ -273,6 +273,12 @@ public final class CraftBlockStates { diff --git a/patches/server/0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0929-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0928-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0930-config-for-disabling-entity-tag-tags.patch b/patches/server/0929-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0930-config-for-disabling-entity-tag-tags.patch rename to patches/server/0929-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0931-Use-single-player-info-update-packet-on-join.patch b/patches/server/0930-Use-single-player-info-update-packet-on-join.patch similarity index 97% rename from patches/server/0931-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0930-Use-single-player-info-update-packet-on-join.patch index b413cd9660..63ae383420 100644 --- a/patches/server/0931-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0930-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b9d86e030aafe526f07e4335e772bcd9c0d8fe2a..b94def027095f4decc00d5f415a220df9408bad6 100644 +index 1572c2b682c44d1445e97c3ebdc7df3f9c3bb7c4..01ed2f2bc2b888f0c8e3c47f51114fac82f7a368 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3600,7 +3600,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch index 8bcfc9f077..48e1f8b1ec 100644 --- a/patches/server/0932-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/server/0931-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bbb062f6a9e340492fb8535b259ddebe1e85cae9..3746bcda0972c5c0f48df894248aa4398983c267 100644 +index 6e955e940ab95c5be22a8fb331b3c61347a77f92..98a6480b32a1897dfcae84ed72409441519a827f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1592,7 +1592,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0933-Win-Screen-API.patch b/patches/server/0932-Win-Screen-API.patch similarity index 100% rename from patches/server/0933-Win-Screen-API.patch rename to patches/server/0932-Win-Screen-API.patch diff --git a/patches/server/0934-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0934-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0933-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0935-Fix-force-opening-enchantment-tables.patch b/patches/server/0934-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0935-Fix-force-opening-enchantment-tables.patch rename to patches/server/0934-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0936-Add-Entity-Body-Yaw-API.patch b/patches/server/0935-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0936-Add-Entity-Body-Yaw-API.patch rename to patches/server/0935-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0937-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0936-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0938-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0937-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0939-Add-EntityFertilizeEggEvent.patch b/patches/server/0938-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0939-Add-EntityFertilizeEggEvent.patch rename to patches/server/0938-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0940-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0939-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0941-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0940-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0942-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0942-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0941-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0943-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0943-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0942-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0944-Fix-text-display-error-on-spawn.patch b/patches/server/0943-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0944-Fix-text-display-error-on-spawn.patch rename to patches/server/0943-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0945-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0945-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0944-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0946-Add-Shearable-API.patch b/patches/server/0945-Add-Shearable-API.patch similarity index 100% rename from patches/server/0946-Add-Shearable-API.patch rename to patches/server/0945-Add-Shearable-API.patch diff --git a/patches/server/0947-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0947-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0946-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0948-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0947-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0949-Optimize-Hoppers.patch b/patches/server/0948-Optimize-Hoppers.patch similarity index 99% rename from patches/server/0949-Optimize-Hoppers.patch rename to patches/server/0948-Optimize-Hoppers.patch index 7b6b38c931..8eb02d2e2e 100644 --- a/patches/server/0949-Optimize-Hoppers.patch +++ b/patches/server/0948-Optimize-Hoppers.patch @@ -13,7 +13,7 @@ Subject: [PATCH] Optimize Hoppers * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2c3577c6f59e482d68c80d3d414ed43942dfcfbb..fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4 100644 +index aa0dcb02aaec2caa016397e7f5cc859a22ca4b6d..763df0f016e2970fd12603d0c7d6c4e4871345f9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1524,6 +1524,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { serialized.gameMode = GameType.byId(buf.readVarInt()); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e7af33c702fcfe187c549b795c65029c727c6517..ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96 100644 +index ed19c6c2eb72800af7b978df677ff317f05795ba..4dd04aa5f4affd42afbce718ec3dfaf7f1fafe2f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -296,6 +296,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0956-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0955-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0957-Use-array-for-gamerule-storage.patch b/patches/server/0956-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0957-Use-array-for-gamerule-storage.patch rename to patches/server/0956-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0958-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0958-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0957-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0959-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0959-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0958-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0960-Add-Mob-Experience-reward-API.patch b/patches/server/0959-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0960-Add-Mob-Experience-reward-API.patch rename to patches/server/0959-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0961-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0961-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0960-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch similarity index 92% rename from patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch index d2e0a69c52..3197bd1c72 100644 --- a/patches/server/0962-Fix-DamageCause-for-Falling-Blocks.patch +++ b/patches/server/0961-Fix-DamageCause-for-Falling-Blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix DamageCause for Falling Blocks diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 97808ee1c087b44cacbaebf0bc9450ddca911008..20cdce9720c19925e5154f44cab36a7c7cc40ea2 100644 +index 576e982ac53fe6cdc6ca921ad46c36e895509f84..0ed5035044a3fc3ad725ce702720a0742a19ed44 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1030,6 +1030,11 @@ public class CraftEventFactory { diff --git a/patches/server/0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0963-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0962-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0964-More-accurate-isInOpenWater-impl.patch b/patches/server/0963-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0964-More-accurate-isInOpenWater-impl.patch rename to patches/server/0963-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0965-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0964-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0966-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0965-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0967-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0967-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0966-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0968-Expand-PlayerItemMendEvent.patch b/patches/server/0967-Expand-PlayerItemMendEvent.patch similarity index 98% rename from patches/server/0968-Expand-PlayerItemMendEvent.patch rename to patches/server/0967-Expand-PlayerItemMendEvent.patch index ce8538f171..8dc094546e 100644 --- a/patches/server/0968-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0967-Expand-PlayerItemMendEvent.patch @@ -51,7 +51,7 @@ index 991f3f947810ebd7e4f2c51a4012115fee8a34ec..548eddde8b0558b780f672d321507cfc } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 20cdce9720c19925e5154f44cab36a7c7cc40ea2..49e3715b6648e7c44127030930e06dc9432a8374 100644 +index 0ed5035044a3fc3ad725ce702720a0742a19ed44..a9a58f0bb19e034cffdafcc38fdc9003744a5d6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1262,10 +1262,10 @@ public class CraftEventFactory { diff --git a/patches/server/0969-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0969-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0968-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0970-Add-transient-modifier-API.patch b/patches/server/0969-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0970-Add-transient-modifier-API.patch rename to patches/server/0969-Add-transient-modifier-API.patch diff --git a/patches/server/0971-Fix-block-place-logic.patch b/patches/server/0970-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0971-Fix-block-place-logic.patch rename to patches/server/0970-Fix-block-place-logic.patch diff --git a/patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 100% rename from patches/server/0972-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/server/0971-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch diff --git a/patches/server/0973-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0972-Ignore-inline-definitions-of-trim-material-pattern.patch similarity index 100% rename from patches/server/0973-Ignore-inline-definitions-of-trim-material-pattern.patch rename to patches/server/0972-Ignore-inline-definitions-of-trim-material-pattern.patch diff --git a/patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0973-Call-BlockGrowEvent-for-the-pitcher-crop.patch similarity index 100% rename from patches/server/0974-Call-BlockGrowEvent-for-the-pitcher-crop.patch rename to patches/server/0973-Call-BlockGrowEvent-for-the-pitcher-crop.patch diff --git a/patches/server/0975-Add-API-for-waxed-signs.patch b/patches/server/0974-Add-API-for-waxed-signs.patch similarity index 100% rename from patches/server/0975-Add-API-for-waxed-signs.patch rename to patches/server/0974-Add-API-for-waxed-signs.patch diff --git a/patches/server/0976-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0975-Properly-remove-the-experimental-smithing-inventory-.patch similarity index 100% rename from patches/server/0976-Properly-remove-the-experimental-smithing-inventory-.patch rename to patches/server/0975-Properly-remove-the-experimental-smithing-inventory-.patch diff --git a/patches/server/0977-Fix-sendSignChange0-s-usage-of-SignText.patch b/patches/server/0976-Fix-sendSignChange0-s-usage-of-SignText.patch similarity index 100% rename from patches/server/0977-Fix-sendSignChange0-s-usage-of-SignText.patch rename to patches/server/0976-Fix-sendSignChange0-s-usage-of-SignText.patch