Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-08-29 14:22:45 +08:00
parent ab27c52016
commit d5dd2833f2
92 changed files with 302 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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

294
gradlew vendored
View File

@@ -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" )
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" "$@"

15
gradlew.bat vendored
View File

@@ -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,13 +76,15 @@ 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

8
patches/server/0001-Build-changes.patch
View File

@@ -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<TickTa
@@ -1692,7 +1692,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -166,7 +166,7 @@ index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..670f25370554c3f8c40d2fcc4f5a31d7
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..09344819e270716d17a59669be2887256a3a6983 100644
index c49802c936ae8e3f4dc1badd98414d96714ecd60..b0e3ac5b92f0f45a47e2972d3baa8dd86d77de30 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -217,11 +217,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -184,7 +184,7 @@ index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..09344819e270716d17a59669be288725
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 54f27d91f941235a99e341ed84531ad7f0840728..e573f7b596cbb6bd288e8027e1797c0b7318b635 100644
index ec4b73321205b472f19fa5bd4ad95893020d1340..51d2c974af4610784e91ca04412bdff80f99dc01 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper

15
patches/server/0004-Leaves-Server-Config-And-Command.patch
View File

@@ -19,10 +19,10 @@ index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..45897b81a822b9523c16658ca46a5077
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index bd87bfcf52da4059b9e345c2d2d7abc725a111a8..c13dccd56b81b88e984e866da199dd8fd7e005e8 100644
index ca84ca427410213e09e83f53cc33a394f234a754..d532410d066d163ec168401c8b7532929c33a2d4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1118,6 +1118,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1117,6 +1117,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
// Paper end
@@ -31,7 +31,7 @@ index bd87bfcf52da4059b9e345c2d2d7abc725a111a8..c13dccd56b81b88e984e866da199dd8f
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
Arrays.fill( recentTps, 20 );
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 09344819e270716d17a59669be2887256a3a6983..8c3cc9328f02a66e58c066c54f0bccce807921dc 100644
index b0e3ac5b92f0f45a47e2972d3baa8dd86d77de30..56ae779a44bc361f78188ec3d2bfe88daa0869aa 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -220,6 +220,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -129,10 +129,10 @@ index e1c99d941c7bb954bf3ac83d5002dbf58fd833b0..4760b943da08771a42fcb22eba4d586d
.withRequiredArg()
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..03f2fd1958b8f2c7d97232240f05affcc6f56b7f
index 0000000000000000000000000000000000000000..3c3b0262348107669e1374e28ff4bd54beea6fe2
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -0,0 +1,990 @@
@@ -0,0 +1,985 @@
+package top.leavesmc.leaves;
+
+import com.destroystokyo.paper.util.SneakyThrow;
@@ -521,11 +521,6 @@ index 0000000000000000000000000000000000000000..03f2fd1958b8f2c7d97232240f05affc
+ reduceChuckLoadAndLookup = getBoolean("settings.performance.reduce-chuck-load-and-lookup", reduceChuckLoadAndLookup);
+ }
+
+ public static boolean simplerVanillaShapelessRecipes = true;
+ private static void simplerVanillaShapelessRecipes() {
+ simplerVanillaShapelessRecipes = getBoolean("settings.performance.simpler-vanilla-shapeless-recipes", simplerVanillaShapelessRecipes);
+ }
+
+ public static boolean pcaSyncProtocol = false;
+ private static void pcaSyncProtocol() {
+ pcaSyncProtocol = getBoolean("settings.protocol.pca-sync-protocol", pcaSyncProtocol);

10
patches/server/0008-Fakeplayer-support.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c13dccd56b81b88e984e866da199dd8fd7e005e8..3ac048de85febb5ff005c3e7a53326e3fd4623cc 100644
index d532410d066d163ec168401c8b7532929c33a2d4..3cc6001c5a6b3ccb1af3b15660520ac6ca2b126e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -127,6 +127,7 @@ import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
@@ -16,7 +16,7 @@ index c13dccd56b81b88e984e866da199dd8fd7e005e8..3ac048de85febb5ff005c3e7a53326e3
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ai.village.VillageSiege;
import net.minecraft.world.entity.npc.CatSpawner;
@@ -633,6 +634,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -632,6 +633,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Paper end
@@ -25,7 +25,7 @@ index c13dccd56b81b88e984e866da199dd8fd7e005e8..3ac048de85febb5ff005c3e7a53326e3
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
this.connection.acceptConnections();
@@ -938,6 +941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -937,6 +940,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
MinecraftTimings.stopServer(); // Paper
@@ -58,7 +58,7 @@ index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..7fc87841fd72fc9b5bca4fbdffd378c7
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 161c40692e8d469fad4169908b9353be0f85d0d8..6cea0829fe243445f318f1622f16f48686e3c398 100644
index b382da838acc04a1c5d89064b4fa43bcdd38ae71..012818c15a04e4a6cd9c72f0fd8658175790a852 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -185,6 +185,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -327,7 +327,7 @@ index 2dbe8b870fd39b4d22e9725912f443757ae70761..8388c2a56cbe531cf5f60a18866c85fa
}
// Water Animals
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 03f2fd1958b8f2c7d97232240f05affcc6f56b7f..ad85acbb2b6f23c12d8ca250f98b86cf168ce0d5 100644
index 3c3b0262348107669e1374e28ff4bd54beea6fe2..0d42833238843d8a1b603b3f0a5bed71faadab74 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -8,6 +8,9 @@ import org.bukkit.command.Command;

