diff --git a/.github/workflows/leaves.yml b/.github/workflows/leaves.yml index 18e158bf..5a6070da 100644 --- a/.github/workflows/leaves.yml +++ b/.github/workflows/leaves.yml @@ -37,14 +37,14 @@ jobs: arguments: createReobfPaperclipJar - name: Rename Jar And Set env run: | - mv build/libs/Leaves-paperclip-1.19.1-R0.1-SNAPSHOT-reobf.jar leaves-1.19.1.jar - echo "message=`git log --pretty=format:“%s” -1`" >> $GITHUB_ENV + mv build/libs/Leaves-paperclip-1.19.2-R0.1-SNAPSHOT-reobf.jar leaves-1.19.2.jar + echo "message=`git log --pretty=format:“%s%n%b” -1`" >> $GITHUB_ENV echo "name=Leaves-`git rev-parse --short HEAD`" >> $GITHUB_ENV - echo "tag=1.19.1-`git rev-parse --short HEAD`" >> $GITHUB_ENV + echo "tag=1.19.2-`git rev-parse --short HEAD`" >> $GITHUB_ENV - name: Create Release uses: ncipollo/release-action@v1 with: - artifacts: leaves-1.19.1.jar + artifacts: leaves-1.19.2.jar body: ${{ env.message }} tag: ${{ env.tag }} prerelease: false diff --git a/gradle.properties b/gradle.properties index 60c9260f..ca74a457 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = top.leavesmc.leaves -version = 1.19.1-R0.1-SNAPSHOT +version = 1.19.2-R0.1-SNAPSHOT -mcVersion = 1.19.1 +mcVersion = 1.19.2 packageVersion = 1_19_R1 org.gradle.jvmargs=-Xmx2G -paperRef=02831e3369cc9ad76a3add2e4140eb1e6d67cd4f +paperRef=ef0e5a642d33ac62f070c45a61cb42647b2744cd diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch index a86e5823..d5d90952 100644 --- a/patches/api/0001-Leaves-Server-Config.patch +++ b/patches/api/0001-Leaves-Server-Config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 56e261efa654e4a6872ccea28f0461df13845d13..12303b0b60a008727f115aad350a23a4b3624ce5 100644 +index da5cab4246bd253fcc4e4d9574bdae1867ebb5ab..866d0825a955e61fdcce488aa9e526c4a32ca37e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1936,6 +1936,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1947,6 +1947,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi throw new UnsupportedOperationException("Not supported yet."); } // Paper end diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 482d9756..625ed8f6 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> -Date: Tue, 26 Oct 2021 12:01:34 +0800 +Date: Tue, 13 Sep 2022 16:58:47 +0800 Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..1b11cdd2bda26c5c0b7845f77e4b78523f6dac89 100644 +index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..447cd0bae0f082a97b5db79720b0110269d9b3f3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,12 @@ plugins { @@ -16,7 +16,7 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..1b11cdd2bda26c5c0b7845f77e4b7852 - implementation(project(":paper-mojangapi")) + implementation(project(":leaves-api")) // Leaves + // Leaves start -+ implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } + // Leaves end @@ -70,37 +70,11 @@ index 7b1843e16745ca8db2244e17490d291401f22679..0ac8bcb0a4b7d1da3d0e016617db7a81 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); -diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java -index c89f6986eda5a132a948732ea1b6923370685317..5a0655dabc032a29062dfdd9f9d3fc9e8d25f6b7 100644 ---- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java -+++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java -@@ -26,7 +26,7 @@ public abstract class AreaMap { - - // we use linked for better iteration. - // map of: coordinate to set of objects in coordinate -- protected final Long2ObjectOpenHashMap> areaMap = new Long2ObjectOpenHashMap<>(1024, 0.7f); -+ protected Long2ObjectOpenHashMap> areaMap = new Long2ObjectOpenHashMap<>(1024, 0.7f); // Leaves - not final - protected final PooledLinkedHashSets pooledHashSets; - - protected final ChangeCallback addCallback; -diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java -index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279335f6c99 100644 ---- a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java -+++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java -@@ -5,7 +5,7 @@ import net.minecraft.server.level.ServerPlayer; - /** - * @author Spottedleaf - */ --public final class PlayerAreaMap extends AreaMap { -+public class PlayerAreaMap extends AreaMap { // Leaves - not final - - public PlayerAreaMap() { - super(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f23be38ef96a81ce3867a3b6fdccf632fe285f31..7301c552ab695b81560eeefa44b2f29d4f4ac258 100644 +index d2161a3c3b9a2b2d463ac778656c95167c10a49d..c353bd0bb8d6a9bbc1bca535d9a529ba25b52c05 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1655,7 +1655,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop jobs = Queues.newConcurrentLinkedQueue(); -+ private final Thread thread; -+ private final BooleanSupplier shouldRun; -+ private volatile boolean killswitch = false; -+ -+ public AsyncExecutor(String threadName, BooleanSupplier shouldRun) { -+ this.thread = new Thread(this, threadName); -+ this.shouldRun = shouldRun; -+ } -+ -+ public void start() { -+ thread.start(); -+ } -+ -+ public void kill() { -+ killswitch = true; -+ } -+ -+ public void submit(Runnable runnable) { -+ jobs.offer(runnable); -+ } -+ -+ @Override -+ public void run() { -+ while (!killswitch) { -+ if (shouldRun.getAsBoolean()) { -+ try { -+ Runnable runnable; -+ while ((runnable = jobs.poll()) != null) { -+ runnable.run(); -+ } -+ } catch (Exception e) { -+ LeavesLogger.LOGGER.log(Level.SEVERE, e, () -> "Failed to execute async job for thread " + thread.getName()); -+ } -+ } -+ LockSupport.parkNanos("executing tasks", 1000L); -+ } -+ } -+} -diff --git a/src/main/java/top/leavesmc/leaves/util/AsyncPlayerAreaMap.java b/src/main/java/top/leavesmc/leaves/util/AsyncPlayerAreaMap.java -new file mode 100644 -index 0000000000000000000000000000000000000000..4ccc1b3b29e9d62526b2d7c56ef06db77704bf80 ---- /dev/null -+++ b/src/main/java/top/leavesmc/leaves/util/AsyncPlayerAreaMap.java -@@ -0,0 +1,32 @@ -+package top.leavesmc.leaves.util; -+ -+import com.destroystokyo.paper.util.misc.PlayerAreaMap; -+import com.destroystokyo.paper.util.misc.PooledLinkedHashSets; -+import net.minecraft.server.level.ServerPlayer; -+ -+import java.util.concurrent.ConcurrentHashMap; -+ -+// Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) -+public class AsyncPlayerAreaMap extends PlayerAreaMap { -+ -+ public AsyncPlayerAreaMap() { -+ super(); -+ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f)); -+ } -+ -+ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets) { -+ super(pooledHashSets); -+ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f)); -+ } -+ -+ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets, final ChangeCallback addCallback, -+ final ChangeCallback removeCallback) { -+ this(pooledHashSets, addCallback, removeCallback, null); -+ } -+ -+ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets, final ChangeCallback addCallback, -+ final ChangeCallback removeCallback, final ChangeSourceCallback changeSourceCallback) { -+ super(pooledHashSets, addCallback, removeCallback, changeSourceCallback); -+ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f)); -+ } -+} -diff --git a/src/main/java/top/leavesmc/leaves/util/IterableWrapper.java b/src/main/java/top/leavesmc/leaves/util/IterableWrapper.java -new file mode 100644 -index 0000000000000000000000000000000000000000..0dc58b78c84a825ec7025534cd0fc7be9c4610ad ---- /dev/null -+++ b/src/main/java/top/leavesmc/leaves/util/IterableWrapper.java -@@ -0,0 +1,21 @@ -+package top.leavesmc.leaves.util; -+ -+import org.jetbrains.annotations.NotNull; -+ -+import java.util.Iterator; -+ -+// Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) -+public class IterableWrapper implements Iterable { -+ -+ private final Iterator iterator; -+ -+ public IterableWrapper(Iterator iterator) { -+ this.iterator = iterator; -+ } -+ -+ @NotNull -+ @Override -+ public Iterator iterator() { -+ return iterator; -+ } -+} -diff --git a/src/main/java/top/leavesmc/leaves/util/Long2ObjectOpenHashMapWrapper.java b/src/main/java/top/leavesmc/leaves/util/Long2ObjectOpenHashMapWrapper.java -new file mode 100644 -index 0000000000000000000000000000000000000000..b684d8f576acbc5de8d06b0ff779c257198bc32d ---- /dev/null -+++ b/src/main/java/top/leavesmc/leaves/util/Long2ObjectOpenHashMapWrapper.java -@@ -0,0 +1,41 @@ -+package top.leavesmc.leaves.util; -+ -+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; -+import org.jetbrains.annotations.Nullable; -+ -+import java.util.Map; -+ -+public class Long2ObjectOpenHashMapWrapper extends Long2ObjectOpenHashMap { -+ -+ private final Map backingMap; -+ -+ public Long2ObjectOpenHashMapWrapper(Map map) { -+ backingMap = map; -+ } -+ -+ @Override -+ public V put(Long key, V value) { -+ return backingMap.put(key, value); -+ } -+ -+ @Override -+ public V get(Object key) { -+ return backingMap.get(key); -+ } -+ -+ @Override -+ public V remove(Object key) { -+ return backingMap.remove(key); -+ } -+ -+ @Nullable -+ @Override -+ public V putIfAbsent(Long key, V value) { -+ return backingMap.putIfAbsent(key, value); -+ } -+ -+ @Override -+ public int size() { -+ return backingMap.size(); -+ } -+} diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png index a7d785f60c884ee4ee487cc364402d66c3dc2ecc..68e9ac07245a9e4607b5e57c3511121a5651ad43 100644 GIT binary patch diff --git a/patches/server/0002-Leaves-Server-Utils.patch b/patches/server/0002-Leaves-Server-Utils.patch new file mode 100644 index 00000000..5b4c138c --- /dev/null +++ b/patches/server/0002-Leaves-Server-Utils.patch @@ -0,0 +1,224 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: violetc <58360096+s-yh-china@users.noreply.github.com> +Date: Tue, 13 Sep 2022 16:59:31 +0800 +Subject: [PATCH] Leaves Server Utils + + +diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java +index c89f6986eda5a132a948732ea1b6923370685317..5a0655dabc032a29062dfdd9f9d3fc9e8d25f6b7 100644 +--- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java ++++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java +@@ -26,7 +26,7 @@ public abstract class AreaMap { + + // we use linked for better iteration. + // map of: coordinate to set of objects in coordinate +- protected final Long2ObjectOpenHashMap> areaMap = new Long2ObjectOpenHashMap<>(1024, 0.7f); ++ protected Long2ObjectOpenHashMap> areaMap = new Long2ObjectOpenHashMap<>(1024, 0.7f); // Leaves - not final + protected final PooledLinkedHashSets pooledHashSets; + + protected final ChangeCallback addCallback; +diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java +index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279335f6c99 100644 +--- a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java ++++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java +@@ -5,7 +5,7 @@ import net.minecraft.server.level.ServerPlayer; + /** + * @author Spottedleaf + */ +-public final class PlayerAreaMap extends AreaMap { ++public class PlayerAreaMap extends AreaMap { // Leaves - not final + + public PlayerAreaMap() { + super(); +diff --git a/src/main/java/top/leavesmc/leaves/LeavesLogger.java b/src/main/java/top/leavesmc/leaves/LeavesLogger.java +new file mode 100644 +index 0000000000000000000000000000000000000000..890b91a95719f18a75bc2c2176ef5cb9f2bf4274 +--- /dev/null ++++ b/src/main/java/top/leavesmc/leaves/LeavesLogger.java +@@ -0,0 +1,16 @@ ++package top.leavesmc.leaves; ++ ++import org.bukkit.Bukkit; ++ ++import java.util.logging.Level; ++import java.util.logging.Logger; ++ ++public class LeavesLogger extends Logger { ++ public static final LeavesLogger LOGGER = new LeavesLogger(); ++ ++ private LeavesLogger() { ++ super("Leaves", null); ++ setParent(Bukkit.getLogger()); ++ setLevel(Level.ALL); ++ } ++} +diff --git a/src/main/java/top/leavesmc/leaves/util/AsyncExecutor.java b/src/main/java/top/leavesmc/leaves/util/AsyncExecutor.java +new file mode 100644 +index 0000000000000000000000000000000000000000..1c5449426b69dc711ca935f57cd8180f56219879 +--- /dev/null ++++ b/src/main/java/top/leavesmc/leaves/util/AsyncExecutor.java +@@ -0,0 +1,52 @@ ++package top.leavesmc.leaves.util; ++ ++import com.google.common.collect.Queues; ++import top.leavesmc.leaves.LeavesLogger; ++ ++import java.util.Queue; ++import java.util.concurrent.locks.LockSupport; ++import java.util.function.BooleanSupplier; ++import java.util.logging.Level; ++ ++// Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) ++public class AsyncExecutor implements Runnable { ++ ++ private Queue jobs = Queues.newConcurrentLinkedQueue(); ++ private final Thread thread; ++ private final BooleanSupplier shouldRun; ++ private volatile boolean killswitch = false; ++ ++ public AsyncExecutor(String threadName, BooleanSupplier shouldRun) { ++ this.thread = new Thread(this, threadName); ++ this.shouldRun = shouldRun; ++ } ++ ++ public void start() { ++ thread.start(); ++ } ++ ++ public void kill() { ++ killswitch = true; ++ } ++ ++ public void submit(Runnable runnable) { ++ jobs.offer(runnable); ++ } ++ ++ @Override ++ public void run() { ++ while (!killswitch) { ++ if (shouldRun.getAsBoolean()) { ++ try { ++ Runnable runnable; ++ while ((runnable = jobs.poll()) != null) { ++ runnable.run(); ++ } ++ } catch (Exception e) { ++ LeavesLogger.LOGGER.log(Level.SEVERE, e, () -> "Failed to execute async job for thread " + thread.getName()); ++ } ++ } ++ LockSupport.parkNanos("executing tasks", 1000L); ++ } ++ } ++} +diff --git a/src/main/java/top/leavesmc/leaves/util/AsyncPlayerAreaMap.java b/src/main/java/top/leavesmc/leaves/util/AsyncPlayerAreaMap.java +new file mode 100644 +index 0000000000000000000000000000000000000000..4ccc1b3b29e9d62526b2d7c56ef06db77704bf80 +--- /dev/null ++++ b/src/main/java/top/leavesmc/leaves/util/AsyncPlayerAreaMap.java +@@ -0,0 +1,32 @@ ++package top.leavesmc.leaves.util; ++ ++import com.destroystokyo.paper.util.misc.PlayerAreaMap; ++import com.destroystokyo.paper.util.misc.PooledLinkedHashSets; ++import net.minecraft.server.level.ServerPlayer; ++ ++import java.util.concurrent.ConcurrentHashMap; ++ ++// Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) ++public class AsyncPlayerAreaMap extends PlayerAreaMap { ++ ++ public AsyncPlayerAreaMap() { ++ super(); ++ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f)); ++ } ++ ++ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets) { ++ super(pooledHashSets); ++ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f)); ++ } ++ ++ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets, final ChangeCallback addCallback, ++ final ChangeCallback removeCallback) { ++ this(pooledHashSets, addCallback, removeCallback, null); ++ } ++ ++ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets, final ChangeCallback addCallback, ++ final ChangeCallback removeCallback, final ChangeSourceCallback changeSourceCallback) { ++ super(pooledHashSets, addCallback, removeCallback, changeSourceCallback); ++ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f)); ++ } ++} +diff --git a/src/main/java/top/leavesmc/leaves/util/IterableWrapper.java b/src/main/java/top/leavesmc/leaves/util/IterableWrapper.java +new file mode 100644 +index 0000000000000000000000000000000000000000..0dc58b78c84a825ec7025534cd0fc7be9c4610ad +--- /dev/null ++++ b/src/main/java/top/leavesmc/leaves/util/IterableWrapper.java +@@ -0,0 +1,21 @@ ++package top.leavesmc.leaves.util; ++ ++import org.jetbrains.annotations.NotNull; ++ ++import java.util.Iterator; ++ ++// Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) ++public class IterableWrapper implements Iterable { ++ ++ private final Iterator iterator; ++ ++ public IterableWrapper(Iterator iterator) { ++ this.iterator = iterator; ++ } ++ ++ @NotNull ++ @Override ++ public Iterator iterator() { ++ return iterator; ++ } ++} +diff --git a/src/main/java/top/leavesmc/leaves/util/Long2ObjectOpenHashMapWrapper.java b/src/main/java/top/leavesmc/leaves/util/Long2ObjectOpenHashMapWrapper.java +new file mode 100644 +index 0000000000000000000000000000000000000000..b684d8f576acbc5de8d06b0ff779c257198bc32d +--- /dev/null ++++ b/src/main/java/top/leavesmc/leaves/util/Long2ObjectOpenHashMapWrapper.java +@@ -0,0 +1,41 @@ ++package top.leavesmc.leaves.util; ++ ++import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; ++import org.jetbrains.annotations.Nullable; ++ ++import java.util.Map; ++ ++public class Long2ObjectOpenHashMapWrapper extends Long2ObjectOpenHashMap { ++ ++ private final Map backingMap; ++ ++ public Long2ObjectOpenHashMapWrapper(Map map) { ++ backingMap = map; ++ } ++ ++ @Override ++ public V put(Long key, V value) { ++ return backingMap.put(key, value); ++ } ++ ++ @Override ++ public V get(Object key) { ++ return backingMap.get(key); ++ } ++ ++ @Override ++ public V remove(Object key) { ++ return backingMap.remove(key); ++ } ++ ++ @Nullable ++ @Override ++ public V putIfAbsent(Long key, V value) { ++ return backingMap.putIfAbsent(key, value); ++ } ++ ++ @Override ++ public int size() { ++ return backingMap.size(); ++ } ++} diff --git a/patches/server/0002-Update-version-fetcher-repo.patch b/patches/server/0003-Update-version-fetcher-repo.patch similarity index 97% rename from patches/server/0002-Update-version-fetcher-repo.patch rename to patches/server/0003-Update-version-fetcher-repo.patch index f6d282d3..9542e5ab 100644 --- a/patches/server/0002-Update-version-fetcher-repo.patch +++ b/patches/server/0003-Update-version-fetcher-repo.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Update version fetcher repo diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index ece77f5ea4b14bbed7c070131b3251ea86764538..9f6ec8d4880672d4e767959700d4e167db32e0cd 100644 +index bf42969859545a8a520923ef1836ffa4a5cc24a0..895eac4479d27915566147d2f328e116ab1adbc9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -5,10 +5,9 @@ import com.google.common.base.Charsets; diff --git a/patches/server/0003-Leaves-Server-Config-And-Command.patch b/patches/server/0004-Leaves-Server-Config-And-Command.patch similarity index 96% rename from patches/server/0003-Leaves-Server-Config-And-Command.patch rename to patches/server/0004-Leaves-Server-Config-And-Command.patch index b517994b..82d31741 100644 --- a/patches/server/0003-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0004-Leaves-Server-Config-And-Command.patch @@ -19,10 +19,10 @@ index 06bff37e4c1fddd3be6343049a66787c63fb420c..15ed5a9af5583e2430804662e3b9fa95 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 7301c552ab695b81560eeefa44b2f29d4f4ac258..35fef03d2825d9e7f5ee324384ea8270bfde8f6f 100644 +index c353bd0bb8d6a9bbc1bca535d9a529ba25b52c05..1a84e2ee9966997a52b580bb0e4d69d557a48a7a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1144,6 +1144,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements CommandSource, AutoCloseable { -@@ -927,6 +929,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop msgFunction) { final PlayerChatMessage toConsoleMessage = msgFunction == null ? ChatProcessor.this.message : ChatProcessor.this.message.withUnsignedContent(msgFunction.apply(ChatProcessor.this.server.console)); @@ -44,7 +44,7 @@ index d27f115b74fe00623985255d1027656166c1c459..b5d5c2346cad59dabffc0c378b4f9fda protected boolean convertOldUsers() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2fab929b6775238d031ca3305b61af3cbe920a06..ccd8fd62a824566ffd44083177280701de2cd3e1 100644 +index 9eb921fec32afa360f3a402e978411fcf3ec618c..fb0931654a6f34d0ef2722bd6a599d5a8fb37464 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -75,6 +75,8 @@ import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; @@ -56,7 +56,7 @@ index 2fab929b6775238d031ca3305b61af3cbe920a06..ccd8fd62a824566ffd44083177280701 import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket; import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket; import net.minecraft.network.protocol.game.ClientboundSetDefaultSpawnPositionPacket; -@@ -2149,10 +2151,30 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2147,10 +2149,30 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void send(Packet packet) { @@ -73,12 +73,12 @@ index 2fab929b6775238d031ca3305b61af3cbe920a06..ccd8fd62a824566ffd44083177280701 this.send(packet, (PacketSendListener) null); } - public void send(Packet packet, @Nullable PacketSendListener packetsendlistener) { + public void send(Packet packet, @Nullable PacketSendListener callbacks) { + // Leaves start - no ClientboundPlayerChatHeaderPacket and rebuild ClientboundPlayerChatPacket + if (top.leavesmc.leaves.LeavesConfig.noChatSign) { + if (packet instanceof ClientboundPlayerChatHeaderPacket) { + return; -+ } else if (packet instanceof ClientboundPlayerChatPacket chat && packetsendlistener != null) { ++ } else if (packet instanceof ClientboundPlayerChatPacket chat && callbacks != null) { + this.send(chat); + return; + } @@ -87,30 +87,30 @@ index 2fab929b6775238d031ca3305b61af3cbe920a06..ccd8fd62a824566ffd44083177280701 // CraftBukkit start if (packet == null || this.processedDisconnect) { // Spigot return; -@@ -2574,6 +2596,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2565,6 +2587,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } - private void broadcastChatMessage(PlayerChatMessage playerchatmessage) { + private void broadcastChatMessage(PlayerChatMessage message) { + // Leaves start - no sign + if (top.leavesmc.leaves.LeavesConfig.noChatSign) { -+ playerchatmessage = PlayerChatMessage.unsigned(playerchatmessage.signer(), playerchatmessage.signedContent()); ++ message = PlayerChatMessage.unsigned(message.signer(), message.signedContent()); + } + // Leaves end - no sign // CraftBukkit start - String s = playerchatmessage.signedContent().plain(); + String s = message.signedContent().plain(); if (s.isEmpty()) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e9da6bc1f553d0d1fdebff9e58204c7a9563bc17..8c040cf1f4a5e063e796d0decf6bdeb5ddd272b4 100644 +index 66350e6d0b2deed7bd510d87d13b47a474ea8a52..f1ecb814970206df9ad26bdd5af81d2c96bf3d5c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1446,7 +1446,7 @@ public abstract class PlayerList { +@@ -1452,7 +1452,7 @@ public abstract class PlayerList { // Paper end - boolean flag = this.verifyChatTrusted(playerchatmessage, chatsender); + boolean flag = this.verifyChatTrusted(message, sourceProfile); -- this.server.logChatMessage((unsignedFunction == null ? playerchatmessage : playerchatmessage.withUnsignedContent(unsignedFunction.apply(this.server.console))).serverContent(), chatmessagetype_a, flag ? null : "Not Secure"); // Paper -+ this.server.logChatMessage((unsignedFunction == null ? playerchatmessage : playerchatmessage.withUnsignedContent(unsignedFunction.apply(this.server.console))).serverContent(), chatmessagetype_a, flag || top.leavesmc.leaves.LeavesConfig.noChatSign ? null : "Not Secure"); // Paper -> Leaves - No Not Secure - OutgoingPlayerChatMessage outgoingplayerchatmessage = OutgoingPlayerChatMessage.create(playerchatmessage); - boolean flag1 = playerchatmessage.isFullyFiltered(); +- this.server.logChatMessage((unsignedFunction == null ? message : message.withUnsignedContent(unsignedFunction.apply(this.server.console))).serverContent(), params, flag ? null : "Not Secure"); // Paper ++ this.server.logChatMessage((unsignedFunction == null ? message : message.withUnsignedContent(unsignedFunction.apply(this.server.console))).serverContent(), params, flag || top.leavesmc.leaves.LeavesConfig.noChatSign ? null : "Not Secure"); // Paper // Leaves - No Not Secure + OutgoingPlayerChatMessage outgoingplayerchatmessage = OutgoingPlayerChatMessage.create(message); + boolean flag1 = message.isFullyFiltered(); boolean flag2 = false; diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java index e2305caf0b3ce21810a31e05c943a6d859870bd5..ee8bc19a049a9f0235d959d41e4124865d5dabb1 100644 diff --git a/patches/server/0018-Optimize-mob-spawning.patch b/patches/server/0019-Optimize-mob-spawning.patch similarity index 95% rename from patches/server/0018-Optimize-mob-spawning.patch rename to patches/server/0019-Optimize-mob-spawning.patch index da936c17..f663cf31 100644 --- a/patches/server/0018-Optimize-mob-spawning.patch +++ b/patches/server/0019-Optimize-mob-spawning.patch @@ -6,7 +6,7 @@ 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 c0b82c838364b94e45138ff71b6e63bb0018287c..c754b8d88fa258e3fccd25e41a7501fc1d0b3e34 100644 +index 7afe46665bdd02bb65636a4f947999831a8d56d8..440ed7cce7ce8cc99e8d39ac36fed0c9f8f8948e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -301,6 +301,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop lastTrackerCandidates; @@ -97,7 +97,7 @@ index a273dfe889ad09b733a696649c675812fa7b2db0..6c95663869b9d7a545393df0416332a5 com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet oldTrackerCandidates = this.lastTrackerCandidates; this.lastTrackerCandidates = newTrackerCandidates; -@@ -2360,7 +2390,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -2437,7 +2467,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void removePlayer(ServerPlayer player) { @@ -106,7 +106,7 @@ index a273dfe889ad09b733a696649c675812fa7b2db0..6c95663869b9d7a545393df0416332a5 if (this.seenBy.remove(player.connection)) { this.serverEntity.removePairing(player); } -@@ -2368,7 +2398,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -2445,7 +2475,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public void updatePlayer(ServerPlayer player) { diff --git a/patches/server/0021-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch b/patches/server/0022-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0021-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch rename to patches/server/0022-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch diff --git a/patches/server/0022-Optimize-entity-coordinate-key.patch b/patches/server/0023-Optimize-entity-coordinate-key.patch similarity index 91% rename from patches/server/0022-Optimize-entity-coordinate-key.patch rename to patches/server/0023-Optimize-entity-coordinate-key.patch index 6aa23fdb..af4928bf 100644 --- a/patches/server/0022-Optimize-entity-coordinate-key.patch +++ b/patches/server/0023-Optimize-entity-coordinate-key.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Optimize entity coordinate key This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..6f28c6283f094cb72fec7f42b599b0c1f4963fbf 100644 +index 6939ef9b1fe782980e77c351d8a385a573d6a8e6..c15ab575d235fb46fab8ed509cb47fbad00e6762 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java -@@ -209,7 +209,13 @@ public final class MCUtil { +@@ -207,7 +207,13 @@ public final class MCUtil { } public static long getCoordinateKey(final Entity entity) { @@ -25,7 +25,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..6f28c6283f094cb72fec7f42b599b0c1 public static long getCoordinateKey(final ChunkPos pair) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index eda98b85fb00fe7787d2f7a643c3854aa4b02fbf..1f1bed78e8d003cfd85bc5cf38014c3ddb3078d1 100644 +index 8366668a5f3084e35b3030d3bb696f2922135385..acd7e50eb1195741d82ea732a264fd2d2f6e3aef 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0023-Optimize-suffocation.patch b/patches/server/0024-Optimize-suffocation.patch similarity index 96% rename from patches/server/0023-Optimize-suffocation.patch rename to patches/server/0024-Optimize-suffocation.patch index 0f244e1e..e001f40e 100644 --- a/patches/server/0023-Optimize-suffocation.patch +++ b/patches/server/0024-Optimize-suffocation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2dee51917888e20768f434b8232430094028b516..8f9bbe88827b6697762f4d43dce1da3986a72abb 100644 +index f0c4dafec12295080550e894c90dadeee389cc26..88dad6dd4663255ca143e71136202be483654155 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -399,7 +399,7 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 97% rename from patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch index 0098b593..9bfd628d 100644 --- a/patches/server/0024-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch +++ b/patches/server/0025-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8f9bbe88827b6697762f4d43dce1da3986a72abb..455d4f52dc4483c00a348e2833dfd99b1ece80f3 100644 +index 88dad6dd4663255ca143e71136202be483654155..83c8ba2fe3f149c704eb9b3232a11a4b9ee5cdde 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3592,7 +3592,13 @@ public abstract class LivingEntity extends Entity { +@@ -3614,7 +3614,13 @@ public abstract class LivingEntity extends Entity { Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists @@ -46,7 +46,7 @@ index d1eefa6ef3e9abfe7af4d8310aa64465fa2d5463..c91735828dc99af0b880a5a105025b42 default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) { // Paper start - Prevent raytrace from loading chunks diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index fd18fb454263893d404979a9c9af860ee2ba9a3a..1bd4a181ccf82c687f58b8033683f15afbc1f6cd 100644 +index 4bade8b095550c41f2d651372776fd4c0ca0cbd0..512bd7b5f01b00d82aa29e3659a5b5b64a1351e7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -411,6 +411,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0025-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0026-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0025-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0026-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0026-Move-ThreadUnsafeRandom-Initialization.patch b/patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch similarity index 92% rename from patches/server/0026-Move-ThreadUnsafeRandom-Initialization.patch rename to patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch index f6bea034..06c9af2a 100644 --- a/patches/server/0026-Move-ThreadUnsafeRandom-Initialization.patch +++ b/patches/server/0027-Move-ThreadUnsafeRandom-Initialization.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Move ThreadUnsafeRandom Initialization This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 82e3070ad9478a629bee45c8089d68d467ed9749..bc185f733d7543bb12c8f1f277197810154f739a 100644 +index 8efd9b1edb12e415434d71f6b644273876d6ac3d..69bd4ca57102ef757cfb5ea8442c26eac7cbc1f7 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -757,7 +757,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -762,7 +762,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } // Paper start - optimise random block ticking private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos(); @@ -19,7 +19,7 @@ index 82e3070ad9478a629bee45c8089d68d467ed9749..bc185f733d7543bb12c8f1f277197810 public void tickChunk(LevelChunk chunk, int randomTickSpeed) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 1bd4a181ccf82c687f58b8033683f15afbc1f6cd..6832efb59d9efdfbc3ec38a219193b503f57cabe 100644 +index 512bd7b5f01b00d82aa29e3659a5b5b64a1351e7..32ad2282a78f913c16a94ed06a81b3bdf6de0760 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -272,6 +272,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch similarity index 94% rename from patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch rename to patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch index 45f6c4d8..e6f2a5a1 100644 --- a/patches/server/0027-Optimize-random-calls-in-chunk-ticking.patch +++ b/patches/server/0028-Optimize-random-calls-in-chunk-ticking.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Optimize random calls in chunk ticking This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index bcc24c563cc8d35bffb594b11954e916711ce971..b653393ff465f5b0448f62e57697ae8c5d920425 100644 +index bc174f4c1d015bef37efc3de1ccbf98ae825639e..7c9fd7293e05d1b689e679b1c7f2e0db19cfa280 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -967,6 +967,11 @@ public class ServerChunkCache extends ChunkSource { +@@ -790,6 +790,11 @@ public class ServerChunkCache extends ChunkSource { ProfilerFiller gameprofilerfiller = this.level.getProfiler(); gameprofilerfiller.push("pollingChunks"); @@ -22,10 +22,10 @@ index bcc24c563cc8d35bffb594b11954e916711ce971..b653393ff465f5b0448f62e57697ae8c boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index bc185f733d7543bb12c8f1f277197810154f739a..ba86d0cf5de70b13ed9fd669db6938686a07bf16 100644 +index 69bd4ca57102ef757cfb5ea8442c26eac7cbc1f7..775f44af9289cfc84c149c755efc760f75d8c25b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -760,6 +760,13 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -765,6 +765,13 @@ public class ServerLevel extends Level implements WorldGenLevel { // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong()); // Leaves - moved to super // Paper end @@ -39,7 +39,7 @@ index bc185f733d7543bb12c8f1f277197810154f739a..ba86d0cf5de70b13ed9fd669db693868 public void tickChunk(LevelChunk chunk, int randomTickSpeed) { ChunkPos chunkcoordintpair = chunk.getPos(); boolean flag = this.isRaining(); -@@ -770,7 +777,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -775,7 +782,7 @@ public class ServerLevel extends Level implements WorldGenLevel { gameprofilerfiller.push("thunder"); final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change @@ -48,7 +48,7 @@ index bc185f733d7543bb12c8f1f277197810154f739a..ba86d0cf5de70b13ed9fd669db693868 blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper if (this.isRainingAt(blockposition)) { DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition); -@@ -794,7 +801,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -799,7 +806,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } gameprofilerfiller.popPush("iceandsnow"); diff --git a/patches/server/0028-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0029-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0028-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/server/0029-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0029-Early-return-optimization-for-target-finding.patch b/patches/server/0030-Early-return-optimization-for-target-finding.patch similarity index 100% rename from patches/server/0029-Early-return-optimization-for-target-finding.patch rename to patches/server/0030-Early-return-optimization-for-target-finding.patch diff --git a/patches/server/0030-Use-thread-unsafe-random-for-mob-spawning.patch b/patches/server/0031-Use-thread-unsafe-random-for-mob-spawning.patch similarity index 100% rename from patches/server/0030-Use-thread-unsafe-random-for-mob-spawning.patch rename to patches/server/0031-Use-thread-unsafe-random-for-mob-spawning.patch diff --git a/patches/server/0031-Config-to-disable-method-profiler.patch b/patches/server/0032-Config-to-disable-method-profiler.patch similarity index 88% rename from patches/server/0031-Config-to-disable-method-profiler.patch rename to patches/server/0032-Config-to-disable-method-profiler.patch index 8a66df9e..90793d3b 100644 --- a/patches/server/0031-Config-to-disable-method-profiler.patch +++ b/patches/server/0032-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 c754b8d88fa258e3fccd25e41a7501fc1d0b3e34..c190fef5914fdae2ed7d6d2cd65d0b6fedb2363c 100644 +index 440ed7cce7ce8cc99e8d39ac36fed0c9f8f8948e..249bd5e4d74e384a43b8278b737c7326377b0205 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2240,6 +2240,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop tag, double speed) { @@ -35,7 +35,7 @@ index 2a55e56b80e2835ca8b3975f3b34e0087d385717..b52eed1005bc118d3dc7f74daabceec5 double d1 = 0.0D; boolean flag = this.isPushedByFluid(); boolean flag1 = false; -@@ -4007,38 +4009,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4021,38 +4023,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { int k1 = 0; BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(); diff --git a/patches/server/0043-Reduce-chunk-loading-lookups.patch b/patches/server/0044-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0043-Reduce-chunk-loading-lookups.patch rename to patches/server/0044-Reduce-chunk-loading-lookups.patch