Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-22 08:29:22 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-05-25 17:30:25 +08:00
parent 46ac3c65f8
commit a485bc9b5e
42 changed files with 132 additions and 132 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=f17519338bc589c045e0b32bfc37e048b23544d5
paperRef=377733d44c0f1d476cada93ebae2478a1c495b23
preVersion=true
updatingMinecraft=true

2
patches/api/0001-Leaves-Server-Config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c8595ffcfcbdd79794d464415287d46acef72b72..99d754d3d06accbe13363f729b284e0eab67f2aa 100644
index 49d2547fcdaf779e284f513e58c1ac2ae3000bda..28ae66ae562dc7ab999908fe2a01a083a8d3de2b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2256,6 +2256,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

8
patches/api/0003-Add-fakeplayer-api.patch
View File

@@ -14,10 +14,10 @@ index 97e78e27ee0eea2c8b24886eeb19164d552323fe..9764fa643039f215627c20a33ca70c9e
/.factorypath
+
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 71f1c361ebccbe83193c37ec3a90faa4085001c3..0bfaeca0b1e1fadfaeed486c94dac19447062575 100644
index 9a219b255b63f10005fc68faacb771dd32f61ac2..6dcec4061e2bec84b23cc7e5fbd2927b1571b77e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2903,6 +2903,17 @@ public final class Bukkit {
@@ -2909,6 +2909,17 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -36,7 +36,7 @@ index 71f1c361ebccbe83193c37ec3a90faa4085001c3..0bfaeca0b1e1fadfaeed486c94dac194
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 99d754d3d06accbe13363f729b284e0eab67f2aa..5e60df867b3111c203c0fe249b09e8c6333d1255 100644
index 28ae66ae562dc7ab999908fe2a01a083a8d3de2b..f549901dfde495282390479337a1d13b62461295 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -61,6 +61,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -47,7 +47,7 @@ index 99d754d3d06accbe13363f729b284e0eab67f2aa..5e60df867b3111c203c0fe249b09e8c6
/**
* Represents a server implementation.
@@ -2550,4 +2551,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2554,4 +2555,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API

8
patches/api/0009-Replay-Mod-API.patch
View File

@@ -14,10 +14,10 @@ index 9764fa643039f215627c20a33ca70c9e36b2d599..97e78e27ee0eea2c8b24886eeb19164d
/.factorypath
-
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 0bfaeca0b1e1fadfaeed486c94dac19447062575..3c2b252243c1fa0d3adcc9c860c24af73165de33 100644
index 6dcec4061e2bec84b23cc7e5fbd2927b1571b77e..336b8d396f067cface060354c45e03c71ca35f27 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2913,6 +2913,11 @@ public final class Bukkit {
@@ -2919,6 +2919,11 @@ public final class Bukkit {
return server.getBotManager();
}
// Leaves end - Bot API
@@ -30,7 +30,7 @@ index 0bfaeca0b1e1fadfaeed486c94dac19447062575..3c2b252243c1fa0d3adcc9c860c24af7
@NotNull
public static Server.Spigot spigot() {
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5e60df867b3111c203c0fe249b09e8c6333d1255..4a03044938630e4a0e701bc481f15da5a3323115 100644
index f549901dfde495282390479337a1d13b62461295..9384d1d8015aeae910756f35fa27bdc16dfb5662 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -62,6 +62,7 @@ import org.jetbrains.annotations.Contract;
@@ -41,7 +41,7 @@ index 5e60df867b3111c203c0fe249b09e8c6333d1255..4a03044938630e4a0e701bc481f15da5
/**
* Represents a server implementation.
@@ -2560,4 +2561,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2564,4 +2565,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull BotManager getBotManager();
// Leaves end - Bot API

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Bytebuf API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3c2b252243c1fa0d3adcc9c860c24af73165de33..1caffc8771680505be1c51a2f5050528435cdc33 100644
index 336b8d396f067cface060354c45e03c71ca35f27..900156f8a6c749177de5fc305a76b8d77c23b90e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2919,6 +2919,12 @@ public final class Bukkit {
@@ -2925,6 +2925,12 @@ public final class Bukkit {
}
// Leaves end - Photographer API
@@ -22,10 +22,10 @@ index 3c2b252243c1fa0d3adcc9c860c24af73165de33..1caffc8771680505be1c51a2f5050528
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4a03044938630e4a0e701bc481f15da5a3323115..7a006d2582cd91b83ab05aeb6d6a6f96b77d2dbc 100644
index 9384d1d8015aeae910756f35fa27bdc16dfb5662..42cb311cbc6001e3116a4e2a0b4207d385995b2e 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2564,4 +2564,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2568,4 +2568,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Leaves start - Photographer API
@NotNull PhotographerManager getPhotographerManager();
// Leaves end - Photographer API

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

@@ -164,10 +164,10 @@ 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 dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5..9719199b7dc98e5f04706bd420af5f14d8b9724c 100644
index 0ed42fa899721f83b598db05be1b5f321af3614a..9cd75d163e81f812e8dcd3c010b4a715d2bcf804 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1168,7 +1168,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1165,7 +1165,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
LOGGER.info("*************************************************************************************");
LOGGER.info("This is the first time you're starting this server.");
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
@@ -176,7 +176,7 @@ index dbc86b8d4d2af6e5f7e678f2bb77fd39b85c04c5..9719199b7dc98e5f04706bd420af5f14
LOGGER.info("*************************************************************************************");
}
// Paper end - Add onboarding message for initial server start
@@ -1923,7 +1923,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1920,7 +1920,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

34
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 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6dacd2c88e 100644
index 9cd75d163e81f812e8dcd3c010b4a715d2bcf804..026dc226ace6b067df8987f10039d4c037c47124 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;
@@ -909,7 +909,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
private static MinecraftServer SERVER; // Paper
@@ -975,7 +970,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -972,7 +967,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -917,7 +917,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
// CraftBukkit start
if (this.server != null) {
this.server.disablePlugins();
@@ -1455,34 +1449,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1452,34 +1446,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -971,7 +971,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
}
}
// Paper end - execute chunk tasks mid tick
@@ -1557,15 +1546,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1554,15 +1543,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -989,7 +989,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
@@ -1602,9 +1590,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1599,9 +1587,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end - Incremental chunk and player saving
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -1000,7 +1000,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
// Paper end
// Paper start - Server Tick Events
long endTime = System.nanoTime();
@@ -1627,7 +1613,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1624,7 +1610,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.logTickMethodTime(i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -1008,7 +1008,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
}
private void logTickMethodTime(long tickStartTime) {
@@ -1698,9 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1695,9 +1680,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.getPlayerList().getPlayers().forEach((entityplayer) -> {
entityplayer.connection.suspendFlushing();
});
@@ -1018,7 +1018,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
// Paper start - Folia scheduler API
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
getAllLevels().forEach(level -> {
@@ -1717,21 +1700,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1714,21 +1697,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end - Folia scheduler API
io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
this.profiler.push("commandFunctions");
@@ -1040,7 +1040,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
// Send time updates to everyone, it will get the right time from the world the player is in.
// Paper start - Perf: Optimize time updates
for (final ServerLevel level : this.getAllLevels()) {
@@ -1751,7 +1729,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1748,7 +1726,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end - Perf: Optimize time updates
@@ -1048,7 +1048,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
this.isIteratingOverLevels = true; // Paper - Throw exception on world create while being ticked
Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; move down
@@ -1778,14 +1755,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1775,14 +1752,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -1063,7 +1063,7 @@ index 9719199b7dc98e5f04706bd420af5f14d8b9724c..025e1a22d7344fc7de2baca5c29a6a6d
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
@@ -1800,24 +1775,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1797,24 +1772,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
this.profiler.popPush("connection");
@@ -1588,7 +1588,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 517e10c3d8b1549cd30fd0e7cf2bcb35e88eb8ed..e8a472f7e90dfb39b16521f75521d60b532af5cc 100644
index ef0f118aecf0893e45cb9423a677d7e42496324b..13b4f4dd74a639856aa89e131f44d973e12c027c 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;
@@ -1675,7 +1675,7 @@ index 85b4b24361e785acf75571ff98f924c00ae80748..1f3e0392f88a7cb3fb5c0767cdd1b4bc
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..34654d0f7d5c159ceaf76b327a3f86bd4f82c175 100644
index 0a8eeebb2d702ebcefd9f26cc0f41d1eab497902..7231aaac1fe66301727502596f59f9af71cf0aa6 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -170,7 +170,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1686,7 +1686,7 @@ index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..34654d0f7d5c159ceaf76b327a3f86bd
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
private org.spigotmc.TickLimiter tileLimiter;
@@ -292,7 +291,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -283,7 +282,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
});
// CraftBukkit end
@@ -1694,7 +1694,7 @@ index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..34654d0f7d5c159ceaf76b327a3f86bd
this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -1260,15 +1258,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1251,15 +1249,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
ProfilerFiller gameprofilerfiller = this.getProfiler();
gameprofilerfiller.push("blockEntities");
@@ -1710,7 +1710,7 @@ index b4ef3ad2c17168085372f1fe46809f02d9dfe74a..34654d0f7d5c159ceaf76b327a3f86bd
// Spigot start
// Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
boolean flag = this.tickRateManager().runsNormally();
@@ -1297,9 +1292,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1288,9 +1283,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075
@@ -1974,7 +1974,7 @@ 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 5a382907285a288f2a223189e690d3dbdf45594c..129aa57a01877c9339541f0e10933573bd438fe6 100644
index e46714f38df931350d81c30907560c381c8d2725..37bc178f738b4d9cd7ff07cf27bad676bb28532e 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 {

4
patches/server/0004-Leaves-Server-Utils.patch
View File

@@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
public PlayerAreaMap() {
super();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 2bc85351e6e52f90da5fdb29d8d042a06132d742..1d8be1e7b71db074b7616d0a5e0c5075f09877ac 100644
index 25ea45a528612d1a2a2d77293b3802f473a52f38..5d14db0ee37c2705630776bd135bbc1e0d150905 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -426,6 +426,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -62,7 +62,7 @@ index 2bc85351e6e52f90da5fdb29d8d042a06132d742..1d8be1e7b71db074b7616d0a5e0c5075
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
@@ -4995,4 +5002,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -5001,4 +5008,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end - Expose entity id counter

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 129aa57a01877c9339541f0e10933573bd438fe6..99c7711447ac70fe4219fc55c3ba9fbd45924a90 100644
index 37bc178f738b4d9cd7ff07cf27bad676bb28532e..ea71e11be59371682b421060edc8658421b56101 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -510,7 +510,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -501,7 +501,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

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

@@ -24,10 +24,10 @@ 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 025e1a22d7344fc7de2baca5c29a6a6dacd2c88e..624c28d63aba34e9d4677c538b84bebbda7d706a 100644
index 026dc226ace6b067df8987f10039d4c037c47124..421b67ab81330975f6404578ffcc57feb0c9c0be 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1150,6 +1150,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1147,6 +1147,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
// Paper end
@@ -50,7 +50,7 @@ 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 2fa5507aa2153a05208077f9547c165a1099b5bb..b65d405c6f5884c739bebd7e79ba431a8b0056e4 100644
index af015237214cebc4d1c4bb9e9c5f939d433e365c..b7bf9144144b9ed6cf9446e93b16615270f9e812 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 {
@@ -61,7 +61,7 @@ index 2fa5507aa2153a05208077f9547c165a1099b5bb..b65d405c6f5884c739bebd7e79ba431a
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -3033,6 +3034,14 @@ public final class CraftServer implements Server {
@@ -3028,6 +3029,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

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

@@ -34,10 +34,10 @@ index 0211311b3b63bcdea7ebf7bcb24629674c771402..c05a72f4928ee2cec28a61ed06a9079d
};
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 624c28d63aba34e9d4677c538b84bebbda7d706a..4a9b4e9c0db3cf86134b857ee1318fa4463c80a1 100644
index 421b67ab81330975f6404578ffcc57feb0c9c0be..f1f0e7adada3527ac666623d63376e6cbd590630 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1785,6 +1785,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1782,6 +1782,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");
@@ -92,7 +92,7 @@ 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 b65d405c6f5884c739bebd7e79ba431a8b0056e4..3fbf31ef07489ffb7d0c0f5317fa967db740494d 100644
index b7bf9144144b9ed6cf9446e93b16615270f9e812..5375536a1b752f4b2a41b5e9b02d418ffdaef4c4 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 {

4
patches/server/0008-Fix-gravity-block-duper.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix gravity block duper
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1d8be1e7b71db074b7616d0a5e0c5075f09877ac..96ad6c4ae0a9f3745e4a6503e6010d9278d8eb54 100644
index 5d14db0ee37c2705630776bd135bbc1e0d150905..25cfcde7eeb80d3e5ab530096b8ae947412ee282 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -443,6 +443,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -24,7 +24,7 @@ index 1d8be1e7b71db074b7616d0a5e0c5075f09877ac..96ad6c4ae0a9f3745e4a6503e6010d92
// Paper start - optimise entity tracking
final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
@@ -3260,7 +3262,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -3266,7 +3268,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
this.processPortalCooldown();

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

@@ -53,10 +53,10 @@ index 02833deaa2bb7e5abc655bc1bdbe15c4b3ac7119..53c23d5bbbc5c74a35dafec99bcf13f9
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 4a9b4e9c0db3cf86134b857ee1318fa4463c80a1..d8ac4b133c52c46494518a93884f715108dc8f17 100644
index f1f0e7adada3527ac666623d63376e6cbd590630..24362501292e61c5d1f17917f27095b6a56b661c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -670,6 +670,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -667,6 +667,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Paper end - Configurable player collision
@@ -65,7 +65,7 @@ index 4a9b4e9c0db3cf86134b857ee1318fa4463c80a1..d8ac4b133c52c46494518a93884f7151
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
@@ -970,6 +972,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -967,6 +969,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
@@ -108,7 +108,7 @@ index dc20b051d4f14ce4e0b5a0114e02d15716a7c3d6..d1a42800e069fa89d3f3fb4dcb9948d1
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c10401e587a710d49c4af481c1e531b4bf51f755..b1a32440f92f54ea86356391ecaa14c676f79eed 100644
index a645ad66af061966c5e47cae677026b35a55c486..1adceb1122a3312d70482e01f9d3054b3b88ba5d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -194,6 +194,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -275,7 +275,7 @@ index 11d73647d2d94c8131c5e3eeef490fb3472fe0a4..ef719bf410912b24d57de422d1fa3fb2
+ // Leaves end - fakeplayer support
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 96ad6c4ae0a9f3745e4a6503e6010d9278d8eb54..082b484df1bd3d6a87413e3ab9a07a8f5401c65d 100644
index 25cfcde7eeb80d3e5ab530096b8ae947412ee282..28d388d5955eeb322b9f47ba542a23ca2264ea8e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1511,7 +1511,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -353,7 +353,7 @@ 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 3fbf31ef07489ffb7d0c0f5317fa967db740494d..87bb3ecfbc1fc48a0c276261ea438ba43f8e9e50 100644
index 5375536a1b752f4b2a41b5e9b02d418ffdaef4c4..a99b5ab363b1acffc4c5ce3151ea28ff2c377d8d 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 {
@@ -364,7 +364,7 @@ index 3fbf31ef07489ffb7d0c0f5317fa967db740494d..87bb3ecfbc1fc48a0c276261ea438ba4
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3275,4 +3276,11 @@ public final class CraftServer implements Server {
@@ -3267,4 +3268,11 @@ public final class CraftServer implements Server {
return this.potionBrewer;
}
// Paper end

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

@@ -5,7 +5,7 @@ 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 e8a472f7e90dfb39b16521f75521d60b532af5cc..d106491e5ca187cf62758cbd33bab575ccbc3bec 100644
index 13b4f4dd74a639856aa89e131f44d973e12c027c..b7fbb6b7fddee11ceffbce9c1f2de869176351be 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 {

2
patches/server/0021-Optimize-entity-coordinate-key.patch
View File

@@ -25,7 +25,7 @@ index 1d6b3fe2ce240af4ede61588795456b046eee6c9..21847dfde06ded5944699ca30a4ec9c2
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 082b484df1bd3d6a87413e3ab9a07a8f5401c65d..e87a60ca43fe080209620e11833099e7ea9164b5 100644
index 28d388d5955eeb322b9f47ba542a23ca2264ea8e..b4349e91a804c7998bb42f3a1e228f56ab2a5d0f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -312,7 +312,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

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 d106491e5ca187cf62758cbd33bab575ccbc3bec..9755d85c090d336364f041d32f11ea7c5041945e 100644
index b7fbb6b7fddee11ceffbce9c1f2de869176351be..407514daeb977d44d9f82dc5865cfd757f8ef40e 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 {

6
patches/server/0024-Move-ThreadUnsafeRandom-Initialization.patch
View File

@@ -19,10 +19,10 @@ index c93d0fbb921309a63c21ba7775fdf44aaa7985c4..84472442e0e68c22c4ebeaaf980aee1e
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 34654d0f7d5c159ceaf76b327a3f86bd4f82c175..d4854e404b111b0cb936539b4ce95890b22a6f9d 100644
index 7231aaac1fe66301727502596f59f9af71cf0aa6..2f12ea930fb173b22d36dc159ee3730fb61f2f08 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -212,6 +212,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -203,6 +203,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public abstract ResourceKey<LevelStem> getTypeKey();
@@ -31,7 +31,7 @@ index 34654d0f7d5c159ceaf76b327a3f86bd4f82c175..d4854e404b111b0cb936539b4ce95890
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config; Async-Anti-Xray: Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -300,6 +302,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -291,6 +293,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end - optimise collisions
}

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d8ac4b133c52c46494518a93884f715108dc8f17..35a67136f5e22c5f9b65841fb7c10309e0b0e1c2 100644
index 24362501292e61c5d1f17917f27095b6a56b661c..ee22bcbe2f64cac2d22328d9abb3c91c2263fb2e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2533,6 +2533,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2530,6 +2530,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -22,10 +22,10 @@ index d8ac4b133c52c46494518a93884f715108dc8f17..35a67136f5e22c5f9b65841fb7c10309
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index d4854e404b111b0cb936539b4ce95890b22a6f9d..68d065ff98141176e0c4ed43ea4d7a3531fa62da 100644
index 2f12ea930fb173b22d36dc159ee3730fb61f2f08..fe8886afe34f978b34832b5b295c7fee8bef3c26 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1790,6 +1790,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1781,6 +1781,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {

2
patches/server/0029-Throttle-goal-selector-during-inactive-ticking.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Throttle goal selector during inactive ticking
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index e89f9c3e887601d8461eb967ae0bf582b672f631..22a5e441cd62447e4ac95a8b048bd10942743367 100644
index a80f313771575c1f772d23ef2469a2dce7b1688c..18a7b57a7e45fc9c412c5b203d686e896ddddd06 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -237,11 +237,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti

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

@@ -6,7 +6,7 @@ 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 9755d85c090d336364f041d32f11ea7c5041945e..8e5bfb7579b528d68b270665c02588bfa39643a3 100644
index 407514daeb977d44d9f82dc5865cfd757f8ef40e..0bd50e9ced73d121a1856f910a807b470534a272 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2058,6 +2058,22 @@ public abstract class LivingEntity extends Entity implements Attackable {

6
patches/server/0036-Reduce-entity-fluid-lookups-if-no-fluids.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e87a60ca43fe080209620e11833099e7ea9164b5..bf8e3d510631e418eb6d2e641b51a1220bee2d7d 100644
index b4349e91a804c7998bb42f3a1e228f56ab2a5d0f..af5e5170db5c4f4ee9fa36a92937789be0554a54 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4487,16 +4487,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4493,16 +4493,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index e87a60ca43fe080209620e11833099e7ea9164b5..bf8e3d510631e418eb6d2e641b51a122
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4504,38 +4506,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4510,38 +4512,123 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();

4
patches/server/0040-InstantBlockUpdater-Reintroduced.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] InstantBlockUpdater Reintroduced
This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 68d065ff98141176e0c4ed43ea4d7a3531fa62da..c04e07fa16d701d814a2df82758d4339e3b4e5f1 100644
index fe8886afe34f978b34832b5b295c7fee8bef3c26..fc956d2d81f9b7625c7143810c77c8ab8e86ec5c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -73,6 +73,7 @@ import net.minecraft.world.level.lighting.LevelLightEngine;
@@ -17,7 +17,7 @@ index 68d065ff98141176e0c4ed43ea4d7a3531fa62da..c04e07fa16d701d814a2df82758d4339
import net.minecraft.world.level.redstone.NeighborUpdater;
import net.minecraft.world.level.saveddata.maps.MapId;
import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -254,7 +255,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -245,7 +246,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.thread = Thread.currentThread();
this.biomeManager = new BiomeManager(this, i);
this.isDebug = flag1;

4
patches/server/0044-Player-operation-limiter.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b1a32440f92f54ea86356391ecaa14c676f79eed..1c9c28436645737e8691d5e4dd9a757ab668e458 100644
index 1adceb1122a3312d70482e01f9d3054b3b88ba5d..8fca15c38d3410b0db113b2a391fd1d3f5596aee 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -299,6 +299,10 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index b1a32440f92f54ea86356391ecaa14c676f79eed..1c9c28436645737e8691d5e4dd9a757a
this.gameMode.tick();
this.wardenSpawnTracker.tick();
--this.spawnInvulnerableTime;
@@ -2876,5 +2881,32 @@ public class ServerPlayer extends Player {
@@ -2882,5 +2887,32 @@ public class ServerPlayer extends Player {
public CraftPlayer getBukkitEntity() {
return (CraftPlayer) super.getBukkitEntity();
}

2
patches/server/0048-MC-Technical-Survival-Mode.patch
View File

@@ -65,7 +65,7 @@ index 63652c3011c48c461c1b5be1889847b2f065e34c..0f3a92155fa0b4ed9d7fbc87202fd04d
pearl.ownerUUID = null;
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1c9c28436645737e8691d5e4dd9a757ab668e458..2945dc0d1ad1c50fded0d61e9dd582bbe20bbecd 100644
index 8fca15c38d3410b0db113b2a391fd1d3f5596aee..a3c3e3848a2528aea1ff379b348cf07fb4e7c07b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1610,7 +1610,7 @@ public class ServerPlayer extends Player {

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 2945dc0d1ad1c50fded0d61e9dd582bbe20bbecd..bab6ae23c77cb9dc575625720ac31ae67a28d5d9 100644
index a3c3e3848a2528aea1ff379b348cf07fb4e7c07b..74667f23c21e983359c0630812a46d98934a13c9 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -19,6 +19,7 @@ import java.util.UUID;
@@ -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 8e5bfb7579b528d68b270665c02588bfa39643a3..3ad2f5234925e7f454d2b2bcb507493cdc3e454a 100644
index 0bd50e9ced73d121a1856f910a807b470534a272..f1a989919f563b3f424d3ba7ebecb10ac56c4ecb 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 {

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

@@ -31,7 +31,7 @@ index bfc1e27c37689c1fbb927404a7176780a439a057..bc8ab50ef1390a2c51110a89dc43db58
private final String baseUrl;
private final URL joinUrl;
diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java
index 5443013060b62e3bfcc51cddca96d1c0bc59fe72..66c2b5caa08ab1659a9412c4b21404e90d8360f1 100644
index 244a19ecd0234fa1d7a6ecfea20751595688605d..7a1f7714616913cbb9d2dfc017567895e189ead1 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -190,7 +190,7 @@ public class Main {
@@ -44,7 +44,7 @@ index 5443013060b62e3bfcc51cddca96d1c0bc59fe72..66c2b5caa08ab1659a9412c4b21404e9
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 35a67136f5e22c5f9b65841fb7c10309e0b0e1c2..81e557588bf91bdd4654833ec967f2a727823d27 100644
index ee22bcbe2f64cac2d22328d9abb3c91c2263fb2e..1b4be84963683481a375a44c14b275100cf43886 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/0053-Use-vanilla-random-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Use vanilla random config
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index bf8e3d510631e418eb6d2e641b51a1220bee2d7d..d6b5514dfe94b48a81ddd62b57a5d72b0510a61f 100644
index af5e5170db5c4f4ee9fa36a92937789be0554a54..0585b355d55d8828c4309ffe6b160ee8777f4804 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -580,7 +580,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

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

@@ -20,10 +20,10 @@ 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 81e557588bf91bdd4654833ec967f2a727823d27..c2b2af0a2a4480aa09c0f1a43967ab41cb0e80b1 100644
index 1b4be84963683481a375a44c14b275100cf43886..0923285d7a03de762cba8929682f94a5be156ae9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1759,7 +1759,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1756,7 +1756,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c2b2af0a2a4480aa09c0f1a43967ab41cb0e80b1..21b659382656f01d7576cd0481c831166f7f3229 100644
index 0923285d7a03de762cba8929682f94a5be156ae9..b82b45f57cdd7a98f3c29cc6c80b4d8aedece681 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1796,6 +1796,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1793,6 +1793,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol

2
patches/server/0065-Creative-fly-no-clip.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Creative fly no clip
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 093d1388ff90ad59110a37536b6639f939549068..ba6886d0185eda0c7c6d37640c20636cc163ccf4 100644
index 686374e89e41b0917791264f3281f7384835bca8..80a658330c8dfddc704d53adbde3cf8b09d38130 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -250,8 +250,8 @@ public abstract class Player extends LivingEntity {

4
patches/server/0070-Elytra-aeronautics-no-chunk-load.patch
View File

@@ -58,7 +58,7 @@ index 21a3e948ee82605bb970e8503be57b0e66373f77..1005e1c4c86f707c3e55ef3c5325dd76
!worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
)) {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index d6b5514dfe94b48a81ddd62b57a5d72b0510a61f..1a17258f338f8a4c575e30e4783a8f13ed9380ef 100644
index 0585b355d55d8828c4309ffe6b160ee8777f4804..36e6a9db495585b116782ece080e45979272f666 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1157,7 +1157,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -85,7 +85,7 @@ index d6b5514dfe94b48a81ddd62b57a5d72b0510a61f..1a17258f338f8a4c575e30e4783a8f13
}
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 ba6886d0185eda0c7c6d37640c20636cc163ccf4..17eef5f974a2d61a99224877cc0f79c4fea7c565 100644
index 80a658330c8dfddc704d53adbde3cf8b09d38130..02f67c1d96469fc234da24e8bff83ca506579f8b 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -195,6 +195,8 @@ public abstract class Player extends LivingEntity {

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

@@ -375,7 +375,7 @@ 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 3ad2f5234925e7f454d2b2bcb507493cdc3e454a..bd85c526a285e0b11c0c8f87fd9ea95ccb9f70a3 100644
index f1a989919f563b3f424d3ba7ebecb10ac56c4ecb..f8187085df596c296d92ff43a1f02fed3732437c 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3238,7 +3238,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -388,7 +388,7 @@ index 3ad2f5234925e7f454d2b2bcb507493cdc3e454a..bd85c526a285e0b11c0c8f87fd9ea95c
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 22a5e441cd62447e4ac95a8b048bd10942743367..9821e8fc3209eabfa809560bcca36c3a7e5cdc25 100644
index 18a7b57a7e45fc9c412c5b203d686e896ddddd06..4486a84b10c20515f18efce522e58c92a9591b65 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1201,7 +1201,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti
@@ -454,7 +454,7 @@ index cb5effe8be9f43ef6b3fa48c25600cdcd69ddc9e..98c6c0b5e795558fc9d1b96643832b3c
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
index 482d7b12b80328fba97a01bcfeb974b7ac4bcdb7..8068816a64ff9a30476280f53bb60cf0e1fff8ee 100644
index fb4c8a2a15e8e3e26454b7da920454e9861336c6..af13503a1e6e25893889705a48cef60d99a7e04f 100644
--- a/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
+++ b/src/main/java/net/minecraft/world/item/crafting/ShapedRecipe.java
@@ -17,6 +17,7 @@ import org.bukkit.craftbukkit.inventory.CraftRecipe;
@@ -496,7 +496,7 @@ index e158ff1a9dbd054985873e854fcf6c433102059c..e061322fed6adf49a506ea13db50cdf2
private static Enchantment register(String name, Enchantment enchantment) {
return Registry.register(BuiltInRegistries.ENCHANTMENT, name, enchantment);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index c04e07fa16d701d814a2df82758d4339e3b4e5f1..fdf56caa8756f065f892847898f2b2b9af18f5c6 100644
index fc956d2d81f9b7625c7143810c77c8ab8e86ec5c..c7f740be91ecbf9cb3baa30ae02b5751454fc23d 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -101,6 +101,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
@@ -507,7 +507,7 @@ index c04e07fa16d701d814a2df82758d4339e3b4e5f1..fdf56caa8756f065f892847898f2b2b9
public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1868,7 +1869,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1859,7 +1860,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ);
if (slices == null) {
@@ -610,7 +610,7 @@ index ae86c45c1d49c7646c721991910592091e7333f8..f3dce7156d518193fe27a69f5792800b
static {
set(EquipmentSlot.HAND, net.minecraft.world.entity.EquipmentSlot.MAINHAND);
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
index 6827979a5b270ced53b46ecb9eff548727dadb81..1b84078152d0585ec51288e585754be176f2d7c2 100644
index fdcc414f4fa246082ad0732133c870d915ae3084..556247696cde0d31cbb70907648d2970acf81153 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
@@ -165,7 +165,7 @@ public class CraftEntityEquipment implements EntityEquipment {

4
patches/server/0090-Optimize-sun-burn-tick.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize sun burn tick
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 1a17258f338f8a4c575e30e4783a8f13ed9380ef..5b0f931a26bf16633c79eddcae6bc750d8867136 100644
index 36e6a9db495585b116782ece080e45979272f666..658a3dfa4959589ac1e5b5c9b6a96f1522574daa 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2091,8 +2091,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -34,7 +34,7 @@ index 1a17258f338f8a4c575e30e4783a8f13ed9380ef..5b0f931a26bf16633c79eddcae6bc750
public void absMoveTo(double x, double y, double z, float yaw, float pitch) {
this.absMoveTo(x, y, z);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 9821e8fc3209eabfa809560bcca36c3a7e5cdc25..9a46da42f122c9d555bfc1b2542cff061440316e 100644
index 4486a84b10c20515f18efce522e58c92a9591b65..339ac20d409f71307a79c562edd7f9cf927e794f 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1845,15 +1845,41 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti

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 bd85c526a285e0b11c0c8f87fd9ea95ccb9f70a3..e3bac8e9f30685f6014ddc3da8a7359d03337bb1 100644
index f8187085df596c296d92ff43a1f02fed3732437c..d053eeebfee81c4dc8a6b42e50d7cf76aad39fbe 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 {

4
patches/server/0095-Skip-entity-move-if-movement-is-zero.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5b0f931a26bf16633c79eddcae6bc750d8867136..912d444c478ce57814462e5b84e34b2e56293274 100644
index 658a3dfa4959589ac1e5b5c9b6a96f1522574daa..0e319cf3782137114ed3b60ccc7c3d25ab109a64 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -320,6 +320,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -31,7 +31,7 @@ index 5b0f931a26bf16633c79eddcae6bc750d8867136..912d444c478ce57814462e5b84e34b2e
final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
// Paper start - detailed watchdog information
io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
@@ -4178,6 +4186,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4184,6 +4192,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public final void setBoundingBox(AABB boundingBox) {

2
patches/server/0097-Skip-negligible-planar-movement-multiplication.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 912d444c478ce57814462e5b84e34b2e56293274..5e0fcc4e6d6afe034c44f7fcb528eab81cd0e3cd 100644
index 0e319cf3782137114ed3b60ccc7c3d25ab109a64..0ea19bf7eeb238329631fae725bcab66cd4d07cf 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1306,9 +1306,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

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

@@ -94,10 +94,10 @@ index 676a1499747b071515479130875157263d3a8352..af2f95487c3d044dc4462baf981c66cf
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 21b659382656f01d7576cd0481c831166f7f3229..5c03702896a837425dfa13fdd5db1056f9267a88 100644
index b82b45f57cdd7a98f3c29cc6c80b4d8aedece681..5d290f9335a510f4ddab7a78a96c0d8eedd4682e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1662,7 +1662,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1659,7 +1659,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
private ServerStatus.Players buildPlayerStatus() {
@@ -356,7 +356,7 @@ index c4aac957906ff3bf28b29e58e30decc608562e6a..975062e67278614220eab0c301019a23
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 87bb3ecfbc1fc48a0c276261ea438ba43f8e9e50..405a04f2711e26e22d7dd091745b5b5a01d724d9 100644
index a99b5ab363b1acffc4c5ce3151ea28ff2c377d8d..a1990679c3c3ce173bfe446cb810a80ab1ebb27c 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 {
@@ -376,7 +376,7 @@ index 87bb3ecfbc1fc48a0c276261ea438ba43f8e9e50..405a04f2711e26e22d7dd091745b5b5a
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3283,4 +3284,11 @@ public final class CraftServer implements Server {
@@ -3275,4 +3276,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 561a7a8e96e2d91bbb87fe6230e94b5f38073d27..25a5ce110c0515f5a0ee5f287a7f3dd029a8f29f 100644
index 7e6116963d835d4606ef3d93b69d3e44b61288e1..264d431ea5d6cbed560fe0f025b1d402877d7d66 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 {

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

@@ -117,15 +117,15 @@ index 7dcdc9b40c594234d87bef3e75a68ddaa58506a3..6bbccbc2e114bf31a0ca3341437b7d5f
regionFile.setStatus(chunkPos.x, chunkPos.z, ChunkSerializer.getStatus(compound));
}
diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
index 3e582c49069f2a820ba3baac03917493877d9875..c9f7e0e819dceffa01bffdc522e778d35481426e 100644
index 954d468459fe167ede0e7fca5b9f99da565d59e1..12055c5e16ddb58d9e3c6c6d13f85facb2b7ac5d 100644
--- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
+++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java
@@ -76,7 +76,7 @@ public class WorldUpgrader {
volatile int skipped;
final Reference2FloatMap<ResourceKey<Level>> progressMap = Reference2FloatMaps.synchronize(new Reference2FloatOpenHashMap());
volatile Component status = Component.translatable("optimizeWorld.stage.counting");
- public static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$");
+ public static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.(linear | mca)$"); // Leaves
- static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$");
+ static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.(linear | mca)$"); // Leaves
final DimensionDataStorage overworldDataStorage;
public WorldUpgrader(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, RegistryAccess dynamicRegistryManager, boolean eraseCache, boolean recreateRegionFiles) {
@@ -200,7 +200,7 @@ index 1362a47943cf1a51a185a15094b1f74c94bf40ef..5dc0631ee8122f1a8473b6b1cf890cb5
try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) {
return NbtIo.read((java.io.DataInput) out);
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7d8e0c779 100644
index 1090b7e36e3c1c105bc36135b82751c651f237d4..d24ec065c76f6852586328dd56fba311cf8ac8a8 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
@@ -21,11 +21,15 @@ public class RegionFileStorage implements AutoCloseable {
@@ -239,10 +239,10 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
return null;
}
@@ -92,29 +100,29 @@ public class RegionFileStorage implements AutoCloseable {
}
}
@@ -94,29 +102,29 @@ public class RegionFileStorage implements AutoCloseable {
// Paper end
// Paper start
- public synchronized RegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) {
+ public synchronized org.leavesmc.leaves.region.AbstractRegionFile getRegionFileIfLoaded(ChunkPos chunkcoordintpair) { // Leaves
return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
@@ -275,7 +275,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
}
// Paper end
return regionfile;
@@ -125,28 +133,40 @@ public class RegionFileStorage implements AutoCloseable {
@@ -127,28 +135,40 @@ public class RegionFileStorage implements AutoCloseable {
}
// Paper end - cache regionfile does not exist state
if (this.regionCache.size() >= io.papermc.paper.configuration.GlobalConfiguration.get().misc.regionFileCacheSize) { // Paper - Sanitise RegionFileCache and make configurable
@@ -323,7 +323,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
}
// Paper end
return regionfile1;
@@ -158,7 +178,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -160,7 +180,7 @@ public class RegionFileStorage implements AutoCloseable {
org.apache.logging.log4j.LogManager.getLogger().fatal(msg + " (" + file.toString().replaceAll(".+[\\\\/]", "") + " - " + x + "," + z + ") Go clean it up to remove this message. /minecraft:tp " + (x<<4)+" 128 "+(z<<4) + " - DO NOT REPORT THIS TO PAPER - You may ask for help on Discord, but do not file an issue. These error messages can not be removed.");
}
@@ -332,7 +332,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
synchronized (regionfile) {
try (DataInputStream datainputstream = regionfile.getChunkDataInputStream(chunkCoordinate)) {
CompoundTag oversizedData = regionfile.getOversizedData(chunkCoordinate.x, chunkCoordinate.z);
@@ -193,14 +213,14 @@ public class RegionFileStorage implements AutoCloseable {
@@ -195,14 +215,14 @@ public class RegionFileStorage implements AutoCloseable {
@Nullable
public CompoundTag read(ChunkPos pos) throws IOException {
// CraftBukkit start - SPIGOT-5680: There's no good reason to preemptively create files on read, save that for writing
@@ -349,7 +349,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
// We add the regionfile parameter to avoid the potential deadlock (on fileLock) if we went back to obtain a regionfile
// if we decide to re-read
// Paper end
@@ -210,7 +230,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -212,7 +232,7 @@ public class RegionFileStorage implements AutoCloseable {
// Paper start
if (regionfile.isOversized(pos.x, pos.z)) {
@@ -358,7 +358,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
return readOversizedChunk(regionfile, pos);
}
// Paper end
@@ -224,12 +244,12 @@ public class RegionFileStorage implements AutoCloseable {
@@ -226,12 +246,12 @@ public class RegionFileStorage implements AutoCloseable {
if (this.isChunkData) {
ChunkPos chunkPos = ChunkSerializer.getChunkCoordinate(nbttagcompound);
if (!chunkPos.equals(pos)) {
@@ -374,7 +374,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
return null;
}
}
@@ -263,13 +283,13 @@ public class RegionFileStorage implements AutoCloseable {
@@ -265,13 +285,13 @@ public class RegionFileStorage implements AutoCloseable {
return nbttagcompound;
} finally { // Paper start
@@ -390,7 +390,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
if (regionfile == null) {
return;
}
@@ -300,7 +320,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -302,7 +322,7 @@ public class RegionFileStorage implements AutoCloseable {
protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException {
// Paper start - rewrite chunk system
@@ -399,7 +399,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
if (nbt == null && regionfile == null) {
return;
}
@@ -315,8 +335,33 @@ public class RegionFileStorage implements AutoCloseable {
@@ -317,8 +337,33 @@ public class RegionFileStorage implements AutoCloseable {
if (nbt == null) {
regionfile.clear(pos);
} else {
@@ -434,7 +434,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
try {
NbtIo.write(nbt, (DataOutput) dataoutputstream);
regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - Cache chunk status
@@ -355,7 +400,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -357,7 +402,7 @@ public class RegionFileStorage implements AutoCloseable {
// Paper end - Chunk save reattempt
// Paper start - rewrite chunk system
} finally {
@@ -443,7 +443,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
}
// Paper end - rewrite chunk system
}
@@ -365,7 +410,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -367,7 +412,7 @@ public class RegionFileStorage implements AutoCloseable {
ObjectIterator objectiterator = this.regionCache.values().iterator();
while (objectiterator.hasNext()) {
@@ -452,7 +452,7 @@ index f6e3b745fc417354380d4a969f83aee430bad785..67c344a8e6d9a32e0d574112e5f766f7
try {
regionfile.close();
@@ -381,7 +426,7 @@ public class RegionFileStorage implements AutoCloseable {
@@ -383,7 +428,7 @@ public class RegionFileStorage implements AutoCloseable {
ObjectIterator objectiterator = this.regionCache.values().iterator();
while (objectiterator.hasNext()) {

4
patches/server/0126-Placing-locked-hopper-no-longer-send-NC-updates.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Placing locked hopper no longer send NC updates
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index fdf56caa8756f065f892847898f2b2b9af18f5c6..4da9144e2b6e711587b4f202953928d8a48199f5 100644
index c7f740be91ecbf9cb3baa30ae02b5751454fc23d..811fc5ad978157bed9577a603b90868571c0fe2f 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -54,6 +54,7 @@ import net.minecraft.world.level.biome.BiomeManager;
@@ -16,7 +16,7 @@ index fdf56caa8756f065f892847898f2b2b9af18f5c6..4da9144e2b6e711587b4f202953928d8
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.TickingBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
@@ -1032,7 +1033,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1023,7 +1024,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
if ((i & 1) != 0) {

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

@@ -66,10 +66,10 @@ 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 5c03702896a837425dfa13fdd5db1056f9267a88..1fb5d965f33828067e44253bd50e4baeb09bfb0d 100644
index 5d290f9335a510f4ddab7a78a96c0d8eedd4682e..502dfe1b2d030f9a2f484ced7d519342d58b79d5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -672,6 +672,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -669,6 +669,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
org.leavesmc.leaves.bot.ServerBot.loadAllBot(); // Leaves - load resident bot
@@ -77,7 +77,7 @@ index 5c03702896a837425dfa13fdd5db1056f9267a88..1fb5d965f33828067e44253bd50e4bae
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
@@ -946,6 +947,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -943,6 +944,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
public void stopServer() {

4
patches/server/0133-Fix-falling-block-s-block-location.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix falling block's block location
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 5e0fcc4e6d6afe034c44f7fcb528eab81cd0e3cd..aae4569a6ea6773b6e020fb7e0296bc7062622c5 100644
index 0ea19bf7eeb238329631fae725bcab66cd4d07cf..df1ac24d30da9d4afe9e0f0ee6868343a7941614 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4867,6 +4867,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -4873,6 +4873,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
int j = Mth.floor(y);
int k = Mth.floor(z);

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

@@ -35,7 +35,7 @@ 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 405a04f2711e26e22d7dd091745b5b5a01d724d9..68a0a3a792c998a9cc67ec4269e8821817394cfa 100644
index a1990679c3c3ce173bfe446cb810a80ab1ebb27c..f2e32d17d7bd7279061e827bc175410bd4bcf7a8 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 {
@@ -46,7 +46,7 @@ index 405a04f2711e26e22d7dd091745b5b5a01d724d9..68a0a3a792c998a9cc67ec4269e88218
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3291,4 +3292,15 @@ public final class CraftServer implements Server {
@@ -3283,4 +3284,15 @@ public final class CraftServer implements Server {
return photographerManager;
}
// Leaves end - replay mod api
@@ -63,7 +63,7 @@ index 405a04f2711e26e22d7dd091745b5b5a01d724d9..68a0a3a792c998a9cc67ec4269e88218
+ // 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 25a5ce110c0515f5a0ee5f287a7f3dd029a8f29f..fb65a871d7cff135f0c8bc262b0666a3556fbfb0 100644
index 264d431ea5d6cbed560fe0f025b1d402877d7d66..b4029f2eca197cf603eb5e78e7c8262c8422cf9e 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 {