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
2024-06-13 23:13:38 +08:00
parent 2a7fc43064
commit e234432bd9
28 changed files with 98 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -3,6 +3,6 @@ version=1.20.6-R0.1-SNAPSHOT
mcVersion=1.20.6
org.gradle.jvmargs=-Xmx2G
paperRef=bd5867a96f792f0eb32c1d249bb4bbc1d8338d14
paperRef=79e2cb620ef03539390d97940824b38b707918f5
preVersion=false
updatingMinecraft=true

46
patches/api/0007-Delete-Timings.patch
View File

@@ -720,11 +720,10 @@ index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
deleted file mode 100644
index 02e88db63be2d5e31da6b65157ba7b971b1f10f3..0000000000000000000000000000000000000000
index 2d87237ea99d42c6ce896d52a1b2e5c3ec4d4568..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/main/java/co/aikar/timings/TimingHistory.java
+++ /dev/null
@@ -1,355 +0,0 @@
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -1,352 +0,0 @@
-/*
- * This file is licensed under the MIT License (MIT).
- *
@@ -878,17 +877,14 @@ index 02e88db63be2d5e31da6b65157ba7b971b1f10f3..00000000000000000000000000000000
- }
- }
- ),
- toObjectMapper(input.tileEntityCounts.entrySet(),
- new Function<Map.Entry<Material, Counter>, JSONPair>() {
- @NotNull
- @Override
- public JSONPair apply(Map.Entry<Material, Counter> entry) {
- tileEntityTypeSet.add(entry.getKey());
- return pair(
- String.valueOf(entry.getKey().ordinal()),
- entry.getValue().count()
- );
- }
- toObjectMapper(
- input.tileEntityCounts.entrySet(),
- entry -> {
- tileEntityTypeSet.add(entry.getKey());
- return pair(
- String.valueOf(entry.getKey().ordinal()),
- entry.getValue().count()
- );
- }
- )
- );
@@ -2114,10 +2110,10 @@ index abe256e1e45ce28036da4aa1586715bc8a1a3414..b359306500e640f4b0761ae9aa996cf6
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..014f9c30440981d251e54b289682015baae1fe90 100644
index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..940565704d0e8914a76cf25daf7d1f5ecd99bad4 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -38,7 +38,6 @@ public class SimpleCommandMap implements CommandMap {
@@ -39,7 +39,6 @@ public class SimpleCommandMap implements CommandMap {
register("bukkit", new VersionCommand("version"));
register("bukkit", new ReloadCommand("reload"));
//register("bukkit", new PluginsCommand("plugins")); // Paper
@@ -2125,15 +2121,15 @@ index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..014f9c30440981d251e54b289682015b
}
public void setFallbackCommands() {
@@ -70,7 +69,6 @@ public class SimpleCommandMap implements CommandMap {
@@ -71,7 +70,6 @@ public class SimpleCommandMap implements CommandMap {
*/
@Override
public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) {
- command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
label = label.toLowerCase(Locale.ROOT).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(Locale.ROOT).trim();
boolean registered = register(label, command, false, fallbackPrefix);
@@ -152,17 +150,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -153,17 +151,9 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
@@ -2152,10 +2148,10 @@ index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..014f9c30440981d251e54b289682015b
server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
//target.timings.stopTiming(); // Spigot // Paper
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 07a9c9e254188c251165ca84c8e961fccda01175..9eb02f8fb4d581349c4752ccb396dc4fdbd940c3 100644
index 003bece642b682985625db93cad93026352bfc66..308245714a0a830d92568f7bb1f4bb9c45828345 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -719,12 +719,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -720,12 +720,7 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@@ -2169,7 +2165,7 @@ index 07a9c9e254188c251165ca84c8e961fccda01175..9eb02f8fb4d581349c4752ccb396dc4f
}
@NotNull
@@ -954,8 +949,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -955,8 +950,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
@@ -2179,7 +2175,7 @@ index 07a9c9e254188c251165ca84c8e961fccda01175..9eb02f8fb4d581349c4752ccb396dc4f
}
/**
@@ -964,7 +958,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -965,7 +959,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {

4
patches/api/0008-Force-peaceful-mode-switch.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 26622cafbb9811fafe18d5dd9b25f56960154772..260704ce884e7549279d8744524b18993661b6fa 100644
index fdb87adfb8d6eff2bfabe7a41398c53d15d4cd98..531a6cae97fe2a415cf906108a0899bf04e613d8 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4317,6 +4317,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4344,6 +4344,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
void setSendViewDistance(int viewDistance);
// Paper end - view distance api

4
patches/api/0010-Bytebuf-API.patch
View File

@@ -35,10 +35,10 @@ index 98ca0f656ea3a5be30ad49bc7fb22c886adbef03..79ad3c362e5437b28e44270a9c7b8947
+ // Leaves end - Bytebuf API
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f2e1b98880503a9933a20ebcf0ba91413c859a08..ee8bcc5b50bff84b18abed6f5e82c55899367827 100644
index eb34f22e973fe46529eb93f435f5bf7f85091404..ba79992f0c170ab1c0db402698feb5071fe8cf62 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3802,6 +3802,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3850,6 +3850,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean isChunkSent(long chunkKey);
// Paper end

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

@@ -164,7 +164,7 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..c060857cb0551fff8f5033553b887f3a
private static final String BUILD_DEV = "DEV";
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0ed42fa899721f83b598db05be1b5f321af3614a..9cd75d163e81f812e8dcd3c010b4a715d2bcf804 100644
index 3751c2a077bd13bac330b93c6efc2a640a17f4f2..2235e5cfd853216fd79cf26244f9f029af1fc3b4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1165,7 +1165,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -186,7 +186,7 @@ index 0ed42fa899721f83b598db05be1b5f321af3614a..9cd75d163e81f812e8dcd3c010b4a715
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 2eb9c584cc77237f1c82d880a51a3f8b51008d73..559649d0a134c29215f3783996fd80d81c149bec 100644
index ad967cc2283f902c76e48a59d59cf0dbdacbb5e3..422d87c1503340f3efe50785c4ad0cef6cf67702 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -231,9 +231,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -215,7 +215,7 @@ index 759062d219ff490a3cb19e710c4d18e3e08288e0..3952428c02fe87477f4139f4fa983815
javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e02102280ed1dc300191d19bbca8f00e17701753..9164d33b564970d83d11c6544db5697ff9eff32f 100644
index b86ba59158964f73abd6622341a9acb98a33fa44..1155fc80c0292c8d7efb21dbac3d984176fcaa2d 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -303,7 +303,7 @@ public class Main {

29
patches/server/0003-Delete-Timings.patch
View File

@@ -887,7 +887,7 @@ index 57e76b53e5e314c3e6b8856010f7a84188121582..d6daa27a8d7aca00b181e90d789f4249
} catch (Exception exception) {
if (exception instanceof ReportedException) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9cd75d163e81f812e8dcd3c010b4a715d2bcf804..026dc226ace6b067df8987f10039d4c037c47124 100644
index 2235e5cfd853216fd79cf26244f9f029af1fc3b4..1f973ed9bb9c753b81979085a6fea45b65165fa3 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;
@@ -1089,7 +1089,7 @@ index 9cd75d163e81f812e8dcd3c010b4a715d2bcf804..026dc226ace6b067df8987f10039d4c0
this.profiler.popPush("send chunks");
iterator = this.playerList.getPlayers().iterator();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 559649d0a134c29215f3783996fd80d81c149bec..340d1b6797d56e2ebdce2d8d7cae62780470e1b7 100644
index 422d87c1503340f3efe50785c4ad0cef6cf67702..340d1b6797d56e2ebdce2d8d7cae62780470e1b7 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -63,7 +63,6 @@ import org.apache.logging.log4j.Level;
@@ -1120,7 +1120,7 @@ index 559649d0a134c29215f3783996fd80d81c149bec..340d1b6797d56e2ebdce2d8d7cae6278
}
// Paper start
command.set(event.getCommand());
- if (event.getCommand().toLowerCase().startsWith("timings") && event.getCommand().toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
- if (event.getCommand().toLowerCase(java.util.Locale.ROOT).startsWith("timings") && event.getCommand().toLowerCase(java.util.Locale.ROOT).matches("timings (report|paste|get|merged|seperate)")) {
- org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
- Waitable<String> waitable = new Waitable<>() {
- @Override
@@ -1222,7 +1222,7 @@ index 7fb9ba3dadb1eca4a1000ea8cf4d13fed2b7db1e..dc20b051d4f14ce4e0b5a0114e02d157
}
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index b99f50604bafecbc68835974c9ed0caa91911a40..256ad83f10e6df5d32959d38eeabc126b9b7b190 100644
index fcecfda569d2a8d6b8a7e228831f822fb7327748..ffab3e27c0d9da2a380a14b6f6ebb243a6fb5e8d 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -274,10 +274,8 @@ public class ServerChunkCache extends ChunkSource {
@@ -1255,13 +1255,12 @@ index b99f50604bafecbc68835974c9ed0caa91911a40..256ad83f10e6df5d32959d38eeabc126
}
// Paper end - Incremental chunk and player saving
@@ -472,26 +466,21 @@ public class ServerChunkCache extends ChunkSource {
@@ -472,26 +466,20 @@ public class ServerChunkCache extends ChunkSource {
@Override
public void tick(BooleanSupplier shouldKeepTicking, boolean tickChunks) {
this.level.getProfiler().push("purge");
- this.level.timings.doChunkMap.startTiming(); // Spigot
+ // this.level.timings.doChunkMap.startTiming(); // Spigot // Leaves - delete Timings
if (this.level.tickRateManager().runsNormally() || !tickChunks) {
if (this.level.tickRateManager().runsNormally() || !tickChunks || this.level.spigotConfig.unloadFrozenChunks) { // Spigot
this.distanceManager.purgeStaleTickets();
}
@@ -1283,7 +1282,7 @@ index b99f50604bafecbc68835974c9ed0caa91911a40..256ad83f10e6df5d32959d38eeabc126
this.level.getProfiler().pop();
this.clearCache();
}
@@ -507,13 +496,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -507,13 +495,11 @@ public class ServerChunkCache extends ChunkSource {
gameprofilerfiller.push("pollingChunks");
gameprofilerfiller.push("filteringLoadedChunks");
// Paper - optimise chunk tick iteration
@@ -1297,7 +1296,7 @@ index b99f50604bafecbc68835974c9ed0caa91911a40..256ad83f10e6df5d32959d38eeabc126
int k = this.distanceManager.getNaturalSpawnChunkCount();
// Paper start - Optional per player mob spawns
int naturalSpawnChunkCount = k;
@@ -538,7 +525,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -538,7 +524,6 @@ public class ServerChunkCache extends ChunkSource {
spawnercreature_d = NaturalSpawner.createState(naturalSpawnChunkCount, this.level.getAllEntities(), this::getFullChunk, !this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new LocalMobCapCalculator(this.chunkMap) : null, false);
}
// Paper end - Optional per player mob spawns
@@ -1305,7 +1304,7 @@ index b99f50604bafecbc68835974c9ed0caa91911a40..256ad83f10e6df5d32959d38eeabc126
this.lastSpawnState = spawnercreature_d;
gameprofilerfiller.popPush("spawnAndTick");
@@ -647,19 +633,14 @@ public class ServerChunkCache extends ChunkSource {
@@ -647,19 +632,14 @@ public class ServerChunkCache extends ChunkSource {
}
}
// Paper end - optimise chunk tick iteration
@@ -1325,7 +1324,7 @@ index b99f50604bafecbc68835974c9ed0caa91911a40..256ad83f10e6df5d32959d38eeabc126
// Paper start - optimise chunk tick iteration
if (!this.chunkMap.needsChangeBroadcasting.isEmpty()) {
it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<ChunkHolder> copy = this.chunkMap.needsChangeBroadcasting.clone();
@@ -673,8 +654,6 @@ public class ServerChunkCache extends ChunkSource {
@@ -673,8 +653,6 @@ public class ServerChunkCache extends ChunkSource {
}
}
// Paper end - optimise chunk tick iteration
@@ -1588,7 +1587,7 @@ index a46bf73c608641bf1f00fd55242de71a0f2ee06e..9b15a2a966de203ada8894a9354ff8e0
return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index ce01fe82dc1eaaf06ca317ddbc62b7d1b87a48b2..4506a2fe4e55e8372b71650f019c810998a69a33 100644
index 21e61bb75ac7ce468bc757633ce678b21bcb9deb..5b5d8d2430f2b92f56ea3fb0e9a35aa4b9aea48f 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -150,7 +150,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1816,7 +1815,7 @@ index 14ee7b5b9b804bebd4e2a846b238547a28a36035..33673bde99023af6a136270091959cca
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 9164d33b564970d83d11c6544db5697ff9eff32f..361763f59b33fdacbfe2523eb7a0fa0840fa7439 100644
index 1155fc80c0292c8d7efb21dbac3d984176fcaa2d..77dc69ecec095b4d4129913846a12e5c86f21df5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -346,8 +346,8 @@ public class Main {
@@ -1974,10 +1973,10 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 4788a591f40f506d81b10fd9f6ab68f308a68e23..b39f7aa828b08d8403278700bf44a086af53fa78 100644
index f99353a60e3f236735ef6e2e6f13381b50ae9b7b..5e42a3392fa03813e3e58e80299625993c560396 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -219,7 +219,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -220,7 +220,6 @@ public final class CraftMagicNumbers implements UnsafeValues {
// Paper start
@Override
public void reportTimings() {

4
patches/server/0005-Update-version-fetcher-repo.patch
View File

@@ -27,10 +27,10 @@ index 532306cacd52579cdf37e4aca25887b1ed3ba6a1..917ffaae401f3374d07d7fb7c024234a
if (data == null) {
return null;
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index b39f7aa828b08d8403278700bf44a086af53fa78..db0e4b9bb8509727f924e0eb3ad007ebca423315 100644
index 5e42a3392fa03813e3e58e80299625993c560396..1fed83a95ae6f3fc805fe5c2e303f4089de194e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -502,7 +502,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -503,7 +503,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

10
patches/server/0006-Leaves-Server-Config-And-Command.patch
View File

@@ -24,7 +24,7 @@ index 16b742b5131376ceca04570dd4c088caff62e677..fe1f6f1a97ab35c44f596596d16765b8
description = "Spin up a test server from the Mojang mapped bundler jar"
classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createMojmapBundlerJar").flatMap { it.outputZip })
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 026dc226ace6b067df8987f10039d4c037c47124..421b67ab81330975f6404578ffcc57feb0c9c0be 100644
index 1f973ed9bb9c753b81979085a6fea45b65165fa3..59cc1855d5bebbcaa8f6afc39e91ae0698adcf73 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1147,6 +1147,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -50,10 +50,10 @@ index 340d1b6797d56e2ebdce2d8d7cae62780470e1b7..437f714fc1b38f0040b57cef94a76faa
this.setPvpAllowed(dedicatedserverproperties.pvp);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..9ffd97be26f52f5ca69ec14a3f013c59b33d3704 100644
index 5db08432b6afd3639688830e717f40ceaf599248..0c8c163d21e6f729c309aa91e69b00b2a41024f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1061,6 +1061,7 @@ public final class CraftServer implements Server {
@@ -1084,6 +1084,7 @@ public final class CraftServer implements Server {
playerMetadata.removeAll(plugin);
}
// Paper end
@@ -61,7 +61,7 @@ index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..9ffd97be26f52f5ca69ec14a3f013c59
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -3029,6 +3030,14 @@ public final class CraftServer implements Server {
@@ -3052,6 +3053,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -77,7 +77,7 @@ index 94a31c8f903eb61eb6d203e8e6fe8fb0beca28b1..9ffd97be26f52f5ca69ec14a3f013c59
@Override
public void restart() {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 361763f59b33fdacbfe2523eb7a0fa0840fa7439..c141a8fee41b3f5db190ee5dbe0d748656ef2a74 100644
index 77dc69ecec095b4d4129913846a12e5c86f21df5..aee7266a002a709e5d9f9215579a7e880b59652a 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -168,6 +168,14 @@ public class Main {

8
patches/server/0007-Leaves-Protocol-Core.patch
View File

@@ -34,7 +34,7 @@ index 0211311b3b63bcdea7ebf7bcb24629674c771402..c05a72f4928ee2cec28a61ed06a9079d
};
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 421b67ab81330975f6404578ffcc57feb0c9c0be..f1f0e7adada3527ac666623d63376e6cbd590630 100644
index 59cc1855d5bebbcaa8f6afc39e91ae0698adcf73..f8ddccd4d9b79c9fb26bca580bf023194bc0eae8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1782,6 +1782,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -92,10 +92,10 @@ index 6957cbfbea51d6a3b57e1c5bfcebd52a25cde8d5..11d73647d2d94c8131c5e3eeef490fb3
ServerLevel worldserver = entityplayer.serverLevel();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9ffd97be26f52f5ca69ec14a3f013c59b33d3704..196ab702e5413612632afe945253ed8d00817893 100644
index 0c8c163d21e6f729c309aa91e69b00b2a41024f2..d58f59b7079cb2cfe3e58391ea3a3576aa030542 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -468,6 +468,7 @@ public final class CraftServer implements Server {
@@ -471,6 +471,7 @@ public final class CraftServer implements Server {
}
this.potionBrewer = new io.papermc.paper.potion.PaperPotionBrewer(console); // Paper - custom potion mixes
datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -103,7 +103,7 @@ index 9ffd97be26f52f5ca69ec14a3f013c59b33d3704..196ab702e5413612632afe945253ed8d
}
public boolean getCommandBlockOverride(String command) {
@@ -1067,6 +1068,7 @@ public final class CraftServer implements Server {
@@ -1090,6 +1091,7 @@ public final class CraftServer implements Server {
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");

8
patches/server/0011-Fakeplayer-support.patch
View File

@@ -53,7 +53,7 @@ index f40420a6841f03983b0837e177ea2ae7c3a37ca1..27dbea917d1a03aaa0d8de3db49d3cd2
if (this.packetListener != null) {
throw new IllegalStateException("Listener already set");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f1f0e7adada3527ac666623d63376e6cbd590630..24362501292e61c5d1f17917f27095b6a56b661c 100644
index f8ddccd4d9b79c9fb26bca580bf023194bc0eae8..c671f0ffae3c54290f8cff233306a1cd91aa9ffe 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -667,6 +667,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -353,10 +353,10 @@ index 1b1b475ca27e799e251d6f8a8c9fe1a4fd8bae83..bb9d8cb957f5be517d3ae2959e0406af
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 196ab702e5413612632afe945253ed8d00817893..6d85a6444332598bd7efc5832f4c3530e0a19e7d 100644
index d58f59b7079cb2cfe3e58391ea3a3576aa030542..a75f5cf9dc6044a3778106adf0c325c1a563e302 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -305,6 +305,7 @@ public final class CraftServer implements Server {
@@ -307,6 +307,7 @@ public final class CraftServer implements Server {
public static Exception excessiveVelEx; // Paper - Velocity warnings
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
@@ -364,7 +364,7 @@ index 196ab702e5413612632afe945253ed8d00817893..6d85a6444332598bd7efc5832f4c3530
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3268,4 +3269,11 @@ public final class CraftServer implements Server {
@@ -3291,4 +3292,11 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end

6
patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 4506a2fe4e55e8372b71650f019c810998a69a33..f0834ff3de84f91ae32efcc548f993ee92aefe83 100644
index 5b5d8d2430f2b92f56ea3fb0e9a35aa4b9aea48f..f6bff4eb349f51a20516aecb010d19d5f625575e 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1648,12 +1648,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1642,12 +1642,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
@@ -23,7 +23,7 @@ index 4506a2fe4e55e8372b71650f019c810998a69a33..f0834ff3de84f91ae32efcc548f993ee
itemstack1.shrink(1);
}
if (itemstack != null && this instanceof ServerPlayer) {
@@ -4552,3 +4552,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -4546,3 +4546,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}

2
patches/server/0022-Optimize-suffocation.patch
View File

@@ -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 f0834ff3de84f91ae32efcc548f993ee92aefe83..84356052f4a5b821e54f8e7b60e904ef68947968 100644
index f6bff4eb349f51a20516aecb010d19d5f625575e..8d3ed01ba207900aeaa38f3b4f7a51a277b5686b 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -426,7 +426,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

4
patches/server/0025-Optimize-random-calls-in-chunk-ticking.patch
View File

@@ -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 256ad83f10e6df5d32959d38eeabc126b9b7b190..db41ee04b5dd3e162830342e4b1f2b457ffb7fed 100644
index ffab3e27c0d9da2a380a14b6f6ebb243a6fb5e8d..6636bdc58be30f89cc52086f6741490fc9cb1653 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -494,6 +494,11 @@ public class ServerChunkCache extends ChunkSource {
@@ -493,6 +493,11 @@ public class ServerChunkCache extends ChunkSource {
ProfilerFiller gameprofilerfiller = this.level.getProfiler();
gameprofilerfiller.push("pollingChunks");

2
patches/server/0028-Config-to-disable-method-profiler.patch
View File

@@ -6,7 +6,7 @@ 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 24362501292e61c5d1f17917f27095b6a56b661c..ee22bcbe2f64cac2d22328d9abb3c91c2263fb2e 100644
index c671f0ffae3c54290f8cff233306a1cd91aa9ffe..b22d0b0a2cb7e877875739abd87a3beac977c82a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2530,6 +2530,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

4
patches/server/0034-Cache-climbing-check-for-activation.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Cache climbing check for activation
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 84356052f4a5b821e54f8e7b60e904ef68947968..fb3ff5ad4d29a46ffbfc5af710cc1467ea29cda1 100644
index 8d3ed01ba207900aeaa38f3b4f7a51a277b5686b..ef3e4667d0d38e19a595f83bf93af7a9f1ab4c13 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2048,6 +2048,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2042,6 +2042,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.lastClimbablePos;
}

2
patches/server/0046-Stackable-ShulkerBoxes.patch
View File

@@ -207,7 +207,7 @@ index c39c773112fb8b534b926f2f2b47fe6fbb69fcb2..ae9338b8a5598e7a257b469adae72858
@Nullable
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 58c38bc4361ddf24716f326b0c6fc626d434756e..600f9d29e5b81a69a0f3a97ec93b37ad4f72b51c 100644
index f8589837070039b4911a9532b92fa959c7af6352..35e0aac4dc32227c48dc3a0f3a15c02a700fc402 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -228,7 +228,7 @@ public final class ItemStack implements DataComponentHolder {

2
patches/server/0049-Return-nether-portal-fix.patch
View File

@@ -111,7 +111,7 @@ index 00809b615f65b2f4985856673430d8ba68525765..a65aede101004f23f76ce08781ab0a94
// Save player file again if they were disconnected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fb3ff5ad4d29a46ffbfc5af710cc1467ea29cda1..de32eafa4374be8518571950762abc760299adb4 100644
index ef3e4667d0d38e19a595f83bf93af7a9f1ab4c13..9c7fdcd820fa40aa3f0b8fcebc103cbfe7e27450 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -251,7 +251,7 @@ public abstract class LivingEntity extends Entity implements Attackable {

2
patches/server/0052-Leaves-Extra-Yggdrasil-Service.patch
View File

@@ -44,7 +44,7 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..7a1f7714616913cbb9d2dfc017567895
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 ee22bcbe2f64cac2d22328d9abb3c91c2263fb2e..1b4be84963683481a375a44c14b275100cf43886 100644
index b22d0b0a2cb7e877875739abd87a3beac977c82a..b55cde303e18898ec791eb6d529ed4434ae70675 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -259,7 +259,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

2
patches/server/0054-Fix-update-suppression-crash.patch
View File

@@ -20,7 +20,7 @@ index d6daa27a8d7aca00b181e90d789f4249e8437d29..61b0e26a34bf94b10ce0ac78a662d5e9
if (exception instanceof ReportedException) {
ReportedException reportedexception = (ReportedException) exception;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1b4be84963683481a375a44c14b275100cf43886..0923285d7a03de762cba8929682f94a5be156ae9 100644
index b55cde303e18898ec791eb6d529ed4434ae70675..aa7f001a3f75f7981e8aa27d24041d9a2e0493db 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1756,7 +1756,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

2
patches/server/0055-Bedrock-break-list.patch
View File

@@ -5,7 +5,7 @@ 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 0923285d7a03de762cba8929682f94a5be156ae9..b82b45f57cdd7a98f3c29cc6c80b4d8aedece681 100644
index aa7f001a3f75f7981e8aa27d24041d9a2e0493db..658ac73c319683cf8d74d4af8e2a3fca418bd71c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1793,6 +1793,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

2
patches/server/0073-No-block-update-command.patch
View File

@@ -17,7 +17,7 @@ index 0f3a92155fa0b4ed9d7fbc87202fd04dc01a0890..3bb53128f6919712f0a88ec11c1bce25
// CraftBukkit start
if (this.populating) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 600f9d29e5b81a69a0f3a97ec93b37ad4f72b51c..f33088fa895e36dcaf6e96c52aacd5545b657a5a 100644
index 35e0aac4dc32227c48dc3a0f3a15c02a700fc402..0522368deaa13f13fad4e2f00346f3910a064618 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -506,7 +506,7 @@ public final class ItemStack implements DataComponentHolder {

8
patches/server/0089-Reduce-array-allocations.patch
View File

@@ -375,10 +375,10 @@ index eb3c12e03c0d5c9cec84d97e2c51c50ce59c23a4..0593d76c67f4475d624c5289b65c5d4a
private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int armorStandId, final String name) {
this.type = type;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index de32eafa4374be8518571950762abc760299adb4..38e05e3ea71300eaeaf4a2a5d5a13121b3f85aee 100644
index 9c7fdcd820fa40aa3f0b8fcebc103cbfe7e27450..8bfbe0b23a1bba49b4c96425dd10eee1153a5697 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3228,7 +3228,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3222,7 +3222,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Nullable
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
Map<EquipmentSlot, ItemStack> map = null;
@@ -441,10 +441,10 @@ index f38acc96f71298e40ce9433e7759fd223ca55e48..03652ec451109d2026fc313f143d78d4
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index f33088fa895e36dcaf6e96c52aacd5545b657a5a..6e717e2fd606514c8e114babcb083393e00e5fb6 100644
index 0522368deaa13f13fad4e2f00346f3910a064618..99acee6f58ac532694859cf0a71c56f3ef8b402b 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1104,7 +1104,7 @@ public final class ItemStack implements DataComponentHolder {
@@ -1111,7 +1111,7 @@ public final class ItemStack implements DataComponentHolder {
ItemAttributeModifiers itemattributemodifiers = (ItemAttributeModifiers) this.getOrDefault(DataComponents.ATTRIBUTE_MODIFIERS, ItemAttributeModifiers.EMPTY);
if (itemattributemodifiers.showInTooltip()) {

2
patches/server/0094-Check-frozen-ticks-before-landing-block.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 38e05e3ea71300eaeaf4a2a5d5a13121b3f85aee..23e7fea1e52fe9a3d0dae4735d1bf66effad50b5 100644
index 8bfbe0b23a1bba49b4c96425dd10eee1153a5697..a92dacce023b4f4c88e70a1f70812e5a4458a0e3 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -593,11 +593,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

12
patches/server/0103-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 db41ee04b5dd3e162830342e4b1f2b457ffb7fed..c402a51a0951ad775cd7829f442edb8cf779d5ee 100644
index 6636bdc58be30f89cc52086f6741490fc9cb1653..f4d599bf00a6eaebf2f5edf503c4917df8a6a9cd 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -75,6 +75,12 @@ public class ServerChunkCache extends ChunkSource {
@@ -21,7 +21,7 @@ index db41ee04b5dd3e162830342e4b1f2b457ffb7fed..c402a51a0951ad775cd7829f442edb8c
public ServerChunkCache(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor workerExecutor, ChunkGenerator chunkGenerator, int viewDistance, int simulationDistance, boolean dsync, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory) {
this.level = world;
this.mainThreadProcessor = new ServerChunkCache.MainThreadExecutor(world);
@@ -500,7 +506,21 @@ public class ServerChunkCache extends ChunkSource {
@@ -499,7 +505,21 @@ public class ServerChunkCache extends ChunkSource {
}
// Leaves end - reset ice & snow tick random
gameprofilerfiller.push("filteringLoadedChunks");
@@ -44,7 +44,7 @@ index db41ee04b5dd3e162830342e4b1f2b457ffb7fed..c402a51a0951ad775cd7829f442edb8c
// Paper - optimise chunk tick iteration
@@ -588,10 +608,20 @@ public class ServerChunkCache extends ChunkSource {
@@ -587,10 +607,20 @@ public class ServerChunkCache extends ChunkSource {
}
Util.shuffle(shuffled, this.level.random);
chunkIterator = shuffled.iterator();
@@ -68,7 +68,7 @@ index db41ee04b5dd3e162830342e4b1f2b457ffb7fed..c402a51a0951ad775cd7829f442edb8c
LevelChunk chunk1 = chunkIterator.next();
// Paper end - optimise chunk tick iteration
ChunkPos chunkcoordintpair = chunk1.getPos();
@@ -622,7 +652,7 @@ public class ServerChunkCache extends ChunkSource {
@@ -621,7 +651,7 @@ public class ServerChunkCache extends ChunkSource {
// Paper end - optimise chunk tick iteration
chunk1.incrementInhabitedTime(j);
if (spawn && flag && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair)) { // Spigot // Paper - optimise chunk tick iteration
@@ -107,10 +107,10 @@ index 083a8a7dd99e447904dbac161dd3a1de663d6011..27f064812fd7b8f3feedc9966c9dfc78
boolean spawnThisTick = true;
int limit = enumcreaturetype.getMaxInstancesPerChunk();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f2b20ed5063a293f0b464548f590d652170cd1d8..ab4510eb9e5eaca46e3278c73e208757292a9f90 100644
index 6303760f10af17f1da1d92d6c4dc7dd6f5778f94..105a1fb70a7b869b65617a760b8de1ea86f3571f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2458,6 +2458,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2483,6 +2483,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
return CraftFeatureFlag.getFromNMS(this.getHandle().enabledFeatures()).stream().map(FeatureFlag.class::cast).collect(Collectors.toUnmodifiableSet());
}

12
patches/server/0105-Replay-Mod-API.patch
View File

@@ -94,7 +94,7 @@ index d78ad5eccd18d89050a486a0c40090a09683bd16..fc7b20df83cd8cb8cdd7d3c2da2bc48a
if (((List) object).size() >= i) {
return (List) object;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b82b45f57cdd7a98f3c29cc6c80b4d8aedece681..5d290f9335a510f4ddab7a78a96c0d8eedd4682e 100644
index 658ac73c319683cf8d74d4af8e2a3fca418bd71c..8bb6f9d26c8a24638ed64e8726b3b11dcccde9c8 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1659,7 +1659,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -356,10 +356,10 @@ index c4aac957906ff3bf28b29e58e30decc608562e6a..975062e67278614220eab0c301019a23
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6d85a6444332598bd7efc5832f4c3530e0a19e7d..4ecfa62b8146403b05041418a37d74378bea4b05 100644
index a75f5cf9dc6044a3778106adf0c325c1a563e302..98f10278b14d540e81703ee1330ddd7c6ed5f194 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -306,6 +306,7 @@ public final class CraftServer implements Server {
@@ -308,6 +308,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
private final org.leavesmc.leaves.entity.CraftBotManager botManager = new org.leavesmc.leaves.entity.CraftBotManager(); // Leaves
@@ -367,7 +367,7 @@ index 6d85a6444332598bd7efc5832f4c3530e0a19e7d..4ecfa62b8146403b05041418a37d7437
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -388,7 +389,7 @@ public final class CraftServer implements Server {
@@ -390,7 +391,7 @@ public final class CraftServer implements Server {
public CraftServer(DedicatedServer console, PlayerList playerList) {
this.console = console;
this.playerList = (DedicatedPlayerList) playerList;
@@ -376,7 +376,7 @@ index 6d85a6444332598bd7efc5832f4c3530e0a19e7d..4ecfa62b8146403b05041418a37d7437
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3276,4 +3277,11 @@ public final class CraftServer implements Server {
@@ -3299,4 +3300,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API
@@ -410,7 +410,7 @@ index ff4563be301d237bb2f431e424687891e95b2b4f..22f29b760bc569f4ca38617e147c6996
// Special case complex part, since there is no extra entity type for them
if (entity instanceof EnderDragonPart complexPart) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 7e6116963d835d4606ef3d93b69d3e44b61288e1..264d431ea5d6cbed560fe0f025b1d402877d7d66 100644
index 40155cc70ba959eea8011626a30e26f44298c99d..a265dd6af9a58d1f71ea464a88c787749c79a111 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2223,7 +2223,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
patches/server/0123-Linear-region-file-format.patch
View File

@@ -444,10 +444,10 @@ index 1090b7e36e3c1c105bc36135b82751c651f237d4..d24ec065c76f6852586328dd56fba311
regionfile.flush();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ab4510eb9e5eaca46e3278c73e208757292a9f90..c5a89cfe1eae92c624565a0e4185c6969f2708c6 100644
index 105a1fb70a7b869b65617a760b8de1ea86f3571f..1288be2fa570ff304c70c8da6af8a6d862c5bdb7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -584,7 +584,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -609,7 +609,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
world.getChunk(x, z); // make sure we're at ticket level 32 or lower
return true;
}

2
patches/server/0130-Fast-resume.patch
View File

@@ -66,7 +66,7 @@ index b133b977bc7d452b5032809f84f8ac2ff96ae5bb..be8280d421a483b354f88d6011700218
return this.removeTicketAtLevel(type, CoordinateUtils.getChunkKey(chunkPos), level, identifier);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5d290f9335a510f4ddab7a78a96c0d8eedd4682e..502dfe1b2d030f9a2f484ced7d519342d58b79d5 100644
index 8bb6f9d26c8a24638ed64e8726b3b11dcccde9c8..0e2ebd43304a54a0367c89037bf842d22afe13a5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -669,6 +669,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

10
patches/server/0135-Bytebuf-API.patch
View File

@@ -35,10 +35,10 @@ index 975062e67278614220eab0c301019a235c7953b7..810d92c033b556e8ae3a5e133a4e471e
// Leaves start - bot support
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4ecfa62b8146403b05041418a37d74378bea4b05..7cd56fb6a985075cf6d68a5108329924dd2405fa 100644
index 98f10278b14d540e81703ee1330ddd7c6ed5f194..7954b73ddd2aa383aa72024058ed18a353d58e78 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -307,6 +307,7 @@ public final class CraftServer implements Server {
@@ -309,6 +309,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.potion.PaperPotionBrewer potionBrewer; // Paper - Custom Potion Mixes
private final org.leavesmc.leaves.entity.CraftBotManager botManager = new org.leavesmc.leaves.entity.CraftBotManager(); // Leaves
private final org.leavesmc.leaves.entity.CraftPhotographerManager photographerManager = new org.leavesmc.leaves.entity.CraftPhotographerManager(); // Leaves
@@ -46,7 +46,7 @@ index 4ecfa62b8146403b05041418a37d74378bea4b05..7cd56fb6a985075cf6d68a5108329924
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3284,4 +3285,15 @@ public final class CraftServer implements Server {
@@ -3307,4 +3308,15 @@ public final class CraftServer implements Server {
return photographerManager;
}
// Leaves end - replay mod api
@@ -63,10 +63,10 @@ index 4ecfa62b8146403b05041418a37d74378bea4b05..7cd56fb6a985075cf6d68a5108329924
+ // Leaves end - Bytebuf API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 264d431ea5d6cbed560fe0f025b1d402877d7d66..909f55976c035e2aa8903e988924bba53cd07e5c 100644
index a265dd6af9a58d1f71ea464a88c787749c79a111..d56814fd364681115dd37fe97536bc1580e05e5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3519,4 +3519,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3528,4 +3528,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSendViewDistance(final int viewDistance) {
this.getHandle().setSendViewDistance(viewDistance);
}