diff --git a/gradle.properties b/gradle.properties index 392a5e69..6fb8c714 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 packageVersion=1_20_R1 org.gradle.jvmargs=-Xmx2G -paperRef=a751001ed1649860794a57ab818a5e51793aafe6 +paperRef=b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b preVersion=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..7f93135c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..c30b486a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..547ba0c2 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) -exec "$JAVACMD" "$@" + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat index 107acd32..2578005b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,15 +76,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega +:omega \ No newline at end of file diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index ea211178..b115011d 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -153,10 +153,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c5 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..670f25370554c3f8c40d2fcc4f5a31d7a372f452 100644 +index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..ca84ca427410213e09e83f53cc33a394f234a754 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop atomicreference = new AtomicReference(); Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 04ff080242966b035cec4deb79512c915f8509d5..179d5f1138f296a30e7e1108ce9552e69cde3ccc 100644 +index 4e2c9525767136bc29366b2224a5adc5ad6485bd..9ef742ccfedf2a2fd16020f6f6741d44c522b861 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -344,6 +344,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -343,6 +343,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface DedicatedServer.LOGGER.info("JMX monitoring enabled"); } diff --git a/patches/server/0030-Config-to-disable-method-profiler.patch b/patches/server/0030-Config-to-disable-method-profiler.patch index 32a8d6b1..7452c534 100644 --- a/patches/server/0030-Config-to-disable-method-profiler.patch +++ b/patches/server/0030-Config-to-disable-method-profiler.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a1cf15fc45111508657efe3a4d7f48bfe27dcd9f..a93018a2797bc1a1c134f810eaa067d0a0b4bb8a 100644 +index 8c8406269ce0795189b4f84861c5bd7520a333d2..8f2d2e27a4296d6cb5f1fe4ff83781d81b9331a2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2279,6 +2279,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Fri, 16 Sep 2022 16:34:11 +0800 -Subject: [PATCH] Simpler ShapelessRecipes comparison for Vanilla - -This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) - -diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -index 7f174bb89bf4d700a5ae1b65d8abd4f5b1e7b5ed..fef23722a5abb56c5f0a24a785a312c0378a0500 100644 ---- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -+++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java -@@ -27,13 +27,21 @@ public class ShapelessRecipe implements CraftingRecipe { - final CraftingBookCategory category; - final ItemStack result; - final NonNullList ingredients; -+ private final boolean isBukkit; // Leaves - - public ShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack output, NonNullList input) { -+ // Leaves start -+ this(id, group, category, output, input, false); -+ } -+ -+ public ShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack output, NonNullList input, boolean isBukkit) { -+ // Leaves end - this.id = id; - this.group = group; - this.category = category; - this.result = output; - this.ingredients = input; -+ this.isBukkit = isBukkit; // Leaves - } - - // CraftBukkit start -@@ -82,6 +90,28 @@ public class ShapelessRecipe implements CraftingRecipe { - } - - public boolean matches(CraftingContainer inventory, Level world) { -+ // Leaves start - easy match -+ if (top.leavesmc.leaves.LeavesConfig.simplerVanillaShapelessRecipes && !this.isBukkit) { -+ java.util.List ingredients = com.google.common.collect.Lists.newArrayList(this.ingredients.toArray(new Ingredient[0])); -+ -+ inventory: for (int index = 0; index < inventory.getContainerSize(); index++) { -+ ItemStack itemStack = inventory.getItem(index); -+ -+ if (!itemStack.isEmpty()) { -+ for (int i = 0; i < ingredients.size(); i++) { -+ if (ingredients.get(i).test(itemStack)) { -+ ingredients.remove(i); -+ continue inventory; -+ } -+ } -+ return false; -+ } -+ } -+ -+ return ingredients.isEmpty(); -+ } -+ // Leaves end - easy match -+ - StackedContents autorecipestackmanager = new StackedContents(); - int i = 0; - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java -index f7ea77dd82d978ad307f99c743efacfb34478b3d..96be7a7b030b2f82ac91f0c5c8e66f282fd4d6bc 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java -@@ -44,6 +44,6 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe - data.set(i, toNMS(ingred.get(i), true)); - } - -- MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.ShapelessRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), this.getGroup(), CraftRecipe.getCategory(this.getCategory()), CraftItemStack.asNMSCopy(this.getResult()), data)); -+ MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.ShapelessRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), this.getGroup(), CraftRecipe.getCategory(this.getCategory()), CraftItemStack.asNMSCopy(this.getResult()), data, true)); // Leaves - is bukkit recipe - } - } diff --git a/patches/server/0044-BBOR-Protocol.patch b/patches/server/0043-BBOR-Protocol.patch similarity index 99% rename from patches/server/0044-BBOR-Protocol.patch rename to patches/server/0043-BBOR-Protocol.patch index bdc56df2..ce3de48a 100644 --- a/patches/server/0044-BBOR-Protocol.patch +++ b/patches/server/0043-BBOR-Protocol.patch @@ -5,10 +5,10 @@ Subject: [PATCH] BBOR Protocol diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 64149614643b77792fec42793fa0af0f3189c5b8..5bdfe75075118c6a2347bc6c9764be4352a83944 100644 +index 8f2d2e27a4296d6cb5f1fe4ff83781d81b9331a2..9e68a0da8be6483319e070d4641eab85c75a38a1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1603,6 +1603,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list) { // PAIL private -> public // CraftBukkit - return boolean diff --git a/patches/server/0073-Enchantment-mending-compatibility-infinity.patch b/patches/server/0072-Enchantment-mending-compatibility-infinity.patch similarity index 100% rename from patches/server/0073-Enchantment-mending-compatibility-infinity.patch rename to patches/server/0072-Enchantment-mending-compatibility-infinity.patch diff --git a/patches/server/0074-Shave-snow-layers.patch b/patches/server/0073-Shave-snow-layers.patch similarity index 96% rename from patches/server/0074-Shave-snow-layers.patch rename to patches/server/0073-Shave-snow-layers.patch index 8d3191c0..b0d8029d 100644 --- a/patches/server/0074-Shave-snow-layers.patch +++ b/patches/server/0073-Shave-snow-layers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Shave snow layers diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java -index c7195f2e12bbd6545f7bffcc2b4ba5cc3d48df20..b8e160b78a9a6d4f73c9becef6ec0b17858b271f 100644 +index 21212462e6b415e96536a27b2c009d1562f18946..b620a6fe52bd1f86ca24f79e1ebf8879aed33961 100644 --- a/src/main/java/net/minecraft/world/item/ShovelItem.java +++ b/src/main/java/net/minecraft/world/item/ShovelItem.java @@ -11,10 +11,12 @@ import net.minecraft.tags.BlockTags; diff --git a/patches/server/0075-Spawn-ignore-lc.patch b/patches/server/0074-Spawn-ignore-lc.patch similarity index 96% rename from patches/server/0075-Spawn-ignore-lc.patch rename to patches/server/0074-Spawn-ignore-lc.patch index b4d5050e..171efd9b 100644 --- a/patches/server/0075-Spawn-ignore-lc.patch +++ b/patches/server/0074-Spawn-ignore-lc.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn ignore lc diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 4327ec0948fb82939272f2dc1bbde8b1e090c5b7..35c8004c4228957d18edf305060a554583e2aeb1 100644 +index 81eaa7ead4821929f20e4c5fcb822504001f6f99..c85d55cc9baf69968470a0bbe56c4233ae5509a4 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -40,6 +40,7 @@ import net.minecraft.world.level.block.state.BlockState; diff --git a/patches/server/0076-Elytra-aeronautics-no-chunk-load.patch b/patches/server/0075-Elytra-aeronautics-no-chunk-load.patch similarity index 100% rename from patches/server/0076-Elytra-aeronautics-no-chunk-load.patch rename to patches/server/0075-Elytra-aeronautics-no-chunk-load.patch diff --git a/patches/server/0077-Disable-timings-default.patch b/patches/server/0076-Disable-timings-default.patch similarity index 100% rename from patches/server/0077-Disable-timings-default.patch rename to patches/server/0076-Disable-timings-default.patch diff --git a/patches/server/0078-Bladeren-mspt-sync-protocol.patch b/patches/server/0077-Bladeren-mspt-sync-protocol.patch similarity index 97% rename from patches/server/0078-Bladeren-mspt-sync-protocol.patch rename to patches/server/0077-Bladeren-mspt-sync-protocol.patch index 98dfa9ed..0c9cb111 100644 --- a/patches/server/0078-Bladeren-mspt-sync-protocol.patch +++ b/patches/server/0077-Bladeren-mspt-sync-protocol.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Bladeren mspt sync protocol diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ab008fdf7b7d9e3e17fbd8524729f4434aefc1f3..49fc9c750d7696789649081430b262b084a21022 100644 +index 28b48043f621d931006ef36123ff5d1eaed7d040..0a486e22e87d6eb717caa1b530877236c9a0f285 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1612,6 +1612,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/patches/server/0088-Dont-respond-ping-before-start-fully.patch b/patches/server/0087-Dont-respond-ping-before-start-fully.patch similarity index 100% rename from patches/server/0088-Dont-respond-ping-before-start-fully.patch rename to patches/server/0087-Dont-respond-ping-before-start-fully.patch diff --git a/patches/server/0089-Faster-chunk-serialization.patch b/patches/server/0088-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0089-Faster-chunk-serialization.patch rename to patches/server/0088-Faster-chunk-serialization.patch diff --git a/patches/server/0090-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0089-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0090-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0089-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0091-Cache-world-generator-sea-level.patch b/patches/server/0090-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0091-Cache-world-generator-sea-level.patch rename to patches/server/0090-Cache-world-generator-sea-level.patch diff --git a/patches/server/0092-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0091-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0092-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0091-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0093-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0092-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0093-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0092-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0094-Store-mob-counts-in-an-array.patch b/patches/server/0093-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0094-Store-mob-counts-in-an-array.patch rename to patches/server/0093-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0095-Cache-BlockStatePairKey-hash.patch b/patches/server/0094-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0095-Cache-BlockStatePairKey-hash.patch rename to patches/server/0094-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0096-Optimize-noise-generation.patch b/patches/server/0095-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0096-Optimize-noise-generation.patch rename to patches/server/0095-Optimize-noise-generation.patch diff --git a/patches/server/0097-Disable-packet-limit.patch b/patches/server/0096-Disable-packet-limit.patch similarity index 100% rename from patches/server/0097-Disable-packet-limit.patch rename to patches/server/0096-Disable-packet-limit.patch diff --git a/patches/server/0098-Reduce-array-allocations.patch b/patches/server/0097-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0098-Reduce-array-allocations.patch rename to patches/server/0097-Reduce-array-allocations.patch index be93b724..03d111bb 100644 --- a/patches/server/0098-Reduce-array-allocations.patch +++ b/patches/server/0097-Reduce-array-allocations.patch @@ -495,7 +495,7 @@ index fac8de87a096e2f3ba71fc4043acf66491c5b62b..eaa5d29c3e4c32db21cc72295551d81b k = aenumitemslot.length; diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java -index 9c1285e31d947f92e0b00149e342e793898e0d7c..e45d14998e2379ced1d7da9c6583b04469b13798 100644 +index 6693dd51440da3f0fc338c4e2cb67d3222eed182..ab12d9bcec0c9b8ff1360a9e6c0042d2c39b37a4 100644 --- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java @@ -29,6 +29,7 @@ import org.bukkit.craftbukkit.inventory.CraftRecipe; @@ -504,9 +504,9 @@ index 9c1285e31d947f92e0b00149e342e793898e0d7c..e45d14998e2379ced1d7da9c6583b044 // CraftBukkit end +import top.leavesmc.leaves.util.ArrayConstants; - public class ShapedRecipe implements CraftingRecipe { + public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookExactChoiceRecipe implements CraftingRecipe { // Paper - improve exact recipe choices -@@ -262,7 +263,7 @@ public class ShapedRecipe implements CraftingRecipe { +@@ -263,7 +264,7 @@ public class ShapedRecipe extends io.papermc.paper.inventory.recipe.RecipeBookEx } if (pattern.length == l) { diff --git a/patches/server/0099-Optimize-sun-burn-tick.patch b/patches/server/0098-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0099-Optimize-sun-burn-tick.patch rename to patches/server/0098-Optimize-sun-burn-tick.patch diff --git a/patches/server/0100-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0099-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0100-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0099-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0101-Use-optimized-collection.patch b/patches/server/0100-Use-optimized-collection.patch similarity index 98% rename from patches/server/0101-Use-optimized-collection.patch rename to patches/server/0100-Use-optimized-collection.patch index 0576e49d..aac644f2 100644 --- a/patches/server/0101-Use-optimized-collection.patch +++ b/patches/server/0100-Use-optimized-collection.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use optimized collection This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 09b79deb76e9766c3cf960a8d1295d762c589e11..136cd6152ea1107bb471b0abfe7f5682357ada44 100644 +index 9969afdcd826db2c53db1d54f6e3df69a59a486e..0e0a987bf1baff5b0f907a3c0b4dfa444de6ba12 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -295,7 +295,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -84,7 +84,7 @@ index 6fa00d9239546aa82b9e92e25a33103868084c38..5d50d9d2700a8943105301ef0ac467e4 // Paper start int arraySize = rules.keySet().stream().mapToInt(key -> key.gameRuleIndex).max().orElse(-1) + 1; diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 98eb6061da8ac8617b54d489ff41b4808dafe839..55dc80e03b071ded8f8a066a161afbcd8235d05d 100644 +index aa2fd4a567f5243ccd082644d56e1fa2b9ae4a7d..94fadc3814cef56d08d6ca4e932e806c1eadb4a8 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -61,6 +61,7 @@ import net.minecraft.world.phys.shapes.BooleanOp; diff --git a/patches/server/0102-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0101-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0102-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0101-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0103-Optimized-CubePointRange.patch b/patches/server/0102-Optimized-CubePointRange.patch similarity index 100% rename from patches/server/0103-Optimized-CubePointRange.patch rename to patches/server/0102-Optimized-CubePointRange.patch diff --git a/patches/server/0104-Check-frozen-ticks-before-landing-block.patch b/patches/server/0103-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0104-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0103-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0105-Cache-ominous-banner-item.patch b/patches/server/0104-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0105-Cache-ominous-banner-item.patch rename to patches/server/0104-Cache-ominous-banner-item.patch diff --git a/patches/server/0106-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0105-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0106-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0105-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0107-Skip-cloning-advancement-criteria.patch b/patches/server/0106-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0107-Skip-cloning-advancement-criteria.patch rename to patches/server/0106-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0109-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0108-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0109-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0108-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0110-Fix-villagers-dont-release-memory.patch b/patches/server/0109-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0110-Fix-villagers-dont-release-memory.patch rename to patches/server/0109-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0111-Avoid-anvil-too-expensive.patch b/patches/server/0110-Avoid-anvil-too-expensive.patch similarity index 91% rename from patches/server/0111-Avoid-anvil-too-expensive.patch rename to patches/server/0110-Avoid-anvil-too-expensive.patch index 8106b768..22d18a0a 100644 --- a/patches/server/0111-Avoid-anvil-too-expensive.patch +++ b/patches/server/0110-Avoid-anvil-too-expensive.patch @@ -18,10 +18,10 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b9fcf49ed88c62265d9aa8926c1228b9 } diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 3447c3059ef55c483cf2d0282b1a4970a0a4d26b..24ba449a4b9f1ba9e92590acc55651a4bca672ad 100644 +index 1e14eefdce8633f196868f2309dd832b00b3373f..9f95c37eca4f732e8ed15abef206c37b8afa71db 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -@@ -610,6 +610,7 @@ public final class LeavesConfig { +@@ -605,6 +605,7 @@ public final class LeavesConfig { public static void registerCarpetRules() { CarpetRules.register(CarpetRule.of("carpet", "creativeNoClip", creativeNoClip)); diff --git a/patches/server/0112-Bow-infinity-fix.patch b/patches/server/0111-Bow-infinity-fix.patch similarity index 100% rename from patches/server/0112-Bow-infinity-fix.patch rename to patches/server/0111-Bow-infinity-fix.patch diff --git a/patches/server/0113-Zero-tick-plants.patch b/patches/server/0112-Zero-tick-plants.patch similarity index 100% rename from patches/server/0113-Zero-tick-plants.patch rename to patches/server/0112-Zero-tick-plants.patch diff --git a/patches/server/0114-Leaves-update-command.patch b/patches/server/0113-Leaves-update-command.patch similarity index 100% rename from patches/server/0114-Leaves-update-command.patch rename to patches/server/0113-Leaves-update-command.patch diff --git a/patches/server/0115-Force-peaceful-mode-switch.patch b/patches/server/0114-Force-peaceful-mode-switch.patch similarity index 99% rename from patches/server/0115-Force-peaceful-mode-switch.patch rename to patches/server/0114-Force-peaceful-mode-switch.patch index 3eeaf737..5009e8b6 100644 --- a/patches/server/0115-Force-peaceful-mode-switch.patch +++ b/patches/server/0114-Force-peaceful-mode-switch.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Force peaceful mode switch diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index e3760154b7d3aabb9d63a06f11e4dca0743bb03f..501090d78b9713c5e225664db86f9e7870c574fa 100644 +index 82234b5a0288438cc1a0b8ca59c9a8e4e1a845b4..126b68df7a7f9d10db7a3ffc5fa07ff19ebecf4e 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -82,6 +82,12 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/0116-Add-Leaves-Auto-Update.patch b/patches/server/0115-Add-Leaves-Auto-Update.patch similarity index 97% rename from patches/server/0116-Add-Leaves-Auto-Update.patch rename to patches/server/0115-Add-Leaves-Auto-Update.patch index 72ae2c83..9e29dd5b 100644 --- a/patches/server/0116-Add-Leaves-Auto-Update.patch +++ b/patches/server/0115-Add-Leaves-Auto-Update.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Leaves Auto Update diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java -index 24ba449a4b9f1ba9e92590acc55651a4bca672ad..e9484e242c8edfe08eb201ccbb863204e5e973fe 100644 +index 9f95c37eca4f732e8ed15abef206c37b8afa71db..9d904fac3fc556b398d5dc53d6597f6c9f8a9dda 100644 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java @@ -14,6 +14,7 @@ import top.leavesmc.leaves.bot.agent.Actions; @@ -16,7 +16,7 @@ index 24ba449a4b9f1ba9e92590acc55651a4bca672ad..e9484e242c8edfe08eb201ccbb863204 import top.leavesmc.leaves.util.MathUtils; import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRule; import top.leavesmc.leaves.protocol.CarpetServerProtocol.CarpetRules; -@@ -825,6 +826,7 @@ public final class LeavesConfig { +@@ -820,6 +821,7 @@ public final class LeavesConfig { private static void autoUpdate() { autoUpdate = getBoolean("settings.misc.auto-update.enable", autoUpdate); autoUpdateTime = getList("settings.misc.auto-update.time", autoUpdateTime); diff --git a/patches/server/0117-Replay-Mod-API.patch b/patches/server/0116-Replay-Mod-API.patch similarity index 100% rename from patches/server/0117-Replay-Mod-API.patch rename to patches/server/0116-Replay-Mod-API.patch diff --git a/patches/server/0118-Leaves-tick-command.patch b/patches/server/0117-Leaves-tick-command.patch similarity index 96% rename from patches/server/0118-Leaves-tick-command.patch rename to patches/server/0117-Leaves-tick-command.patch index 42e3f089..9dd11ec1 100644 --- a/patches/server/0118-Leaves-tick-command.patch +++ b/patches/server/0117-Leaves-tick-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaves tick command diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 49fc9c750d7696789649081430b262b084a21022..d3caf75c726a88b6ace1161550057c124e7fdd9c 100644 +index 0a486e22e87d6eb717caa1b530877236c9a0f285..2cc285dc1b587ddd03565658cca35b7b58736399 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -194,6 +194,7 @@ import org.bukkit.event.server.ServerLoadEvent; @@ -16,7 +16,7 @@ index 49fc9c750d7696789649081430b262b084a21022..d3caf75c726a88b6ace1161550057c12 public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements CommandSource, AutoCloseable { -@@ -1100,6 +1101,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop builder = ImmutableMap.builder(); BiConsumer biConsumer = builder::put; diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 179d5f1138f296a30e7e1108ce9552e69cde3ccc..cf3446afeff3afb58b78c01beca843ae5512fffb 100644 +index 9ef742ccfedf2a2fd16020f6f6741d44c522b861..f8edbc95ffe7de0341e5724ad3efe69c74e95a07 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -224,6 +224,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0121-Fix-minecraft-hopper-not-work-without-player.patch b/patches/server/0120-Fix-minecraft-hopper-not-work-without-player.patch similarity index 100% rename from patches/server/0121-Fix-minecraft-hopper-not-work-without-player.patch rename to patches/server/0120-Fix-minecraft-hopper-not-work-without-player.patch diff --git a/patches/server/0122-Delete-Timings.patch b/patches/server/0121-Delete-Timings.patch similarity index 98% rename from patches/server/0122-Delete-Timings.patch rename to patches/server/0121-Delete-Timings.patch index 24246647..a1eecd32 100644 --- a/patches/server/0122-Delete-Timings.patch +++ b/patches/server/0121-Delete-Timings.patch @@ -878,7 +878,7 @@ index 9c7fb1b7c2ff458e72bdcfa80c49252cd78e7d14..e5622ec12fc930f1f17b599c486366cf // Leaves start - update suppression crash fix } catch (top.leavesmc.leaves.util.UpdateSuppressionException exception) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1a10b0ee8 100644 +index 2cc285dc1b587ddd03565658cca35b7b58736399..f3a6aa97a64b4bf3e83f5c749da8c66d8b3a09ee 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,9 +3,6 @@ package net.minecraft.server; @@ -931,7 +931,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1 import top.leavesmc.leaves.util.TickStatus; // Leaves - tick command public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements CommandSource, AutoCloseable { -@@ -943,7 +931,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -@@ -1531,21 +1512,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop waitable = new Waitable() { +- Waitable waitable = new Waitable<>() { - @Override - protected String evaluate() { - return sender.getBuffer(); @@ -1169,13 +1168,15 @@ index cf3446afeff3afb58b78c01beca843ae5512fffb..1701ff0aa122680626cecedce2cdc804 - waitableArray[0] = waitable; - co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable)); - } else { -- // Paper end - ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), this.rconConsoleSource.createCommandSourceStack()); - server.dispatchServerCommand(remoteConsole, serverCommand); + // Paper end +- ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper); +- server.dispatchServerCommand(event.getSender(), serverCommand); - } // Paper - // CraftBukkit end ++ ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper); ++ server.dispatchServerCommand(event.getSender(), serverCommand); }); // Paper start + if (waitableArray[0] != null) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java index 0e0a987bf1baff5b0f907a3c0b4dfa444de6ba12..5887bca09af6c5a8b4d05258016309d5a96a7fc4 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java