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-09-23 02:51:56 +08:00
parent 23c47a3cce
commit bff6bbdb1d
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=org.leavesmc.leaves
version=1.21.1-R0.1-SNAPSHOT
mcVersion=1.21.1
paperRef=13a23951d7142c3c4c39bd5e9bddac190b90c151
paperRef=1cb2bf466fb9fc42134be7e18d160f991d353fdf
preVersion=false
updatingMinecraft=false
org.gradle.jvmargs=-Xmx2G

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..cf8a410dedf26e48617ccad7e899edc26cf5f7c9 100644
index 648281575eb8d45a5c06549eb3d0f517c086fe64..ff37a984cdbf20d7f0d7b75c7f60a5d2c1e2b894 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -184,10 +184,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 23ddd26af762c1cd7fb3920669abb96b3213ab37..5be09db47028094ea52889f3c74b6a928278346f 100644
index 696d075ca2883f3c37e35f983c4d020e5db89d16..f1b28f4f383c682a52b6aa44dfbdf30944537ecf 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1244,7 +1244,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1243,7 +1243,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.");
@@ -196,7 +196,7 @@ index 23ddd26af762c1cd7fb3920669abb96b3213ab37..5be09db47028094ea52889f3c74b6a92
LOGGER.info("*************************************************************************************");
}
// Paper end - Add onboarding message for initial server start
@@ -1942,7 +1942,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1940,7 +1940,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

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