4
patches/server/0016-No-chat-sign.patch
View File

@@ -110,10 +110,10 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..2c349dc502ce275a8215766933f4855f
}
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 8c3cc9328f02a66e58c066c54f0bccce807921dc..04ff080242966b035cec4deb79512c915f8509d5 100644
index 56ae779a44bc361f78188ec3d2bfe88daa0869aa..4e2c9525767136bc29366b2224a5adc5ad6485bd 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -644,7 +644,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -643,7 +643,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
public boolean enforceSecureProfile() {
DedicatedServerProperties dedicatedserverproperties = this.getProperties();

8
patches/server/0017-Optimize-mob-spawning.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize mob spawning
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 3ac048de85febb5ff005c3e7a53326e3fd4623cc..058149dc78a855f72e43e121badacdd6206e394d 100644
index 3cc6001c5a6b3ccb1af3b15660520ac6ca2b126e..8c8406269ce0795189b4f84861c5bd7520a333d2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -313,6 +313,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -312,6 +312,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public volatile boolean abnormalExit = false; // Paper
public boolean isIteratingOverLevels = false; // Paper
@@ -19,10 +19,10 @@ index 3ac048de85febb5ff005c3e7a53326e3fd4623cc..058149dc78a855f72e43e121badacdd6
AtomicReference<S> 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");
}

4
patches/server/0030-Config-to-disable-method-profiler.patch
View File

@@ -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<TickTa
@@ -2278,6 +2278,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {

0
patches/server/0043-PCA-sync-protocol.patch → patches/server/0042-PCA-sync-protocol.patch
View File

74
patches/server/0042-Simpler-ShapelessRecipes-comparison-for-Vanilla.patch
View File

@@ -1,74 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
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<Ingredient> ingredients;
+ private final boolean isBukkit; // Leaves
public ShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack output, NonNullList<Ingredient> input) {
+ // Leaves start
+ this(id, group, category, output, input, false);
+ }
+
+ public ShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack output, NonNullList<Ingredient> 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<Ingredient> 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
}
}

4
patches/server/0044-BBOR-Protocol.patch → patches/server/0043-BBOR-Protocol.patch
View File

@@ -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<TickTa
@@ -1602,6 +1602,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");

2
patches/server/0045-InstantBlockUpdater-Reintroduced.patch → patches/server/0044-InstantBlockUpdater-Reintroduced.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] InstantBlockUpdater Reintroduced
This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 71836aa0e2f5d397c0b02c9662d1b11454c0388b..8051a228854044d77d118c87163d75012236478b 100644
index e512157222f84af9cda498d3bf598dea4f96d2a8..a1fe9dfda59e65b849955dd04a439cb928488373 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -74,6 +74,7 @@ import net.minecraft.world.level.lighting.LevelLightEngine;

0
patches/server/0046-Random-flatten-triangular-distribution.patch → patches/server/0045-Random-flatten-triangular-distribution.patch
View File

0
patches/server/0047-Jade-Protocol.patch → patches/server/0046-Jade-Protocol.patch
View File

6
patches/server/0048-Alternative-block-placement-Protocol.patch → patches/server/0047-Alternative-block-placement-Protocol.patch
View File