@@ -741,7 +741,7 @@ index 0c3c82b28e581286b798ee58ca4193efc2faff4a..fe6a5a6377bcb577b21471ae93639f8d
// return true as command was handled
return 1;
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 690086adcb1f87adc0b3ab664fde735ad3e1093a..959160c5859733d4029278054d9c970130d93ab8 100644
index a9dd0e5216e95afd98fd2200d110e2cc0b1b0dca..53913dfa4d9b73862179dcdef080c7e3adfe3b0f 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -1,6 +1,5 @@
@@ -815,7 +815,7 @@ index e2c24813f59c2fd075c740ac1842a38f20ed8554..1f7f68aad97ee73763c042837f239bdc
} 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 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6349b5fed 100644
index f1b28f4f383c682a52b6aa44dfbdf30944537ecf..4464ce6ff4fd8eb9570205c7326c9a47b67d634d 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;
@@ -837,7 +837,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system
private static MinecraftServer SERVER; // Paper
@@ -1039,7 +1034,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1038,7 +1033,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
@@ -845,7 +845,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
this.server.spark.disable(); // Paper - spark
// CraftBukkit start
if (this.server != null) {
@@ -1580,15 +1574,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1578,15 +1572,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -863,7 +863,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
// Paper end
this.server.spark.tickStart(); // Paper - spark
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
@@ -1625,9 +1618,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1623,9 +1616,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.pop();
// Paper end - Incremental chunk and player saving
// Paper start - move executeAll() into full server tick timing
@@ -874,7 +874,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
// Paper end
// Paper start - Server Tick Events
long endTime = System.nanoTime();
@@ -1651,7 +1642,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1649,7 +1640,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.logTickMethodTime(i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -882,7 +882,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
}
private void logTickMethodTime(long tickStartTime) {
@@ -1722,9 +1712,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1720,9 +1710,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.getPlayerList().getPlayers().forEach((entityplayer) -> {
entityplayer.connection.suspendFlushing();
});
@@ -892,7 +892,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
// Paper start - Folia scheduler API
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
getAllLevels().forEach(level -> {
@@ -1741,21 +1729,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1739,21 +1727,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");
@@ -914,7 +914,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
// 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()) {
@@ -1775,7 +1758,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1773,7 +1756,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end - Perf: Optimize time updates
@@ -922,7 +922,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
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
@@ -1802,9 +1784,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1800,9 +1782,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -932,7 +932,7 @@ index 5be09db47028094ea52889f3c74b6a928278346f..0d362b80044f05e3c6cae9d0f3ab9af6
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
@@ -1819,24 +1799,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1817,24 +1797,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
this.profiler.popPush("connection");

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

@@ -47,10 +47,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
assert isValidPath(path);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0d362b80044f05e3c6cae9d0f3ab9af6349b5fed..7ce0fb36690e12f3f36c9a43e45ac71814be8e69 100644
index 4464ce6ff4fd8eb9570205c7326c9a47b67d634d..7baa336edec37d8ca1d63f71b25d0daf035cdaf5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1808,6 +1808,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1806,6 +1806,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");

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

@@ -47,10 +47,10 @@ index 3e550f8e7cd4f4e16f499a8a2a4b95420270f07a..46d9c77581b78c427692aa8645d17b3d
private DisconnectionDetails disconnectionDetails;
private boolean encrypted;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7ce0fb36690e12f3f36c9a43e45ac71814be8e69..89c568a24df0323b902b5236484644a6edbea7ff 100644
index 7baa336edec37d8ca1d63f71b25d0daf035cdaf5..cb863f07d00e96b92e73dc312606110c259b4d5c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -319,6 +319,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -318,6 +318,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public volatile boolean abnormalExit = false; // Paper
public static final long SERVER_INIT = System.nanoTime(); // Paper - Lag compensation
@@ -59,7 +59,7 @@ index 7ce0fb36690e12f3f36c9a43e45ac71814be8e69..89c568a24df0323b902b5236484644a6
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
Thread thread = new ca.spottedleaf.moonrise.common.util.TickThread(() -> { // Paper - rewrite chunk system
@@ -746,6 +748,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -745,6 +747,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Paper end - Configurable player collision
@@ -68,7 +68,7 @@ index 7ce0fb36690e12f3f36c9a43e45ac71814be8e69..89c568a24df0323b902b5236484644a6
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
this.server.spark.enableAfterPlugins(this.server); // Paper - spark
@@ -1034,6 +1038,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1033,6 +1037,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
@@ -76,7 +76,7 @@ index 7ce0fb36690e12f3f36c9a43e45ac71814be8e69..89c568a24df0323b902b5236484644a6
this.server.spark.disable(); // Paper - spark
// CraftBukkit start
if (this.server != null) {
@@ -1800,6 +1805,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1798,6 +1803,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("connection");
this.getConnection().tick();
@@ -84,7 +84,7 @@ index 7ce0fb36690e12f3f36c9a43e45ac71814be8e69..89c568a24df0323b902b5236484644a6
this.profiler.popPush("players");
this.playerList.tick();
if (SharedConstants.IS_RUNNING_IN_IDE && this.tickRateManager.runsNormally()) {
@@ -3004,6 +3010,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -3002,6 +3008,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return ServerLinks.EMPTY;
}
@@ -102,7 +102,7 @@ index 7ce0fb36690e12f3f36c9a43e45ac71814be8e69..89c568a24df0323b902b5236484644a6
public void close() {
diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
index 9fabf9322acd663c4452b562494e74aa42eb19da..b5f18a0115b629930de84a9d086505adaa6087dd 100644
index 862a4bf003b7f810fb57dbcd150a1417c902b633..d872455c590062ac6c98bd17783c7466a90178e5 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
@@ -221,6 +221,11 @@ public class PlayerAdvancements {

4
patches/server/0023-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 c68e0a6715c690298268457d6438b12cd5c6baf2..f742d01b441644f5de845c772a779eba0d49d6c1 100644
index cb863f07d00e96b92e73dc312606110c259b4d5c..4c8cf72e44e991920ed6a6110d811530c77adbbe 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2559,6 +2559,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2557,6 +2557,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {

4
patches/server/0035-PCA-sync-protocol.patch
View File

@@ -156,10 +156,10 @@ index f933fa419a4b55b0096ff42caf1b071d027b8e7e..c8891f72d3353faf4afe5b49e1759ee0
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
index a2fafef89d5354e2cb02f5672810909950a57777..54c18c771b96b30167cb5fb4ff1b0c9c63607d47 100644
index bf2c303a314205590a2839e0f729af3a9ff40a86..668eb459a6772055ebd99a0723df127453c4af57 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
@@ -334,6 +334,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
@@ -332,6 +332,16 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
return this.canPlaceItem(slot, stack);
}

4
patches/server/0040-Stackable-ShulkerBoxes.patch
View File

@@ -58,7 +58,7 @@ index d04bf7d06855022c973073fb84c5d3d65f2553e1..9bedd76330e71ca7f3feecf0b90ec960
if (j > 0) {
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index 607f1a9802eb0ff4865af4c53f302128a6e6fe02..929a9bee808e8216dacb74dc58dbeee612126afe 100644
index 4423973d4d9a2c3879d98d1d4c8b8c117c677ac5..4259852e2387c87cb692e44b2d1a3f5d1cfcd616 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -22,10 +22,12 @@ import net.minecraft.world.entity.EntityType;
@@ -82,7 +82,7 @@ index 607f1a9802eb0ff4865af4c53f302128a6e6fe02..929a9bee808e8216dacb74dc58dbeee6
import org.bukkit.event.entity.EntityPickupItemEvent;
import org.bukkit.event.entity.EntityRemoveEvent;
import org.bukkit.event.player.PlayerPickupItemEvent;
@@ -315,10 +318,49 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -314,10 +317,49 @@ public class ItemEntity extends Entity implements TraceableEntity {
private boolean isMergable() {
ItemStack itemstack = this.getItem();

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

@@ -20,10 +20,10 @@ index 1f7f68aad97ee73763c042837f239bdc7167db55..1e8025ecb14acc7c24917793c97f5435
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 5b1ab285e5a4020320d576034d9dbe6e3369b0c3..717754130af0e97b89b0b754328ca80e41dc46d1 100644
index bf1bb8fa681360c3b634bcd6d8979cc2c5137957..236ad5ac3f4665ff940c6505ca1d01c6ace7f316 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1789,7 +1789,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1787,7 +1787,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {

4
patches/server/0049-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 557ef158dacf00b4565055019aa9532809c6bffb..dc3972dd9340febc7540cc32160291c4945dec85 100644
index 236ad5ac3f4665ff940c6505ca1d01c6ace7f316..53c97644f30e61d7e2ccab2024714b8aa135287f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1822,6 +1822,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1820,6 +1820,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
org.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol

4
patches/server/0079-Disable-packet-limit.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable packet limit
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 959160c5859733d4029278054d9c970130d93ab8..239b180914547aa800406cfe19519f5153b3c9ef 100644
index 53913dfa4d9b73862179dcdef080c7e3adfe3b0f..0d41f7561f11d11a69399c191881afa2abadd9ff 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -276,7 +276,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -283,7 +283,7 @@ public class GlobalConfiguration extends ConfigurationPart {
}
public boolean isEnabled() {

6
patches/server/0095-Replay-Mod-API.patch
View File

@@ -108,10 +108,10 @@ index c8d39e6e1c570c9219f6066da273dc0130920519..96a074281d16a7f64058619da4b102f3
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 1c0a99c335162a9cd983d4c4d2cfeaf12be93899..a598fcf9d67ec29668b36f70d6980831f7de2fea 100644
index 53c97644f30e61d7e2ccab2024714b8aa135287f..0c43170b31363beca32407bddeee33ef9404d09a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1692,7 +1692,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1690,7 +1690,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
private ServerStatus.Players buildPlayerStatus() {
@@ -121,7 +121,7 @@ index 1c0a99c335162a9cd983d4c4d2cfeaf12be93899..a598fcf9d67ec29668b36f70d6980831
if (this.hidesOnlinePlayers()) {
diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
index ece0aa3bf18e864a261d4d4edf0a98a40e7f6bb3..4bb2d9bb0ef50669e22bd71487dd4e4ae7589147 100644
index 088d6afcfcaba03eda0898c0466106baf110d497..9b178c22e4280570309820667a5dac3fe0368a2c 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
@@ -227,7 +227,7 @@ public class PlayerAdvancements {

12
patches/server/0108-Make-Item-tick-vanilla.patch
View File

@@ -5,20 +5,20 @@ Subject: [PATCH] Make Item tick vanilla
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index 9205d565f375a8177c6bc0c19e1f594d1d8cd0ed..1412cf425fb346e2b155f494d0867f1a06e1b3a1 100644
index 510735cc63968265d2e1d9deb1a06beda3112ed9..2d885a09fc7bd7c2df76321147c75eeb46808b48 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -252,6 +252,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -250,6 +250,9 @@ public class ItemEntity extends Entity implements TraceableEntity {
// Spigot start - copied from above
@Override
public void inactiveTick() {
+ // Leaves start - vanilla
+ this.tick();
+ /*
// CraftBukkit start - Use wall time for pickup and despawn timers
int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
@@ -269,6 +272,8 @@ public class ItemEntity extends Entity implements TraceableEntity {
// Paper start - remove anti tick skipping measures / wall time - copied from above
if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
--this.pickupDelay;
@@ -268,6 +271,8 @@ public class ItemEntity extends Entity implements TraceableEntity {
// CraftBukkit end
this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
}

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

@@ -59,10 +59,10 @@ index 58d3d1a47e9f2423c467bb329c2d5f4b58a8b5ef..ea1ffe6b5e49ccf2b472829ed97e977b
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 a598fcf9d67ec29668b36f70d6980831f7de2fea..d6c5b8ee987ba73643a88e4a9337a54bfa7f792f 100644
index 0c43170b31363beca32407bddeee33ef9404d09a..3b4d1bd023904ead8b340021acd1d74b5aa53a87 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -750,6 +750,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -749,6 +749,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.getBotList().loadResume(); // Leaves - load resident bot
@@ -70,7 +70,7 @@ index a598fcf9d67ec29668b36f70d6980831f7de2fea..d6c5b8ee987ba73643a88e4a9337a54b
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
this.server.spark.enableAfterPlugins(this.server); // Paper - spark
@@ -1021,6 +1022,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1020,6 +1021,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
public void stopServer() {