@@ -9,7 +9,7 @@ MasaGadget(https://github.com/plusls/MasaGadget)
litematica(https://github.com/maruohon/litematica)
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index ebee8de2ed831755b6fd154f6cc77ac993839bb9..6227a4733683ed9a9fa300ab010ce84a17d3b1c2 100644
index e483186a5292b3b53bfb1af4d56f55fcc1a6106c..39a8fb7a73362beab1e4a53b6297a054a159bb80 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -158,7 +158,7 @@ public class BlockItem extends Item {
@@ -22,7 +22,7 @@ index ebee8de2ed831755b6fd154f6cc77ac993839bb9..6227a4733683ed9a9fa300ab010ce84a
return iblockdata != null && this.canPlace(context, iblockdata) ? iblockdata : null;
}
diff --git a/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java b/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java
index 39b8b3675ac58409e05fac07e07c8016c5280d81..0399aa4a3637bfe8d5817c7fc114fc7d18dc5116 100644
index 88072259a9de205db428351c5c9f6114e199e402..e641360a3e82cb03393b856fa545d6b0089a8dbf 100644
--- a/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java
+++ b/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java
@@ -34,7 +34,7 @@ public class StandingAndWallBlockItem extends BlockItem {
@@ -44,7 +44,7 @@ index 39b8b3675ac58409e05fac07e07c8016c5280d81..0399aa4a3637bfe8d5817c7fc114fc7d
if (iblockdata2 != null && this.canPlace(world, iblockdata2, blockposition)) {
iblockdata1 = iblockdata2;
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 72cece40c531372954ab07b2fa99ed50dc3ff3cc..d13e665a1f2fa4b671894a8c708e8e7ff94af07f 100644
index 2af43e50cc84c7b83e69e837ab4fbaa3a51c60a6..35f1aea111aab3e79a73fb51c553e96bbcdab3bf 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -411,6 +411,33 @@ public class Block extends BlockBehaviour implements ItemLike {

6
patches/server/0049-Player-operation-limiter.patch → patches/server/0048-Player-operation-limiter.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 6cea0829fe243445f318f1622f16f48686e3c398..5f23b11cf9ad01d1e44b70997726885789cf7c49 100644
index 012818c15a04e4a6cd9c72f0fd8658175790a852..08fdd168921b80d3b31310be18ee5c15d57718aa 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -279,6 +279,10 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 6cea0829fe243445f318f1622f16f48686e3c398..5f23b11cf9ad01d1e44b709977268857
this.gameMode.tick();
this.wardenSpawnTracker.tick();
--this.spawnInvulnerableTime;
@@ -2661,5 +2666,32 @@ public class ServerPlayer extends Player {
@@ -2666,5 +2671,32 @@ public class ServerPlayer extends Player {
public CraftPlayer getBukkitEntity() {
return (CraftPlayer) super.getBukkitEntity();
}
@@ -94,7 +94,7 @@ index 618ab9a2903f6d4139acd4aaa2e6db0a26e88ba9..960a2c5735d3ddb05673f8aba43268ad
this.debugLogging(pos, true, sequence, reason);
} else {
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index 2007cd935d7879ae0234f875a0c00dd9727bdc4b..5976a25837bdc6571c9523a6ccfed919433e45f3 100644
index 39a8fb7a73362beab1e4a53b6297a054a159bb80..e38967daceee9a510f0021ef43f6324478088603 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -32,9 +32,12 @@ import net.minecraft.world.level.block.state.StateDefinition;

0
patches/server/0050-Renewable-Elytra.patch → patches/server/0049-Renewable-Elytra.patch
View File

0
patches/server/0051-Stackable-ShulkerBoxes.patch → patches/server/0050-Stackable-ShulkerBoxes.patch
View File

0
patches/server/0052-Improve-fluid-direction-caching.patch → patches/server/0051-Improve-fluid-direction-caching.patch
View File

6
patches/server/0053-MC-Technical-Survival-Mode.patch → patches/server/0052-MC-Technical-Survival-Mode.patch
View File

@@ -96,7 +96,7 @@ index 1b7cf6d06bdf36f146656727511a461f2520762e..0eb8c5dc84c3ca346dcaf6fd50c13d3b
this.leftOwner = nbt.getBoolean("LeftOwner");
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index b0f23ebceb2f492b21eb95ee9496621f46c975c7..79f8e34032cde65a7d2a1f21bc32e0c22aff8efc 100644
index 9af07ebff3a510a4e3fc71ab4d08897db02b7299..81eaa7ead4821929f20e4c5fcb822504001f6f99 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -95,7 +95,7 @@ public final class NaturalSpawner {
@@ -109,7 +109,7 @@ index b0f23ebceb2f492b21eb95ee9496621f46c975c7..79f8e34032cde65a7d2a1f21bc32e0c2
entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index fda5a0b0f93c903d033d086da2b79887ed829bdc..7a967fa53c427aea52c33f6e6b857c804fb8fe63 100644
index c707341fd8f878f77c132a5993ae94a18c259711..8545cfdc5a08e3f6f7c9a050867a3b45fd97bf39 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -2,6 +2,7 @@ package top.leavesmc.leaves;
@@ -120,7 +120,7 @@ index fda5a0b0f93c903d033d086da2b79887ed829bdc..7a967fa53c427aea52c33f6e6b857c80
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -483,6 +484,14 @@ public final class LeavesConfig {
@@ -478,6 +479,14 @@ public final class LeavesConfig {
public static void doMcTechnicalMode() {
if (mcTechnicalMode) {

2
patches/server/0054-Return-nether-portal-fix.patch → patches/server/0053-Return-nether-portal-fix.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 5f23b11cf9ad01d1e44b70997726885789cf7c49..d9224108e70b918b5ea33a2cc979d1d7dd3b00b2 100644
index 08fdd168921b80d3b31310be18ee5c15d57718aa..36d63cbfc7ca29c8b2a69453dbc3065ba63dbeb4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -186,6 +186,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

4
patches/server/0055-Appleskin-Protocol.patch → patches/server/0054-Appleskin-Protocol.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Appleskin Protocol
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5bdfe75075118c6a2347bc6c9764be4352a83944..b0b3421ce24a6b8f16c3ec45bb2d10ac48667eff 100644
index 9e68a0da8be6483319e070d4641eab85c75a38a1..532611ad19401717bf28f6aac7c88f5769ed563a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1604,6 +1604,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1603,6 +1603,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");
top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor

0
patches/server/0056-Xaero-Map-Protocol.patch → patches/server/0055-Xaero-Map-Protocol.patch
View File

6
patches/server/0057-Leaves-Extra-Yggdrasil-Service.patch → patches/server/0056-Leaves-Extra-Yggdrasil-Service.patch
View File

@@ -31,7 +31,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..973ecf723e4239307600b42f2d12c264
String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 46eacd000b622b9dba746fe38e4bf2a0abfe061c..3b42b63d0fefb4a978b372facd0a03b674625843 100644
index 532611ad19401717bf28f6aac7c88f5769ed563a..bd12bc1aabc9fa079b0f46350386a53475ef75be 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -264,7 +264,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -44,7 +44,7 @@ index 46eacd000b622b9dba746fe38e4bf2a0abfe061c..3b42b63d0fefb4a978b372facd0a03b6
public final Thread serverThread;
private long nextTickTime;
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 168ef6606b579ab0d2780736090934f430e56912..586975025875295963100c3c84928518c8c3a7d7 100644
index 8545cfdc5a08e3f6f7c9a050867a3b45fd97bf39..bb1fdbe60ae530c9852f9275a931edcd34b73b68 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -55,7 +55,7 @@ index 168ef6606b579ab0d2780736090934f430e56912..586975025875295963100c3c84928518
import top.leavesmc.leaves.util.MathUtils;
import java.io.File;
@@ -520,6 +521,9 @@ public final class LeavesConfig {
@@ -515,6 +516,9 @@ public final class LeavesConfig {
extraYggdrasilLoginProtect = getBoolean("settings.misc.extra-yggdrasil-service.login-protect", extraYggdrasilLoginProtect);
extraYggdrasilServiceList = getList("settings.misc.extra-yggdrasil-service.urls", extraYggdrasilServiceList);
if (extraYggdrasilService) {

0
patches/server/0058-Use-vanilla-random-config.patch → patches/server/0057-Use-vanilla-random-config.patch
View File

4
patches/server/0059-Fix-update-suppression-crash.patch → patches/server/0058-Fix-update-suppression-crash.patch
View File

@@ -20,10 +20,10 @@ index d2f0a0755317f5fa9a1ccf7db346aa77fd287d80..9c7fb1b7c2ff458e72bdcfa80c49252c
if (listener.shouldPropagateHandlingExceptions()) {
throw exception;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3b42b63d0fefb4a978b372facd0a03b674625843..67653452bc4bd63eafe3a6f407653536e3360f33 100644
index bd12bc1aabc9fa079b0f46350386a53475ef75be..7ad7f8e127df5154391a7178dfaba06cd7f4c2b3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1561,7 +1561,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1560,7 +1560,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
try {
worldserver.timings.doTick.startTiming(); // Spigot

4
patches/server/0060-Bedrock-break-list.patch → patches/server/0059-Bedrock-break-list.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 67653452bc4bd63eafe3a6f407653536e3360f33..16fd5af5f0f5018f87bf143926b6ec6b4bfc1a76 100644
index 7ad7f8e127df5154391a7178dfaba06cd7f4c2b3..28b48043f621d931006ef36123ff5d1eaed7d040 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1611,6 +1611,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1610,6 +1610,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
top.leavesmc.leaves.protocol.AppleSkinProtocol.tick(); // Leaves - appleskin

4
patches/server/0061-Syncmatica-Protocol.patch → patches/server/0060-Syncmatica-Protocol.patch
View File

@@ -54,7 +54,7 @@ index bb0e97bd0f4332a2da1b9f077d61b6f81fbeaaad..b2be14056502a902f8fd2caaacaffc5d
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index ea4908c14ffedddc7966932468067f047ecb5b23..b6984f7074ee1782a31c44820c255d21a4228df6 100644
index bb1fdbe60ae530c9852f9275a931edcd34b73b68..8049827ffba47ef1a617e17f5d7efc1a08869d3d 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -12,6 +12,7 @@ import top.leavesmc.leaves.command.LeavesCommand;
@@ -65,7 +65,7 @@ index ea4908c14ffedddc7966932468067f047ecb5b23..b6984f7074ee1782a31c44820c255d21
import top.leavesmc.leaves.util.MathUtils;
import java.io.File;
@@ -558,6 +559,7 @@ public final class LeavesConfig {
@@ -553,6 +554,7 @@ public final class LeavesConfig {
syncmaticaQuota = getBoolean("settings.protocol.syncmatica.quota", syncmaticaQuota);
syncmaticaQuotaLimit = getInt("settings.protocol.syncmatica.quota-limit", syncmaticaQuotaLimit);
if (syncmaticaProtocol) {

0
patches/server/0062-Fix-trapdoor-feature.patch → patches/server/0061-Fix-trapdoor-feature.patch
View File

0
patches/server/0063-Disable-distance-check-for-UseItemOnPacket.patch → patches/server/0062-Disable-distance-check-for-UseItemOnPacket.patch
View File

2
patches/server/0064-No-feather-falling-trample.patch → patches/server/0063-No-feather-falling-trample.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] No feather falling trample
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
index 552d8c8f3f56bfccd25d11488ed7ec1644a92f47..a0af2e1b417a311464d09d3a9fb458f9f5f952c2 100644
index 5946f06f63b5694034bd027984a4925b0831d439..c66428ed5e0557b0e2bcc2cfd9bfbe992d85bf72 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -102,6 +102,13 @@ public class FarmBlock extends Block {

0
patches/server/0065-Shared-villager-discounts.patch → patches/server/0064-Shared-villager-discounts.patch
View File

0
patches/server/0066-Fix-hoppers-incorrect-update.patch → patches/server/0065-Fix-hoppers-incorrect-update.patch
View File

0
patches/server/0067-Redstone-wire-dont-connect-if-on-trapdoor.patch → patches/server/0066-Redstone-wire-dont-connect-if-on-trapdoor.patch
View File

0
patches/server/0068-Disable-check-out-of-order-command.patch → patches/server/0067-Disable-check-out-of-order-command.patch
View File

0
patches/server/0069-Despawn-enderman-with-block.patch → patches/server/0068-Despawn-enderman-with-block.patch
View File

2
patches/server/0070-Leaves-carpet-support.patch → patches/server/0069-Leaves-carpet-support.patch
View File

@@ -31,7 +31,7 @@ index fed72c6fef684758be756602f57393d088bac50d..13356860e13374227ac5559daf77fc4d
final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index b6984f7074ee1782a31c44820c255d21a4228df6..7fa2be51b1e68a15533b20263a3eeab8d3792c2d 100644
index 8049827ffba47ef1a617e17f5d7efc1a08869d3d..50b1574c090a6762a6c94aeb40abebd184b210b8 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -14,6 +14,8 @@ import top.leavesmc.leaves.bot.agent.Actions;

4
patches/server/0071-Creative-fly-no-clip.patch → patches/server/0070-Creative-fly-no-clip.patch
View File

@@ -85,10 +85,10 @@ index 1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7..f26e5626c0823c041eeb388cbcd78e52
public boolean isSpawning() {
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 7fa2be51b1e68a15533b20263a3eeab8d3792c2d..4f9b950e21f55c0f251eb15164315c8f7891b17a 100644
index 50b1574c090a6762a6c94aeb40abebd184b210b8..a099364df3304df8092652e64bdb02d550c84b4f 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -604,6 +604,7 @@ public final class LeavesConfig {
@@ -599,6 +599,7 @@ public final class LeavesConfig {
}
public static void registerCarpetRules() {

4
patches/server/0072-Optimized-dragon-respawn.patch → patches/server/0071-Optimized-dragon-respawn.patch
View File

@@ -18,7 +18,7 @@ index d0a047fd8849e9210dc9424325561f5a1b9998df..b665410788aa7c889dc214c2a97a9c29
for(int j = 0; j < this.height; ++j) {
for(int k = 0; k < this.depth; ++k) {
diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
index 630971d7a87c12798672af9635535eaf80a3ec9c..a8485a4fe962246c4d0bfd71b9f5278a348188ae 100644
index 5b333bef255d7ef61c99510837536920c6fb6e8c..7e68f278a780188e741e2313e125a1a796d25472 100644
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
@@ -45,6 +45,7 @@ import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;
@@ -97,7 +97,7 @@ index 630971d7a87c12798672af9635535eaf80a3ec9c..a8485a4fe962246c4d0bfd71b9f5278a
ChunkPos chunkcoordintpair = new ChunkPos(this.origin);
int i;
@@ -592,6 +652,11 @@ public class EndDragonFight {
@@ -614,6 +674,11 @@ public class EndDragonFight {
}
public boolean respawnDragon(List<EndCrystal> list) { // PAIL private -> public // CraftBukkit - return boolean

0
patches/server/0073-Enchantment-mending-compatibility-infinity.patch → patches/server/0072-Enchantment-mending-compatibility-infinity.patch
View File

2
patches/server/0074-Shave-snow-layers.patch → patches/server/0073-Shave-snow-layers.patch
View File

@@ -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;

2
patches/server/0075-Spawn-ignore-lc.patch → patches/server/0074-Spawn-ignore-lc.patch
View File

@@ -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;

0
patches/server/0076-Elytra-aeronautics-no-chunk-load.patch → patches/server/0075-Elytra-aeronautics-no-chunk-load.patch
View File

0
patches/server/0077-Disable-timings-default.patch → patches/server/0076-Disable-timings-default.patch
View File

4
patches/server/0078-Bladeren-mspt-sync-protocol.patch → patches/server/0077-Bladeren-mspt-sync-protocol.patch
View File

@@ -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<TickTa
@@ -1611,6 +1611,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
top.leavesmc.leaves.protocol.AppleSkinProtocol.tick(); // Leaves - appleskin
top.leavesmc.leaves.util.BreakBedrockList.endTick(); // Leaves - break bedrock list

8
patches/server/0079-Fix-Paper-9372.patch → patches/server/0078-Fix-Paper-9372.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Fix Paper#9372
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index d9224108e70b918b5ea33a2cc979d1d7dd3b00b2..a03472d2ceb268168268600fea7ce7ce4e62d4f6 100644
index 36d63cbfc7ca29c8b2a69453dbc3065ba63dbeb4..65da7505cee10a73616b19a6884dd9f723564c3a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1257,6 +1257,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index d9224108e70b918b5ea33a2cc979d1d7dd3b00b2..a03472d2ceb268168268600fea7ce7ce
worldserver.addDuringPortalTeleport(this);
worldserver1.getProfiler().pop();
this.triggerDimensionChangeTriggers(worldserver1);
@@ -1968,6 +1969,7 @@ public class ServerPlayer extends Player {
@@ -1973,6 +1974,7 @@ public class ServerPlayer extends Player {
public void moveTo(double x, double y, double z) {
super.moveTo(x, y, z);
this.connection.resetPosition();
@@ -25,7 +25,7 @@ index d9224108e70b918b5ea33a2cc979d1d7dd3b00b2..a03472d2ceb268168268600fea7ce7ce
}
@Override
@@ -2204,6 +2206,7 @@ public class ServerPlayer extends Player {
@@ -2209,6 +2211,7 @@ public class ServerPlayer extends Player {
this.connection.send(new ClientboundSetCameraPacket(this.camera));
this.connection.resetPosition();
@@ -33,7 +33,7 @@ index d9224108e70b918b5ea33a2cc979d1d7dd3b00b2..a03472d2ceb268168268600fea7ce7ce
}
}
@@ -2656,6 +2659,7 @@ public class ServerPlayer extends Player {
@@ -2661,6 +2664,7 @@ public class ServerPlayer extends Player {
public void forceSetPositionRotation(double x, double y, double z, float yaw, float pitch) {
this.moveTo(x, y, z, yaw, pitch);
this.connection.resetPosition();

0
patches/server/0080-Cache-ignite-odds.patch → patches/server/0079-Cache-ignite-odds.patch
View File

2
patches/server/0081-Leaves-protocol.patch → patches/server/0080-Leaves-protocol.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves protocol
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5b03b63653c6b5586fb8d6ac7766beadb8ce04a9..fc9b8f6e9dbef606ade0f2376a8187ae4ca366cb 100644
index 9676ada06db5956cdc4489d07f4c031ae9372b06..5342cbb955cd6536004ca1c905fd9ab3bd9f7839 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -366,6 +366,7 @@ public abstract class PlayerList {

0
patches/server/0082-Lava-riptide.patch → patches/server/0081-Lava-riptide.patch
View File

2
patches/server/0083-No-block-update-command.patch → patches/server/0082-No-block-update-command.patch
View File

@@ -92,7 +92,7 @@ index 2708251ebc1995e71fb0e5dca9e158a3005f8a8a..e28351b379677fec356b6efec2d882ee
}
}
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
index 4f9b950e21f55c0f251eb15164315c8f7891b17a..e5db9559f0af53ab1dac04d570bf1c7352350121 100644
index a099364df3304df8092652e64bdb02d550c84b4f..1e14eefdce8633f196868f2309dd832b00b3373f 100644
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
@@ -11,6 +11,7 @@ import org.bukkit.configuration.file.YamlConfiguration;

0
patches/server/0084-Raider-die-skip-self-raid-check.patch → patches/server/0083-Raider-die-skip-self-raid-check.patch
View File

0
patches/server/0085-Container-open-passthrough.patch → patches/server/0084-Container-open-passthrough.patch
View File

0
patches/server/0086-Use-fast-item-merge-raytracing.patch → patches/server/0085-Use-fast-item-merge-raytracing.patch
View File

2
patches/server/0087-SIMD-support.patch → patches/server/0086-SIMD-support.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] SIMD support
diff --git a/build.gradle.kts b/build.gradle.kts
index 9d013901f963ff06cddbacd431921b78650a4ed0..254bd925a7ac80d4bfdeea3903c9385779425f07 100644
index 955362ab4155718807859978d840d9f4d68a8ef4..3f3e60ecbd24c1c40ebbdaec7402192e111f5407 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -71,6 +71,7 @@ tasks.withType<JavaCompile> {

0
patches/server/0088-Dont-respond-ping-before-start-fully.patch → patches/server/0087-Dont-respond-ping-before-start-fully.patch
View File

0
patches/server/0089-Faster-chunk-serialization.patch → patches/server/0088-Faster-chunk-serialization.patch
View File

0
patches/server/0090-Optimize-world-generation-chunk-and-block-access.patch → patches/server/0089-Optimize-world-generation-chunk-and-block-access.patch
View File

0
patches/server/0091-Cache-world-generator-sea-level.patch → patches/server/0090-Cache-world-generator-sea-level.patch
View File

0
patches/server/0092-Skip-secondary-POI-sensor-if-absent.patch → patches/server/0091-Skip-secondary-POI-sensor-if-absent.patch
View File

0
patches/server/0093-Cache-CubeVoxelShape-shape-array.patch → patches/server/0092-Cache-CubeVoxelShape-shape-array.patch
View File

0
patches/server/0094-Store-mob-counts-in-an-array.patch → patches/server/0093-Store-mob-counts-in-an-array.patch
View File

0
patches/server/0095-Cache-BlockStatePairKey-hash.patch → patches/server/0094-Cache-BlockStatePairKey-hash.patch
View File

0
patches/server/0096-Optimize-noise-generation.patch → patches/server/0095-Optimize-noise-generation.patch
View File

0
patches/server/0097-Disable-packet-limit.patch → patches/server/0096-Disable-packet-limit.patch
View File

6
patches/server/0098-Reduce-array-allocations.patch → patches/server/0097-Reduce-array-allocations.patch
View File

@@ -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<CraftingContainer> 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) {

0
patches/server/0099-Optimize-sun-burn-tick.patch → patches/server/0098-Optimize-sun-burn-tick.patch
View File

0
patches/server/0100-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch → patches/server/0099-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
View File

4
patches/server/0101-Use-optimized-collection.patch → patches/server/0100-Use-optimized-collection.patch
View File

@@ -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;

0
patches/server/0102-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch → patches/server/0101-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
View File

0
patches/server/0103-Optimized-CubePointRange.patch → patches/server/0102-Optimized-CubePointRange.patch
View File

0
patches/server/0104-Check-frozen-ticks-before-landing-block.patch → patches/server/0103-Check-frozen-ticks-before-landing-block.patch
View File

0
patches/server/0105-Cache-ominous-banner-item.patch → patches/server/0104-Cache-ominous-banner-item.patch
View File

0
patches/server/0106-Skip-entity-move-if-movement-is-zero.patch → patches/server/0105-Skip-entity-move-if-movement-is-zero.patch
View File

0
patches/server/0107-Skip-cloning-advancement-criteria.patch → patches/server/0106-Skip-cloning-advancement-criteria.patch
View File

0
patches/server/0108-Skip-unnecessary-mob-spawning-computations.patch → patches/server/0107-Skip-unnecessary-mob-spawning-computations.patch
View File

0
patches/server/0109-Skip-negligible-planar-movement-multiplication.patch → patches/server/0108-Skip-negligible-planar-movement-multiplication.patch
View File

0
patches/server/0110-Fix-villagers-dont-release-memory.patch → patches/server/0109-Fix-villagers-dont-release-memory.patch
View File

4
patches/server/0111-Avoid-anvil-too-expensive.patch → patches/server/0110-Avoid-anvil-too-expensive.patch
View File

@@ -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));

0
patches/server/0112-Bow-infinity-fix.patch → patches/server/0111-Bow-infinity-fix.patch
View File

0
patches/server/0113-Zero-tick-plants.patch → patches/server/0112-Zero-tick-plants.patch
View File

0
patches/server/0114-Leaves-update-command.patch → patches/server/0113-Leaves-update-command.patch
View File

2
patches/server/0115-Force-peaceful-mode-switch.patch → patches/server/0114-Force-peaceful-mode-switch.patch
View File

@@ -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 {

4
patches/server/0116-Add-Leaves-Auto-Update.patch → patches/server/0115-Add-Leaves-Auto-Update.patch
View File

@@ -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);

0
patches/server/0117-Replay-Mod-API.patch → patches/server/0116-Replay-Mod-API.patch
View File

14
patches/server/0118-Leaves-tick-command.patch → patches/server/0117-Leaves-tick-command.patch
View File

@@ -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<TickTask> implements CommandSource, AutoCloseable {
@@ -1100,6 +1101,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1099,6 +1100,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Spigot End
public static volatile RuntimeException chunkSystemCrash; // Paper - rewrite chunk system
@@ -24,7 +24,7 @@ index 49fc9c750d7696789649081430b262b084a21022..d3caf75c726a88b6ace1161550057c12
protected void runServer() {
try {
@@ -1148,21 +1150,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1147,21 +1149,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.lastOverloadWarning = this.nextTickTime;
}
@@ -63,7 +63,7 @@ index 49fc9c750d7696789649081430b262b084a21022..d3caf75c726a88b6ace1161550057c12
// Spigot end
if (this.debugCommandProfilerDelayStart) {
@@ -1175,11 +1180,23 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1174,11 +1179,23 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.nextTickTime += 50L;
this.startMetricsRecordingTick();
this.profiler.push("tick");
@@ -89,7 +89,7 @@ index 49fc9c750d7696789649081430b262b084a21022..d3caf75c726a88b6ace1161550057c12
this.profiler.pop();
this.endMetricsRecordingTick();
this.isReady = true;
@@ -1236,6 +1253,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1235,6 +1252,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
@@ -109,10 +109,10 @@ index 49fc9c750d7696789649081430b262b084a21022..d3caf75c726a88b6ace1161550057c12
ReportedException reportedexception = null;
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a03472d2ceb268168268600fea7ce7ce4e62d4f6..f2e0e45e6255ab8cb47f355203bb0bbdc8faa61f 100644
index 65da7505cee10a73616b19a6884dd9f723564c3a..95770bf46288d07b04a9bff67c7f74f7092eeb1e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2737,7 +2737,7 @@ public class ServerPlayer extends Player {
@@ -2742,7 +2742,7 @@ public class ServerPlayer extends Player {
}
public boolean allowOperation() {

0
patches/server/0119-Fix-vehicle-teleport-by-end-gateway.patch → patches/server/0118-Fix-vehicle-teleport-by-end-gateway.patch
View File

2
patches/server/0120-Leaves-I18n.patch → patches/server/0119-Leaves-I18n.patch
View File

@@ -51,7 +51,7 @@ index 571fdf253ebc5cf2a3ec120c53293b37b770836d..800cadbb379cb90d5351c6d73f994713
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
BiConsumer<String, String> 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

0
patches/server/0121-Fix-minecraft-hopper-not-work-without-player.patch → patches/server/0120-Fix-minecraft-hopper-not-work-without-player.patch
View File

57
patches/server/0122-Delete-Timings.patch → patches/server/0121-Delete-Timings.patch
View File

@@ -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<TickTask> implements CommandSource, AutoCloseable {
@@ -943,7 +931,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -942,7 +930,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
@@ -939,7 +939,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
top.leavesmc.leaves.bot.ServerBot.saveOrRemoveAllBot(); // Leaves - save or remove bot
// CraftBukkit start
if (this.server != null) {
@@ -1414,15 +1401,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1413,15 +1400,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public void onServerExit() {}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -957,7 +957,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1457,9 +1443,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1456,9 +1442,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -968,7 +968,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1480,7 +1464,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1479,7 +1463,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.frameTimer.logFrameDuration(k - i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -976,7 +976,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
}
private ServerStatus buildServerStatus() {
@@ -1512,9 +1495,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1511,9 +1494,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickChildren(BooleanSupplier shouldKeepTicking) {
@@ -986,7 +986,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
// Paper start - Folia scheduler API
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
getAllLevels().forEach(level -> {
@@ -1531,21 +1512,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1530,21 +1511,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end - Folia scheduler API
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
this.profiler.push("commandFunctions");
@@ -1008,7 +1008,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
// Send time updates to everyone, it will get the right time from the world the player is in.
// Paper start - optimize time updates
for (final ServerLevel level : this.getAllLevels()) {
@@ -1565,7 +1541,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1564,7 +1540,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
@@ -1016,7 +1016,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
this.isIteratingOverLevels = true; // Paper
Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
@@ -1589,7 +1564,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1588,7 +1563,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -1024,7 +1024,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
// Leaves start
try {
worldserver.tick(shouldKeepTicking);
@@ -1602,7 +1576,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1601,7 +1575,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
regionManager.recalculateRegions();
}
// Paper end
@@ -1032,7 +1032,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1625,13 +1598,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1624,13 +1597,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
this.profiler.popPush("connection");
@@ -1046,7 +1046,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
if (SharedConstants.IS_RUNNING_IN_IDE) {
GameTestTicker.SINGLETON.tick();
}
@@ -1643,11 +1612,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1642,11 +1611,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
top.leavesmc.leaves.util.BreakBedrockList.endTick(); // Leaves - break bedrock list
top.leavesmc.leaves.protocol.bladeren.MsptSyncProtocol.tick(this); // Leaves - mspt sync
@@ -1058,7 +1058,7 @@ index d3caf75c726a88b6ace1161550057c124e7fdd9c..6bfa67d43c92b5b0f303ebe360e130d1
this.profiler.pop();
}
@@ -2829,34 +2796,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2828,34 +2795,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -1126,7 +1126,7 @@ index 4a610b712acfe0b1b4dcf4988bc22c6a71616050..562fb1601db7e04899d4313fe4a32f02
i = this.context.runTopCommand(function, source);
} finally {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index cf3446afeff3afb58b78c01beca843ae5512fffb..1701ff0aa122680626cecedce2cdc804ddad06f6 100644
index f8edbc95ffe7de0341e5724ad3efe69c74e95a07..2390788d6a472d900e1cf014e4c4a6834518af21 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -58,7 +58,6 @@ import org.apache.logging.log4j.Level;
@@ -1135,9 +1135,9 @@ index cf3446afeff3afb58b78c01beca843ae5512fffb..1701ff0aa122680626cecedce2cdc804
import org.bukkit.command.CommandSender;
-import co.aikar.timings.MinecraftTimings; // Paper
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.craftbukkit.util.Waitable; // Paper
import org.bukkit.event.server.RemoteServerCommandEvent;
@@ -496,7 +495,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -495,7 +494,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
public void handleConsoleInputs() {
@@ -1145,7 +1145,7 @@ index cf3446afeff3afb58b78c01beca843ae5512fffb..1701ff0aa122680626cecedce2cdc804
// Paper start - use proper queue
ConsoleInput servercommand;
while ((servercommand = this.serverCommandQueue.poll()) != null) {
@@ -513,7 +511,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -512,7 +510,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// CraftBukkit end
}
@@ -1153,14 +1153,13 @@ index cf3446afeff3afb58b78c01beca843ae5512fffb..1701ff0aa122680626cecedce2cdc804
}
@Override
@@ -770,22 +767,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
if (event.isCancelled()) {
return;
}
- // Paper start
- if (command.toLowerCase().startsWith("timings") && command.toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
@@ -778,21 +775,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// Paper start
command.set(event.getCommand());
- if (event.getCommand().toLowerCase().startsWith("timings") && event.getCommand().toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
- org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
- Waitable<String> waitable = new Waitable<String>() {
- Waitable<String> 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