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-01-19 11:09:19 +08:00
parent 25f3bfe8c6
commit bb617373a6
51 changed files with 303 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT
mcVersion=1.20.4
packageVersion=1_20_R3
org.gradle.jvmargs=-Xmx2G
paperRef=07b956e3a30d9cd192111829b59bdf4372f128b1
paperRef=106c67a811a857293b934c453752e73579c6ed8c
preVersion=false
updatingMinecraft=false

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d3081d4445af73c2c7b23c5fc60861f184ac808e..10c1bbd104bd0be9dc705971c67cf71cedd42f26 100644
index bf4b94ea2577e9d7e344385209fc0644a4e6bfbb..80243685dfaa7860e8bc8197626b8dbe5318f7a8 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4238,6 +4238,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4236,6 +4236,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
void setSendViewDistance(int viewDistance);
// Paper end - view distance api

31
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 58da26ad2f128ba0b66f86820f60853f4be352f0..914c6520398045ad30537d7493a79a55ad4ddee2 100644
index 444ff797c70b0e285d4272ea2ce3d72453c9bda5..32fb084862ce074cdbf69fff4847aa31bfd08db2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -23,7 +23,7 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..914c6520398045ad30537d7493a79a55
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -58,19 +62,29 @@ dependencies {
@@ -57,19 +61,29 @@ dependencies {
}
val craftbukkitPackageVersion = "1_20_R3" // Paper
@@ -55,7 +55,7 @@ index 58da26ad2f128ba0b66f86820f60853f4be352f0..914c6520398045ad30537d7493a79a55
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -154,7 +168,7 @@ fun TaskContainer.registerRunTask(
@@ -153,7 +167,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -153,10 +153,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..9ce4d3d96d2d5fbde1f0af599209c6c5
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..8a4de5d230679889c8ef8388f09c662b74759a6e 100644
index c1c1763de0ad0376c504946cbfd7bbd5b0cff0fd..abf4346111f682ca59d009f29a9c247057e44f12 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1866,7 +1866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1852,7 +1852,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -166,25 +166,24 @@ index 34f19ac897a30c0c4e3ab406013fcca1c8b7db93..8a4de5d230679889c8ef8388f09c662b
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 58536aabf607015939a1326f80207c0a06eed8ff..5a07dad83602425b35f480cf8a31ed328cdfe640 100644
index cb7fe116a29916761299a808572f76547d143971..fe04db99bb6e56cb23f9dbd9a8992837ada2cd6e 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -217,11 +217,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash);
@@ -218,10 +218,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized
io.papermc.paper.command.PaperCommands.registerCommands(this);
- com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
- com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+ com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Leaves - down
+ com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
+
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 142d2c48239d4ebe3896218536656d116cd24d7c..9e4002e82dba3a09a3a8346aebba34f30f902dff 100644
index 70274239aa95d41953291d138cc46e0d7b491a8a..12b5796ac962b73a36538d313b77c07784d6ebe7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
@@ -197,7 +196,7 @@ index 142d2c48239d4ebe3896218536656d116cd24d7c..9e4002e82dba3a09a3a8346aebba34f3
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index a74a8a027c99eef199c1a6a54232ac2c8ffb9d08..1cc94f4edd225524b31c73700e624a6b3e2aa7db 100644
index 16e73128115ef92adefbd7818fef3a4b9bcebad2..9badf09271a4ff99874110cf0622000d1eb71546 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -301,7 +301,7 @@ public class Main {

108
patches/server/0002-Delete-Timings.patch
View File

@@ -845,7 +845,7 @@ diff --git a/src/main/java/net/minecraft/commands/CommandFunction.java b/src/mai
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
index c5c734b9eb80d1cdf0e9fd8a043f2b6d1f4cbffe..de9a8ba5317d6e5ae682a2376c8d04512a0b0936 100644
index 3e2d5dcd62775b6ed7c0ce0ba51a71b635b1d644..d0a487f0d563181818c5670749e8dd3a9d939265 100644
--- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
+++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
@@ -49,8 +49,7 @@ public class PacketUtils {
@@ -859,7 +859,7 @@ index c5c734b9eb80d1cdf0e9fd8a043f2b6d1f4cbffe..de9a8ba5317d6e5ae682a2376c8d0451
} catch (Exception exception) {
label25:
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e850760e0 100644
index abf4346111f682ca59d009f29a9c247057e44f12..19c388c98d7e86391b4798bcf3a19d9932c81aed 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;
@@ -889,7 +889,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
// CraftBukkit start
if (this.server != null) {
this.server.disablePlugins();
@@ -1399,34 +1393,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1393,34 +1387,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@@ -943,7 +943,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
}
}
// Paper end - execute chunk tasks mid tick
@@ -1501,15 +1490,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1495,15 +1484,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -961,7 +961,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
// Paper end
new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
@@ -1546,9 +1534,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1540,9 +1528,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Paper end
io.papermc.paper.util.CachedLists.reset(); // Paper
// Paper start - move executeAll() into full server tick timing
@@ -972,7 +972,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
// Paper end
// Paper start
long endTime = System.nanoTime();
@@ -1573,7 +1559,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1567,7 +1553,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.logTickTime(l - i);
this.profiler.pop();
org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -980,7 +980,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
}
private int computeNextAutosaveInterval() {
@@ -1635,9 +1620,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1629,9 +1614,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.getPlayerList().getPlayers().forEach((entityplayer) -> {
entityplayer.connection.suspendFlushing();
});
@@ -990,7 +990,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
// Paper start - Folia scheduler API
((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
getAllLevels().forEach(level -> {
@@ -1654,21 +1637,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1648,21 +1631,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");
@@ -998,7 +998,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
this.getFunctions().tick();
- MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
this.profiler.popPush("levels");
//Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
//Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
// CraftBukkit start
// Run tasks that are waiting on processing
@@ -1012,15 +1012,15 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
// Send time updates to everyone, it will get the right time from the world the player is in.
// Paper start - optimize time updates
for (final ServerLevel level : this.getAllLevels()) {
@@ -1688,7 +1666,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1682,7 +1660,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
// Paper end
- MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
this.isIteratingOverLevels = true; // Paper
Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
@@ -1713,14 +1690,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
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
@@ -1707,14 +1684,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {
@@ -1033,10 +1033,10 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
// Paper end
- worldserver.timings.doTick.stopTiming(); // Spigot
} catch (Throwable throwable) {
// Spigot Start
CrashReport crashreport;
@@ -1743,24 +1718,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper
CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
@@ -1729,24 +1704,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
this.profiler.popPush("connection");
- MinecraftTimings.connectionTimer.startTiming(); // Spigot // Paper
@@ -1061,7 +1061,7 @@ index 8a4de5d230679889c8ef8388f09c662b74759a6e..a67ddd1ca3f18e6754dd52d9f34e5d2e
this.profiler.popPush("send chunks");
iterator = this.playerList.getPlayers().iterator();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 5a07dad83602425b35f480cf8a31ed328cdfe640..11d26f4a84792019ce9ad6886bd96214cd73a320 100644
index fe04db99bb6e56cb23f9dbd9a8992837ada2cd6e..7fb484e4a97070e75b8611a59d84c9732ed5d17b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -58,7 +58,6 @@ import org.apache.logging.log4j.Level;
@@ -1111,7 +1111,7 @@ index 5a07dad83602425b35f480cf8a31ed328cdfe640..11d26f4a84792019ce9ad6886bd96214
// Paper start
if (waitableArray[0] != null) {
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index ecb09c74153349e78bb81d1188c282e4be4000bf..bfc7ba2238e1abc7f0a0ead102c00f8daf4081a2 100644
index 4160fff108cc83bc0a1f0a0389ab22f722d483b4..9ea2c8d06af2f6e082f8a2401092a7878afa9487 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1,13 +1,10 @@
@@ -1380,7 +1380,7 @@ index 44ada45d9bf2d9b48e5de1c3cb1a855902f3884b..d6089c0d0b076d232834619bc93bc64f
gameprofilerfiller.pop();
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da2c782d03 100644
index 9801b283da75aa63d7eba33d08322285c86c241c..21b40a47160bd2904cb0a482c066d3866c804187 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,6 @@
@@ -1391,7 +1391,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
import com.google.common.collect.Lists;
import com.mojang.datafixers.DataFixer;
import com.mojang.datafixers.util.Pair;
@@ -851,7 +850,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -850,7 +849,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
gameprofilerfiller.popPush("tickPending");
@@ -1399,7 +1399,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
if (!this.isDebug() && flag) {
j = this.getGameTime();
gameprofilerfiller.push("blockTicks");
@@ -860,24 +858,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -859,24 +857,17 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.fluidTicks.tick(j, 65536, this::tickFluid);
gameprofilerfiller.pop();
}
@@ -1424,7 +1424,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
}
this.handlingTick = false;
@@ -890,7 +881,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -889,7 +880,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (flag1 || this.emptyTime++ < 300) {
gameprofilerfiller.push("entities");
@@ -1432,7 +1432,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
if (this.dragonFight != null && flag) {
gameprofilerfiller.push("dragonFight");
this.dragonFight.tick();
@@ -898,7 +888,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -897,7 +887,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -1440,7 +1440,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
this.entityTickList.forEach((entity) -> {
if (!entity.isRemoved()) {
if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
@@ -925,8 +914,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -924,8 +913,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
});
@@ -1449,7 +1449,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
gameprofilerfiller.pop();
this.tickBlockEntities();
}
@@ -1039,7 +1026,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1038,7 +1025,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
} // Paper
gameprofilerfiller.popPush("tickBlocks");
@@ -1457,7 +1457,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
if (randomTickSpeed > 0) {
// Paper start - optimize random block ticking
LevelChunkSection[] sections = chunk.getSections();
@@ -1073,7 +1059,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1072,7 +1058,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper end - optimise random block ticking
@@ -1465,7 +1465,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
gameprofilerfiller.pop();
}
@@ -1386,9 +1371,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1385,9 +1370,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
currentlyTickingEntity.lazySet(entity);
}
// Paper end - log detailed entity tick information
@@ -1475,7 +1475,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
/*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
entity.tickCount++;
timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings
@@ -1397,11 +1380,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1396,11 +1379,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
return;
}*/ // Paper - comment out EAR 2
// Spigot end
@@ -1487,7 +1487,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
entity.setOldPosAndRot();
ProfilerFiller gameprofilerfiller = this.getProfiler();
@@ -1411,12 +1390,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1410,12 +1389,10 @@ public class ServerLevel extends Level implements WorldGenLevel {
});
gameprofilerfiller.incrementCounter("tickNonPassenger");
if (isActive) { // Paper - EAR 2
@@ -1500,7 +1500,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
Iterator iterator = entity.getPassengers().iterator();
while (iterator.hasNext()) {
@@ -1439,8 +1416,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1438,8 +1415,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
// Paper - EAR 2
final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
@@ -1509,7 +1509,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -1469,8 +1444,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1468,8 +1443,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.tickPassenger(passenger, entity2);
}
@@ -1518,7 +1518,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
}
} else {
passenger.stopRiding();
@@ -1490,26 +1463,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1489,26 +1462,22 @@ public class ServerLevel extends Level implements WorldGenLevel {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
}
@@ -1557,7 +1557,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
}
// Paper end
@@ -1523,7 +1492,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1522,7 +1491,6 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (!savingDisabled) {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit
@@ -1565,7 +1565,7 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
if (progressListener != null) {
progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
}
@@ -1533,11 +1501,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1532,11 +1500,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
progressListener.progressStage(Component.translatable("menu.savingChunks"));
}
@@ -1578,10 +1578,10 @@ index 7c31f619a6e8e3539c547fc43d821d2cce7df7e7..ce4eb725a0a9b401a4f27b8047b463da
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8b630fc4da8a7fda08c416e70c22463f04c3b6b5..a2eed9b45b2690d1af3b8f8dfb17c7b8ad3dd0cc 100644
index cafd0cde26a623861c7d3d01b496cb32fdc77335..b51fec201db06edbbfb5e6e8abd137bd194cb542 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2398,7 +2398,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2400,7 +2400,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
public void handleCommand(String s) { // Paper - private -> public
org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
@@ -1589,7 +1589,7 @@ index 8b630fc4da8a7fda08c416e70c22463f04c3b6b5..a2eed9b45b2690d1af3b8f8dfb17c7b8
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2408,20 +2407,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2410,20 +2409,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -1612,7 +1612,7 @@ index 8b630fc4da8a7fda08c416e70c22463f04c3b6b5..a2eed9b45b2690d1af3b8f8dfb17c7b8
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index e98a455b6bca9d094d0da323bddd7b3f2c07bb23..192eeaffd6d51baca149c7b9eaccf53246cb3af5 100644
index be474729d41b37968b53b84eb87ac96a4d7d46a4..3f437ca10d3bfc839ac85590dec677cd84629db6 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,5 @@
@@ -1639,7 +1639,7 @@ index e98a455b6bca9d094d0da323bddd7b3f2c07bb23..192eeaffd6d51baca149c7b9eaccf532
}
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 6cfce9755dd464a7afb01f9032e567ce3bcd5bc5..738147183b7efd0247baab55334fb85ce1af4f33 100644
index 081937597a8984b52a1e92d4c6032c04c942116e..3d05784d9ed8ac725fc019fbbb8255e57884e8b7 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -331,10 +331,6 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -1667,7 +1667,7 @@ index 6cfce9755dd464a7afb01f9032e567ce3bcd5bc5..738147183b7efd0247baab55334fb85c
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 bc908b75cb99536df658281ae7f8b4eeedbbedc9..9e2d9c4b3d15f03e7babc3468b60fe9075a65a3a 100644
index e914c36bede52838f47cd88b442b9cde3e4666f3..327af739b30b94e06d94ccde6473f7d762c808d5 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -1754,7 +1754,7 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..b68c69a7ab71926ecf478d8daa5ec5ac
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 6403341f2e9d7ac4251336cb0bcc5d79dbb7bb0e..2f1e70a695b222dfa832b5d2c81544bc314b1aec 100644
index 1496b870eaf99d4c3b6dd01159d7c2893fd9366b..e7c8d223fb6d82b017031d58a17050081e70ff3b 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1,10 +1,7 @@
@@ -1812,7 +1812,7 @@ index 6403341f2e9d7ac4251336cb0bcc5d79dbb7bb0e..2f1e70a695b222dfa832b5d2c81544bc
public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -179,7 +169,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end
// Paper end - add paper world config
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
- public final co.aikar.timings.WorldTimingsHandler timings; // Paper
@@ -1854,7 +1854,7 @@ index 6403341f2e9d7ac4251336cb0bcc5d79dbb7bb0e..2f1e70a695b222dfa832b5d2c81544bc
this.spigotConfig.currentPrimedTnt = 0; // Spigot
}
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 3cdddda9c0618e95288b81b975d499c8dd30c05f..aec5396b7dea8ba45f82f487719d42a1ab0794ec 100644
index dc211c6aedc178ac50b7d05aab3662c422211cbd..45ddd30ca0744901e3d40a8d26c490ca08471cff 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -133,7 +133,6 @@ public final class NaturalSpawner {
@@ -1874,7 +1874,7 @@ index 3cdddda9c0618e95288b81b975d499c8dd30c05f..aec5396b7dea8ba45f82f487719d42a1
}
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index e21867d3956078bb0db4ceed45e5811e9acd7377..67e1362a398daf13e128b64523e8db69fbb46fe1 100644
index 3f2fdf73e2e520838c7b59fe994e67ab2d1a4d6b..2c1b9221b936c8f8bb00970cfe1100161ecffd36 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -103,13 +103,6 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -1892,7 +1892,7 @@ index e21867d3956078bb0db4ceed45e5811e9acd7377..67e1362a398daf13e128b64523e8db69
@Nullable
private String descriptionId;
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
index 370a25d2deb54f10a35ee24d9e7e92fbfde60edf..ca8a5ae1df1761588233068f9c8288d02b171b9d 100644
index 4ce7a7947fa727e64556148f923508ce76c128c4..bfc81572df24b5afbacee6f290cffaa9ca3e01c1 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
@@ -21,14 +21,9 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
@@ -1904,17 +1904,17 @@ index 370a25d2deb54f10a35ee24d9e7e92fbfde60edf..ca8a5ae1df1761588233068f9c8288d0
-import co.aikar.timings.Timing; // Paper
-
public abstract class BlockEntity {
static boolean ignoreTileUpdates; // Paper
static boolean ignoreTileUpdates; // Paper - Perf: Optimize Hoppers
- public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
// CraftBukkit start - data containers
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index fa170cc1ce7011d201295b89718292d696c7fc24..6b47cd3dfd0b7a9fc670522d8591e2f44fcde54c 100644
index 27e8ee4507460b1cc72de692b41562b9f4f13929..b544446deb857a6a580b7a7be5a1ea571f996ff6 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -786,7 +786,6 @@ public class LevelChunk extends ChunkAccess {
@@ -785,7 +785,6 @@ public class LevelChunk extends ChunkAccess {
this.chunkHolder.getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system
if (this.needsDecoration) {
@@ -1922,7 +1922,7 @@ index fa170cc1ce7011d201295b89718292d696c7fc24..6b47cd3dfd0b7a9fc670522d8591e2f4
this.needsDecoration = false;
java.util.Random random = new java.util.Random();
random.setSeed(this.level.getSeed());
@@ -806,7 +805,6 @@ public class LevelChunk extends ChunkAccess {
@@ -805,7 +804,6 @@ public class LevelChunk extends ChunkAccess {
}
}
server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
@@ -1930,7 +1930,7 @@ index fa170cc1ce7011d201295b89718292d696c7fc24..6b47cd3dfd0b7a9fc670522d8591e2f4
}
}
}
@@ -1164,7 +1162,6 @@ public class LevelChunk extends ChunkAccess {
@@ -1163,7 +1161,6 @@ public class LevelChunk extends ChunkAccess {
ProfilerFiller gameprofilerfiller = LevelChunk.this.level.getProfiler();
gameprofilerfiller.push(this::getType);
@@ -1938,7 +1938,7 @@ index fa170cc1ce7011d201295b89718292d696c7fc24..6b47cd3dfd0b7a9fc670522d8591e2f4
BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
if (this.blockEntity.getType().isValid(iblockdata)) {
@@ -1185,9 +1182,6 @@ public class LevelChunk extends ChunkAccess {
@@ -1184,9 +1181,6 @@ public class LevelChunk extends ChunkAccess {
LevelChunk.this.removeBlockEntity(this.getPos());
// Paper end
// Spigot start
@@ -1949,7 +1949,7 @@ index fa170cc1ce7011d201295b89718292d696c7fc24..6b47cd3dfd0b7a9fc670522d8591e2f4
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 1cc94f4edd225524b31c73700e624a6b3e2aa7db..01d907e3266095bb33d3a73dc56004fd79043943 100644
index 9badf09271a4ff99874110cf0622000d1eb71546..dd95c9d931da5ee2cb3e620c71cc90d178c51fbc 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -343,8 +343,8 @@ public class Main {
@@ -2119,7 +2119,7 @@ index ec2396f0e5d62b10450eaa7239a8c5479638b3c3..995ae8f2f76bf0255d7eac4190c5b961
// Paper end
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 2d31752478636bd21bbff5b430e5acb76b5d91c2..3fc29e9f261f5f8e2b87ef2e20f430e9918cddbe 100644
index fafc8b84d6b6368c70b8eedfdb4c3a9deace9c26..97806af3f12bc44036418b2829191e0f83519ce5 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -34,7 +34,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity;

10
patches/server/0003-Leaves-Server-Utils.patch
View File

@@ -31,18 +31,18 @@ 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 1be10c57e374ad4018c08d96cfb69397a2f541d3..01f2f5ddbc41b0096e3c07170c0b0a40e728bf06 100644
index 92f9d55c224cd4e25060d8751ccb28a978979241..734273b452caf133a7e4671c53c670c94a0c7ee1 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -422,6 +422,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -424,6 +424,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
private UUID originWorld;
public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
public boolean fixedPose = false; // Paper
public boolean fixedPose = false; // Paper - Expand Pose API
+ private CompoundTag leavesData = new CompoundTag(); // Leaves - Leaves ex data
public void setOrigin(@javax.annotation.Nonnull Location location) {
this.origin = location.toVector();
@@ -2477,6 +2478,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2479,6 +2480,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
nbttagcompound.putBoolean("Paper.FreezeLock", true);
}
// Paper end
@@ -50,7 +50,7 @@ index 1be10c57e374ad4018c08d96cfb69397a2f541d3..01f2f5ddbc41b0096e3c07170c0b0a40
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -2624,6 +2626,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2626,6 +2628,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
freezeLocked = nbt.getBoolean("Paper.FreezeLock");
}
// Paper end

24
patches/server/0005-Leaves-Server-Config-And-Command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config And Command
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a67ddd1ca3f18e6754dd52d9f34e5d2e850760e0..fe547d04abece42bdc0d0897e2d3f2e6c190c455 100644
index 19c388c98d7e86391b4798bcf3a19d9932c81aed..e5d331d0e5bf2d80685289430682ca7a9ccbefff 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1143,6 +1143,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -17,21 +17,21 @@ index a67ddd1ca3f18e6754dd52d9f34e5d2e850760e0..fe547d04abece42bdc0d0897e2d3f2e6
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
Arrays.fill( this.recentTps, 20 );
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 11d26f4a84792019ce9ad6886bd96214cd73a320..570310512c9ce5cf87f3fffe20d6d88c651aa83a 100644
index 7fb484e4a97070e75b8611a59d84c9732ed5d17b..27f7507a50537ec76f88518d3584d7c880f6eee4 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -219,6 +219,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
+
@@ -220,6 +220,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // Paper - init PaperBrigadierProvider
+ top.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
+ System.setProperty("spark.serverconfigs.extra", "leaves.yml"); // Leaves - spark config
+
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Leaves - down
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 9e4002e82dba3a09a3a8346aebba34f30f902dff..417a808d2b99a0a3f499a457c93afb9494d22fff 100644
index 12b5796ac962b73a36538d313b77c07784d6ebe7..98e673938df540f47ef882620daadd2da566f671 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
@@ -42,7 +42,7 @@ index 9e4002e82dba3a09a3a8346aebba34f30f902dff..417a808d2b99a0a3f499a457c93afb94
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -3010,6 +3011,14 @@ public final class CraftServer implements Server {
@@ -3009,6 +3010,14 @@ public final class CraftServer implements Server {
{
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -58,7 +58,7 @@ index 9e4002e82dba3a09a3a8346aebba34f30f902dff..417a808d2b99a0a3f499a457c93afb94
@Override
public void restart() {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 01d907e3266095bb33d3a73dc56004fd79043943..06c00aa070334deeae96524b35ff129547e675ea 100644
index dd95c9d931da5ee2cb3e620c71cc90d178c51fbc..d1ebe4f340c53f987a42fffcc462f2eab4686d1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -166,6 +166,14 @@ public class Main {

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

@@ -23,10 +23,10 @@ index af86f752c33a2990405fea058b7c41c437ba9d46..bada9fae1e7178162429e1f5a1608b9c
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fe547d04abece42bdc0d0897e2d3f2e6c190c455..eb376bf0cb055fb3ddb05e5a0ff8602a0108f772 100644
index e5d331d0e5bf2d80685289430682ca7a9ccbefff..cba7872ef6fd648e2a9b4c997a97ae314557213c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1728,6 +1728,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1714,6 +1714,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");
@@ -56,7 +56,7 @@ index d28d0ef6105ddeb562ddf31ae9088739856941fc..9b73df7fbd869ce51bd01a8d8b46d00f
} catch (Exception ex) {
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 192eeaffd6d51baca149c7b9eaccf53246cb3af5..00f4ee320f8a8d019cb311cee78bb38445835952 100644
index 3f437ca10d3bfc839ac85590dec677cd84629db6..3dba9e1361d8ea978f1a7f54d6fd03aab02053f4 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -346,6 +346,8 @@ public abstract class PlayerList {
@@ -77,7 +77,7 @@ index 192eeaffd6d51baca149c7b9eaccf53246cb3af5..00f4ee320f8a8d019cb311cee78bb384
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 417a808d2b99a0a3f499a457c93afb9494d22fff..1e904d37a4646ebd2c3913fb6157342678c06ba9 100644
index 98e673938df540f47ef882620daadd2da566f671..c8e938ec5b740b2ffd198cccc349d6ae69cda50d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -463,6 +463,7 @@ public final class CraftServer implements Server {

6
patches/server/0007-Fix-gravity-block-duper.patch
View File

@@ -5,10 +5,10 @@ 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 01f2f5ddbc41b0096e3c07170c0b0a40e728bf06..dc85c4d6b6fb9ca9d1dbd2e696616cc347f1c05a 100644
index 734273b452caf133a7e4671c53c670c94a0c7ee1..b1a4824b23f15f944077bce56170f1a790575c48 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -504,38 +504,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -506,38 +506,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
public boolean updatingSectionStatus = false;
// Paper end
@@ -58,7 +58,7 @@ index 01f2f5ddbc41b0096e3c07170c0b0a40e728bf06..dc85c4d6b6fb9ca9d1dbd2e696616cc3
}
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 45c07733f03b5c11f6d8e820f65dc950c70d9a67..414c949bdfcac9e21ee958fd878a5230f3ccd5fe 100644
index 21a4669b01e9c57100224e20500bc23f8e101434..65d60a0a27fa9e05b86b32dada49b5c36e56f39b 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -132,11 +132,7 @@ public class FallingBlockEntity extends Entity {

4
patches/server/0008-Fix-trading-with-the-void.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ce4eb725a0a9b401a4f27b8047b463da2c782d03..90626c175b8bb496e2e1c18cc8a501d8eff44a87 100644
index 21b40a47160bd2904cb0a482c066d3866c804187..9be0aa933b2a1d5d2962871102ffa576df56245b 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2810,11 +2810,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2809,11 +2809,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Fakeplayer support
diff --git a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
index 31fa6a0cb00139bfcb71f4fd30da8b736bf491f2..1ad8b58fc3e97026173727fd4bb847823942a474 100644
index 00bf770559d9c628119658cb027eb0b970c04e1b..7284df7d0d4242f55ecd63df2c137ec3e7c2f25c 100644
--- a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
+++ b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java
@@ -42,6 +42,7 @@ public abstract class SimpleCriterionTrigger<T extends SimpleCriterionTrigger.Si
@@ -36,7 +36,7 @@ index 2ae08b21c63490bbf8cd870f9585d82ed131f815..c6f773afc39e7c97d13d1977a7609fc4
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 eb376bf0cb055fb3ddb05e5a0ff8602a0108f772..37af0a508cfe56f23be806d2d4100d890ad5e7ec 100644
index cba7872ef6fd648e2a9b4c997a97ae314557213c..85169a9082268fa77453a64196a419d59cb88c9a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -123,6 +123,7 @@ import net.minecraft.util.profiling.metrics.storage.MetricsPersister;
@@ -81,7 +81,7 @@ index f655e0ae4a287886d0291cd0089bad2000249d0f..2694f899241ad8ce06d3bcba78550af5
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index bfc7ba2238e1abc7f0a0ead102c00f8daf4081a2..d79966a3c97af600b39890f9953a5fefa1e7b486 100644
index 9ea2c8d06af2f6e082f8a2401092a7878afa9487..738787aa0212829a15770f65e37441a3fa76812d 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1417,6 +1417,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -99,7 +99,7 @@ index bfc7ba2238e1abc7f0a0ead102c00f8daf4081a2..d79966a3c97af600b39890f9953a5fef
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index be05a52be037042c6158100e2ce880b8ed415d53..d9038d85f8a04381a92567acf1c8922d666aa3e8 100644
index 3506cd1c5960b58fe2805d9cc7ea6758f45d4e2a..41acc2e1883af2220dcdfb9bbefef1976a54d202 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -186,6 +186,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -148,14 +148,14 @@ index be05a52be037042c6158100e2ce880b8ed415d53..d9038d85f8a04381a92567acf1c8922d
CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
}
@@ -947,7 +952,7 @@ public class ServerPlayer extends Player {
List<DefaultDrop> loot = new java.util.ArrayList<>(this.getInventory().getContainerSize()); // Paper
List<DefaultDrop> loot = new java.util.ArrayList<>(this.getInventory().getContainerSize()); // Paper - Restore vanilla drops behavior
boolean keepInventory = this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || this.isSpectator();
- if (!keepInventory) {
+ if (!keepInventory || this instanceof ServerBot) { // Leaves - skip bot
for (ItemStack item : this.getInventory().getContents()) {
if (!item.isEmpty() && !EnchantmentHelper.hasVanishingCurse(item)) {
loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false))); // Paper - drop function taken from Inventory#dropAll (don't fire drop event)
loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false))); // Paper - Restore vanilla drops behavior; drop function taken from Inventory#dropAll (don't fire drop event)
@@ -1272,6 +1277,13 @@ public class ServerPlayer extends Player {
this.lastSentHealth = -1.0F;
this.lastSentFood = -1;
@@ -171,7 +171,7 @@ index be05a52be037042c6158100e2ce880b8ed415d53..d9038d85f8a04381a92567acf1c8922d
PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a2eed9b45b2690d1af3b8f8dfb17c7b8ad3dd0cc..0fe509e4e47cfb9d2a96704a35f7532865684db8 100644
index b51fec201db06edbbfb5e6e8abd137bd194cb542..e60bc1b390cd47c2c97735a0dcbe1ecc2c515640 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -298,7 +298,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -190,7 +190,7 @@ index a2eed9b45b2690d1af3b8f8dfb17c7b8ad3dd0cc..0fe509e4e47cfb9d2a96704a35f75328
player.connection = this;
player.getTextFilter().join();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 00f4ee320f8a8d019cb311cee78bb38445835952..52f6ef8702a1902df079b1ec34282b46aae5d01e 100644
index 3dba9e1361d8ea978f1a7f54d6fd03aab02053f4..89249723a490c5b08916241279ab94f82e41a942 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -120,6 +120,8 @@ import org.bukkit.event.player.PlayerRespawnEvent.RespawnReason;
@@ -274,10 +274,10 @@ index 00f4ee320f8a8d019cb311cee78bb38445835952..52f6ef8702a1902df079b1ec34282b46
+ // 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 dc85c4d6b6fb9ca9d1dbd2e696616cc347f1c05a..f9e9b708eecae0dfdb283899ac293ddbfb986ade 100644
index b1a4824b23f15f944077bce56170f1a790575c48..d28f4e71a370606cf1626f7176aef815365b6cbe 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1424,7 +1424,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1426,7 +1426,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return offsetFactor;
}
@@ -287,7 +287,7 @@ index dc85c4d6b6fb9ca9d1dbd2e696616cc347f1c05a..f9e9b708eecae0dfdb283899ac293ddb
final boolean xZero = movement.x == 0.0;
final boolean yZero = movement.y == 0.0;
diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
index a2093158e57d5f43c4afa66386481b82b3c4c3c4..35672105a000d87c7fe82eb65456d891b3bd983d 100644
index 5706c9b744b660d6f7639b8152dce82799c4b466..50b0711cd62224ed3e26da45831673c36601f6e5 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
@@ -61,7 +61,7 @@ public class FishingHook extends Projectile {
@@ -300,7 +300,7 @@ index a2093158e57d5f43c4afa66386481b82b3c4c3c4..35672105a000d87c7fe82eb65456d891
private int timeUntilHooked;
private float fishAngle;
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
index 8fd82051bba33b4703e4d99fff886b63a319a5ba..1a1736fe28014aca767aa9efdcba378be3adc8ea 100644
index 1548bc20988fea3f032d71cad40299fdf5b08b71..067f44d1fb245a315ec1c0fbccfef9b169c02d02 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -406,6 +406,8 @@ public abstract class AbstractContainerMenu {
@@ -337,7 +337,7 @@ index 8fd82051bba33b4703e4d99fff886b63a319a5ba..1a1736fe28014aca767aa9efdcba378b
FeatureFlagSet featureflagset = player.level().enabledFeatures();
diff --git a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
index dfeb3e336e06ef01f5401a362755030db942bb07..69eeb1b1a43a820846331240ebd78dc7a13a857b 100644
index 7d7d37334321c844958ce09e77547dd61dcba6c8..0e3eabf4b35082ce640bdf2ba15019b67e0c6ca2 100644
--- a/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
+++ b/src/main/java/net/minecraft/world/level/levelgen/PhantomSpawner.java
@@ -68,6 +68,11 @@ public class PhantomSpawner implements CustomSpawner {
@@ -350,10 +350,10 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..69eeb1b1a43a820846331240ebd78dc7
+ }
+ // Leaves end - fakeplayer spawn
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper
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 1e904d37a4646ebd2c3913fb6157342678c06ba9..1dc51050065af9bfc760f0a2cd7a479817888280 100644
index c8e938ec5b740b2ffd198cccc349d6ae69cda50d..69a7933bca98d29f215edfe3839e416207d083f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -259,6 +259,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
@@ -367,12 +367,12 @@ index 1e904d37a4646ebd2c3913fb6157342678c06ba9..1dc51050065af9bfc760f0a2cd7a4798
@@ -305,6 +306,7 @@ public final class CraftServer implements Server {
public static Exception excessiveVelEx; // Paper - Velocity warnings
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper - Custom Potion Mixes
+ private final CraftBotManager botManager = new CraftBotManager();
// Paper start - Folia region threading API
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
@@ -3244,4 +3246,11 @@ public final class CraftServer implements Server {
@@ -3243,4 +3245,11 @@ public final class CraftServer implements Server {
}
// Paper end

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 9e2d9c4b3d15f03e7babc3468b60fe9075a65a3a..f27b904cb561702ef9880fe6a9cf5b674876dac2 100644
index 327af739b30b94e06d94ccde6473f7d762c808d5..ffc10deeb66a7038b38c10dd0c38f7f2cd2be22d 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1612,12 +1612,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1613,12 +1613,12 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
org.bukkit.inventory.EquipmentSlot handSlot = (hand != null) ? org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(hand) : null;
@@ -23,7 +23,7 @@ index 9e2d9c4b3d15f03e7babc3468b60fe9075a65a3a..f27b904cb561702ef9880fe6a9cf5b67
itemstack1.shrink(1);
}
if (itemstack != null && this instanceof ServerPlayer) {
@@ -4543,3 +4543,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -4544,3 +4544,4 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
}

7
patches/server/0017-Fix-tripwire-update.patch
View File

@@ -5,14 +5,15 @@ Subject: [PATCH] Fix tripwire update
diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
index a3cef4ac925d09ad8789a59b46df134cf25c282a..319ecf3d72f08630f905389df370e29d3c1a03fb 100644
index 0f6ea0adb4b99d934e1a3fcb92562dffb2a45f63..b2f6712273de8169d2b8af01a48cd04f977d6ed0 100644
--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
@@ -162,7 +162,6 @@ public class TripWireHookBlock extends Block {
@@ -162,7 +162,7 @@ public class TripWireHookBlock extends Block {
boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
flag5 |= flag6 && flag7;
- if (k != i || !tripWireBeingRemoved || !flag6) // Paper - don't update the tripwire again if being removed and not disarmed
- if (k != i || !tripWireBeingRemoved || !flag6) // Paper - fix tripwire state inconsistency; don't update the tripwire again if being removed and not disarmed
+ // if (k != i || !tripWireBeingRemoved || !flag6) // Paper - fix tripwire state inconsistency; don't update the tripwire again if being removed and not disarmed - Leaves - vanilla
aiblockdata[k] = iblockdata2;
if (k == i) {
world.scheduleTick(pos, block, 10);

16
patches/server/0018-No-chat-sign.patch
View File

@@ -41,11 +41,11 @@ index 72a8aa676836fcb3b4578689d16af65e18f55bbe..47a06936a4727c6209a7ad0fb8fb1099
public MessageSignature get(String argumentName) {
for(ArgumentSignatures.Entry entry : this.entries) {
diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
index a5bcad412fb1ac3b6a3eee3f4618dc6c1ca66936..a9dbe17dfc1ed81775e5a9500527cdf010f3d223 100644
index b863249ff7e13cf4939c8961601f0564c62fd661..92df5611cdf4b3a8a82ed7194eba1d398a8cc9bd 100644
--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
@@ -143,6 +143,16 @@ public class FriendlyByteBuf extends ByteBuf {
// Paper end - Adventure
// Paper end - Adventure; add max length parameter
DataResult<JsonElement> dataresult = codec.encodeStart(JsonOps.INSTANCE, value);
+ // Leaves start - no chat sign
@@ -60,7 +60,7 @@ index a5bcad412fb1ac3b6a3eee3f4618dc6c1ca66936..a9dbe17dfc1ed81775e5a9500527cdf0
+
this.writeUtf(FriendlyByteBuf.GSON.toJson((JsonElement) Util.getOrThrow(dataresult, (s) -> {
return new EncoderException("Failed to encode: " + s + " " + value);
})), maxLength); // Paper - Adventure
})), maxLength); // Paper - Adventure; add max length parameter
diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
index d1d2fc0c57523c1abf1e8bfec913c78927c3dafc..50c1b722231c2add72663c475ae9068a35bfd524 100644
--- a/src/main/java/net/minecraft/network/protocol/game/ServerboundChatPacket.java
@@ -102,16 +102,16 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..2c349dc502ce275a8215766933f4855f
}
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 570310512c9ce5cf87f3fffe20d6d88c651aa83a..d4932ba7042b897a8561103367d0b7cf9a08234c 100644
index 27f7507a50537ec76f88518d3584d7c880f6eee4..9229b76bb0bb87797cc3f5615d85fe2e5fd0c027 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -642,7 +642,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// Paper start - fix secure profile with proxy online mode
// Paper start - Add setting for proxy online mode status
return dedicatedserverproperties.enforceSecureProfile
&& io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()
- && this.services.canValidateProfileKeys();
+ && this.services.canValidateProfileKeys() && !top.leavesmc.leaves.LeavesConfig.noChatSign;
// Paper end
+ && this.services.canValidateProfileKeys() && !top.leavesmc.leaves.LeavesConfig.noChatSign; // Leaves - no chat sign
// Paper end - Add setting for proxy online mode status
}
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
@@ -147,7 +147,7 @@ index 9b73df7fbd869ce51bd01a8d8b46d00fe7896126..68a69f09cb541607aa7d4b86d1cb759c
if (packet == null || this.processedDisconnect) { // Spigot
return;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 52f6ef8702a1902df079b1ec34282b46aae5d01e..d344fbcbb302c6b59c678177f45915fd8333e400 100644
index 89249723a490c5b08916241279ab94f82e41a942..23707e17000639167bb11c9c5303ca1e5abf44aa 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1489,7 +1489,7 @@ public abstract class PlayerList {

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

@@ -25,10 +25,10 @@ index 200ed770b57e1a9240abf0473968d4b85cbefe3c..bf16715db2424f0b05854ae7665b4448
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 f9e9b708eecae0dfdb283899ac293ddbfb986ade..b989029d7425cf410698ff477a3622b4c629ada3 100644
index d28f4e71a370606cf1626f7176aef815365b6cbe..2446413b944c7955c88b7f2930e86abfe375ab6c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -307,7 +307,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -309,7 +309,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
public double yo;
public double zo;
private Vec3 position;

4
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 f27b904cb561702ef9880fe6a9cf5b674876dac2..af7e1a40040d36f8a50f5f3ab01fe8d5d57c3116 100644
index ffc10deeb66a7038b38c10dd0c38f7f2cd2be22d..63d5bef6fcbb5ba00112130aa364be2185b00434 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -412,7 +412,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -18,7 +18,7 @@ index f27b904cb561702ef9880fe6a9cf5b674876dac2..af7e1a40040d36f8a50f5f3ab01fe8d5
this.hurt(this.damageSources().inWall(), 1.0F);
} else if (flag && !this.level().getWorldBorder().isWithinBounds(this.getBoundingBox())) {
double d0 = this.level().getWorldBorder().getDistanceToBorder(this) + this.level().getWorldBorder().getDamageSafeZone();
@@ -1407,6 +1407,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1408,6 +1408,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.getHealth() <= 0.0F;
}

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Move ThreadUnsafeRandom Initialization
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 90626c175b8bb496e2e1c18cc8a501d8eff44a87..eaad1404e690f1fe47a49df1447e31f068fcb0a2 100644
index 9be0aa933b2a1d5d2962871102ffa576df56245b..8846eb5b21924b00a870dfdd57fc9afe9988a263 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -971,7 +971,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -970,7 +970,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
// Paper start - optimise random block ticking
private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
@@ -19,7 +19,7 @@ index 90626c175b8bb496e2e1c18cc8a501d8eff44a87..eaad1404e690f1fe47a49df1447e31f0
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 2f1e70a695b222dfa832b5d2c81544bc314b1aec..987c5d9c54d4fe101659c42a1113ecd5ab164a6c 100644
index e7c8d223fb6d82b017031d58a17050081e70ff3b..b8c9684247fcb4af3a42dfae59a3e68a320fd4b4 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -202,6 +202,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -28,9 +28,9 @@ index 2f1e70a695b222dfa832b5d2c81544bc314b1aec..987c5d9c54d4fe101659c42a1113ecd5
+ protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); // Leaves - move thread unsafe random initialization
+
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 - Async-Anti-Xray - Pass executor
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
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
@@ -294,6 +296,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end - optimise collisions
}

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

@@ -22,10 +22,10 @@ index d6089c0d0b076d232834619bc93bc64f0be57340..c4577d7dc27bb48c95794212de4abf2e
// Paper - optimise chunk tick iteration
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index eaad1404e690f1fe47a49df1447e31f068fcb0a2..e25361263cb354293d584b8f400c02065654b4b8 100644
index 8846eb5b21924b00a870dfdd57fc9afe9988a263..14512a65562704586ad7283850b2f497391d5c10 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -974,6 +974,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -973,6 +973,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
// private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong()); // Leaves - moved to super
// Paper end
@@ -39,7 +39,7 @@ index eaad1404e690f1fe47a49df1447e31f068fcb0a2..e25361263cb354293d584b8f400c0206
public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
ChunkPos chunkcoordintpair = chunk.getPos();
boolean flag = this.isRaining();
@@ -984,7 +991,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -983,7 +990,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
gameprofilerfiller.push("thunder");
final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
@@ -49,7 +49,7 @@ index eaad1404e690f1fe47a49df1447e31f068fcb0a2..e25361263cb354293d584b8f400c0206
if (this.isRainingAt(blockposition)) {
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 6b47cd3dfd0b7a9fc670522d8591e2f44fcde54c..9438e62577aa02423b1dd0fc95696dab097b8429 100644
index b544446deb857a6a580b7a7be5a1ea571f996ff6..cb58c50b1979480f82f9e91ab3a155318ac7dd59 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -86,6 +86,18 @@ public class LevelChunk extends ChunkAccess {

6
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 37af0a508cfe56f23be806d2d4100d890ad5e7ec..89a50e07bc79cb0d5353f5a06fa037f3942c5940 100644
index 85169a9082268fa77453a64196a419d59cb88c9a..bc8d5b9d79fff1fdf10f6458e5a84eef98adbf0e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2429,6 +2429,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2415,6 +2415,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@@ -22,7 +22,7 @@ index 37af0a508cfe56f23be806d2d4100d890ad5e7ec..89a50e07bc79cb0d5353f5a06fa037f3
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 987c5d9c54d4fe101659c42a1113ecd5ab164a6c..33dcb0c113614c7605ba750afb80459b68d78f99 100644
index b8c9684247fcb4af3a42dfae59a3e68a320fd4b4..371df99e14cfe5525d6b6525d97c3958a307994c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1789,6 +1789,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {

4
patches/server/0030-Reduce-entity-allocations.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce entity allocations
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 b989029d7425cf410698ff477a3622b4c629ada3..79b2831322b8312448c89b5276af40d1efa880d2 100644
index 2446413b944c7955c88b7f2930e86abfe375ab6c..d89379606a5ef6c57b84f1434a34672096363b44 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -439,6 +439,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -441,6 +441,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return this.originWorld;
}
// Paper end

4
patches/server/0031-Remove-lambda-from-ticking-guard.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Remove lambda from ticking guard
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e25361263cb354293d584b8f400c02065654b4b8..3397a9f45a82e00b71578d82b6f5505288a79820 100644
index 14512a65562704586ad7283850b2f497391d5c10..1af3dd85ba10599eec17102c3cb6d86fba84e08d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -908,7 +908,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -907,7 +907,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
gameprofilerfiller.push("tick");

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

@@ -6,10 +6,10 @@ Subject: [PATCH] Cache climbing check for activation
This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index af7e1a40040d36f8a50f5f3ab01fe8d5d57c3116..5e7b77047d9900187a1def4270db1d4dbbf0e926 100644
index 63d5bef6fcbb5ba00112130aa364be2185b00434..546d40778dac702d32cefff8e9f0480fc07bbc14 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2009,6 +2009,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2010,6 +2010,22 @@ public abstract class LivingEntity extends Entity implements Attackable {
return this.lastClimbablePos;
}
@@ -33,7 +33,7 @@ index af7e1a40040d36f8a50f5f3ab01fe8d5d57c3116..5e7b77047d9900187a1def4270db1d4d
if (this.isSpectator()) {
return false;
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 3fc29e9f261f5f8e2b87ef2e20f430e9918cddbe..6dc5d3a0607950266d94506a8d9dd4cc9b189885 100644
index 97806af3f12bc44036418b2829191e0f83519ce5..6f4fc5adb02b3d688aeceb11d29b9754545ccad0 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -294,7 +294,7 @@ public class ActivationRange

14
patches/server/0038-PCA-sync-protocol.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index 63bbb5723f587788a65cc1cdac4cea94d96f254b..3e3b5fae4a3eca360a1f091aa165e5d71c344c9b 100644
index d9539f5275c4cb63910ba79aa522d9569ad35a89..577b0c8b1aee4cd120f4ef22b1fde27cb3f6c376 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
@@ -373,6 +373,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -61,10 +61,10 @@ index 6d23c39e4eadf23616080d6d08672e13b5d3c37d..f86384ba4e5b5ffd26dd64e41a9af8a3
@Override
public boolean stillValid(Player player) {
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
index a18aadbf7ae83713e1f2b21553185d8000bc7699..eeed0ccbf0fc04e12dea5e8602f67d862fbd3600 100644
index 5eaab97a0c3b93a44a45e2ed11033fe01c0c95c2..d31bcddad2fa2ebac6269cc7bf22254710c1843e 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -569,6 +569,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -570,6 +570,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
}
@@ -103,7 +103,7 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..213bc3c11ff4ed9bc761e8153aa669d1
protected Component getDefaultName() {
return Component.translatable("container.barrel");
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
index dfd364ac4b7551a13c4c6c100b5e62c0dfb10595..5b6d31c1045ed777376af775378bec5b3ef92fc7 100644
index 3ba04d615fae9748c144b3dc7e7442be2e5a659f..bb16de61eeafe0d446e43710accb40991dc7c129 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -150,7 +150,7 @@ index dfd364ac4b7551a13c4c6c100b5e62c0dfb10595..5b6d31c1045ed777376af775378bec5b
+ // Leaves end - pca
// CraftBukkit start
} else {
tileentitybeehive_hivebee.exitTickCounter = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable // Paper - use exitTickCounter to keep actual bee life
tileentitybeehive_hivebee.exitTickCounter = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable // Paper - Fix bees aging inside hives; use exitTickCounter to keep actual bee life
@@ -385,6 +402,11 @@ public class BeehiveBlockEntity extends BlockEntity {
this.maxBees = nbt.getInt("Bukkit.MaxEntities");
}
@@ -164,7 +164,7 @@ index dfd364ac4b7551a13c4c6c100b5e62c0dfb10595..5b6d31c1045ed777376af775378bec5b
@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 c57efcb9a79337ec791e4e8f6671612f0a82b441..218fbc794b086c2c3c04a3d183a0d43dcb74c4c2 100644
index bc01481ac5990ad1cfd1def5a16dd0ed2f9de8c9..e7bfc1008d270de81b375e3dd6e3c3439565752e 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
@@ -248,7 +248,7 @@ index 881379681c39230a00b3a1f11cd87498984396c7..e01eb2025458cf311348c58a15308540
protected Component getDefaultName() {
return Component.translatable("container.dispenser");
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index d4dcf7fe26474ae07374e7761d823bc5c8b54f97..8e1201d91bac88c043de5dfdc003d20b2647af9a 100644
index df1c1c27b7c0065f8179d59bdb9de01dde22befa..b17b8f2a773fcdd20d26dcdb083d59f6b89af37f 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -129,6 +129,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

6
patches/server/0039-BBOR-Protocol.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] BBOR Protocol
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index d344fbcbb302c6b59c678177f45915fd8333e400..fd91f1b08ce02d74b496ef3182a810cfcc6ac1e0 100644
index 23707e17000639167bb11c9c5303ca1e5abf44aa..74b31fe44e4a043d0415637b0ed67983062a6c67 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1623,6 +1623,7 @@ public abstract class PlayerList {
@@ -17,10 +17,10 @@ index d344fbcbb302c6b59c678177f45915fd8333e400..fd91f1b08ce02d74b496ef3182a810cf
public boolean isAllowCheatsForAllPlayers() {
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 9438e62577aa02423b1dd0fc95696dab097b8429..685c619a48e9787d927d812642f4c51cef1664e4 100644
index cb58c50b1979480f82f9e91ab3a155318ac7dd59..8268600fc06c500cbbb5658b0626ce4e36854e95 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -932,6 +932,11 @@ public class LevelChunk extends ChunkAccess {
@@ -931,6 +931,11 @@ public class LevelChunk extends ChunkAccess {
public void setLoaded(boolean loadedToWorld) {
this.loaded = loadedToWorld;

8
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 d9038d85f8a04381a92567acf1c8922d666aa3e8..b22dd3700c913d0391c8641fca46e89ed5cfff6b 100644
index 41acc2e1883af2220dcdfb9bbefef1976a54d202..7564aeccc8542335b3e065558d04bfd0ee49eab8 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -282,6 +282,10 @@ public class ServerPlayer extends Player {
@@ -62,7 +62,7 @@ index d9038d85f8a04381a92567acf1c8922d666aa3e8..b22dd3700c913d0391c8641fca46e89e
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
index a0d69082f5fdeee15bba0d76b940aa48cff36fa9..a8583c8a368466e9c9148b5620ec51cc1816711d 100644
index f8fd44500fb2a5b8273d317dbb1789fae24252fd..76cf6ebc80068b3effdbdd74c0213a7d536bf97f 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
@@ -44,6 +44,7 @@ import org.bukkit.event.Event;
@@ -94,7 +94,7 @@ index a0d69082f5fdeee15bba0d76b940aa48cff36fa9..a8583c8a368466e9c9148b5620ec51cc
this.debugLogging(pos, true, sequence, reason);
} else {
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index f7e5f3e43714ac74d99f13e59868f43bf791f96d..ef484b74c8e3eedba18978534b70b396810880f8 100644
index be8014cfb483e7bf5bbba11bea904d256b436b2f..247aec2924558e52b460deb36c9a2592a38a98e8 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -32,9 +32,12 @@ import net.minecraft.world.level.block.state.StateDefinition;
@@ -111,7 +111,7 @@ index f7e5f3e43714ac74d99f13e59868f43bf791f96d..ef484b74c8e3eedba18978534b70b396
public class BlockItem extends Item {
@@ -83,6 +86,20 @@ public class BlockItem extends Item {
final org.bukkit.block.BlockState oldBlockstate = blockstate != null ? blockstate : org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos()); // Paper
final org.bukkit.block.BlockState oldBlockstate = blockstate != null ? blockstate : org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos()); // Paper - Reset placed block on exception
// CraftBukkit end
+ // Leaves start - player operation limiter

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Stackable ShulkerBoxes
This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet) and plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
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 a39db702063887cf530f272deaf4f334047cc7d4..1b6cd8276c6bda2832f6447a2cceb75f11e6811a 100644
index 491a521f0e5e272fbad7870fa3adefdea22e179f..5dacb8896d8b78b0c467aa156c497a3eb35df26c 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -14,10 +14,12 @@ import net.minecraft.world.entity.Entity;
@@ -33,7 +33,7 @@ index a39db702063887cf530f272deaf4f334047cc7d4..1b6cd8276c6bda2832f6447a2cceb75f
@@ -73,6 +76,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
this.setDeltaMovement(this.random.nextDouble() * 0.2D - 0.1D, 0.2D, this.random.nextDouble() * 0.2D - 0.1D);
this.setItem(stack);
// Paper end
// Paper end - Don't use level random in entity constructors
+ // Leaves start - stackable shulker boxes
+ if (top.leavesmc.leaves.LeavesConfig.shulkerBoxStackSize > 1) {
+ if (stack.getItem() instanceof BlockItem bi && bi.getBlock() instanceof ShulkerBoxBlock) {
@@ -96,7 +96,7 @@ index a39db702063887cf530f272deaf4f334047cc7d4..1b6cd8276c6bda2832f6447a2cceb75f
ItemStack itemstack1 = other.getItem();
diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
index 41cb0d1efd81b7754b68c89af289c1260779c08b..75a26684dc892f96e9209ef77709d1b445bef636 100644
index d2f6027056af9d2816542f4e3d9e278d9ec2c9b4..10db6853dafd8f757499992af84c6b618caf2eeb 100644
--- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
@@ -114,7 +114,7 @@ public class Inventory implements Container, Nameable {
@@ -132,7 +132,7 @@ index 41cb0d1efd81b7754b68c89af289c1260779c08b..75a26684dc892f96e9209ef77709d1b4
if (this.add(i, stack.split(j)) && notifiesClient && this.player instanceof ServerPlayer) {
((ServerPlayer) this.player).connection.send(new ClientboundContainerSetSlotPacket(-2, 0, i, this.getItem(i)));
diff --git a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
index 1a1736fe28014aca767aa9efdcba378be3adc8ea..62586df674570a7762e8a2118a16918643c7dd59 100644
index 067f44d1fb245a315ec1c0fbccfef9b169c02d02..ef00f65f4096436451deeefe9153b86886b1e931 100644
--- a/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
+++ b/src/main/java/net/minecraft/world/inventory/AbstractContainerMenu.java
@@ -456,7 +456,7 @@ public abstract class AbstractContainerMenu {
@@ -257,7 +257,7 @@ index 5780d349f968ea3d05cf569b63531f8e76884827..d30af75de7d146b6bf49814b0eabae94
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
return SHAPE;
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 8e1201d91bac88c043de5dfdc003d20b2647af9a..5fabdda079ebcb0e5d119f3e60f7447d88dd2707 100644
index b17b8f2a773fcdd20d26dcdb083d59f6b89af37f..62d1c35e78f84f561deea990b4938258a482fe39 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -733,9 +733,9 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -271,7 +271,7 @@ index 8e1201d91bac88c043de5dfdc003d20b2647af9a..5fabdda079ebcb0e5d119f3e60f7447d
+ stack = stack.split(Math.min(to.getMaxStackSize(), stack.getMaxStackSize())); // Leaves - stackable shulker boxes
}
// Spigot end
ignoreTileUpdates = true; // Paper
ignoreTileUpdates = true; // Paper - Perf: Optimize Hoppers
diff --git a/src/main/java/top/leavesmc/leaves/util/ShulkerBoxUtils.java b/src/main/java/top/leavesmc/leaves/util/ShulkerBoxUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..82b4337965663ec8eccbc8c77892e3c49bff87cf

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

@@ -31,10 +31,10 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..c24148d8486420434922864df6f1ffa0
throw new RuntimeException("Could not reload paper configuration files", ex);
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 3397a9f45a82e00b71578d82b6f5505288a79820..9145d1d7f84b973bd905c6cad15cfce82b861c3d 100644
index 1af3dd85ba10599eec17102c3cb6d86fba84e08d..720a89e315225cf15342bc52d337ab5762e6d126 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2749,7 +2749,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2748,7 +2748,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void onTickingEnd(Entity entity) {
ServerLevel.this.entityTickList.remove(entity);
// Paper start - Reset pearls when they stop being ticked
@@ -44,7 +44,7 @@ index 3397a9f45a82e00b71578d82b6f5505288a79820..9145d1d7f84b973bd905c6cad15cfce8
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 b22dd3700c913d0391c8641fca46e89ed5cfff6b..8d814f1d92a180c288f1b5c9ca9d43b36c5e6389 100644
index 7564aeccc8542335b3e065558d04bfd0ee49eab8..2e56b8b2b8ba5c17080586745a80bc665d4231d0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1533,7 +1533,7 @@ public class ServerPlayer extends Player {
@@ -70,7 +70,7 @@ index ffc5b68c4246a7111845230a75552bb15875a209..990cdebf1b9e64a5001c71411e64f681
|| ((ServerLevel) this.level()).getDragonFight() == null
|| ((ServerLevel) this.level()).getDragonFight().respawnStage == null
diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
index c3e47426382296d650fa00ce0bc1a82bf23c7877..1d3764c2278a5daf1cfddf28c6ae78dd8809d4ff 100644
index 2274541c9386e4f1bbae489a1f123d502ccbf9cc..0b8f2affbea2b1e166aa574a432a51f30d60386f 100644
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
@@ -71,7 +71,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -83,7 +83,7 @@ index c3e47426382296d650fa00ce0bc1a82bf23c7877..1d3764c2278a5daf1cfddf28c6ae78dd
this.setDeltaMovement(this.getDeltaMovement().add(0.0D, -0.04D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
index 2f058cec80c6ef7a5a5ca065dc6c9fe353c521de..bda52c1afdcc5a3410f31179dec2f1989d02f6e9 100644
index 5b6d5c799cc8e601a01b6967917e15ba1e2db721..6a2314d9506f7e1a4c8676e28125e6ac16d16ad6 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
@@ -119,7 +119,7 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -96,7 +96,7 @@ index 2f058cec80c6ef7a5a5ca065dc6c9fe353c521de..bda52c1afdcc5a3410f31179dec2f198
this.leftOwner = nbt.getBoolean("LeftOwner");
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 5eded2322d604c3a304194926a740818631f36de..797725f7472ed36bf5a1369a7dfe600a9749cbac 100644
index 5f5bc035f2e7d899f42d01b63d85b185e6143ef7..3493f40a1b7f7c60647b1d920359dfafa43d94f9 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -95,7 +95,7 @@ public final class NaturalSpawner {

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

@@ -31,20 +31,20 @@ 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 7573c12a77797146c51ef2dfe4b2a636df45e21a..458c69eee97a5284b8e7658450cbac32a52137fe 100644
index a5e6b99b95e8408136f4c665aec070c5adc448da..f13f6c014ae188fb677e6360572c31ae6bc2b993 100644
--- a/src/main/java/net/minecraft/server/Main.java
+++ b/src/main/java/net/minecraft/server/Main.java
@@ -198,7 +198,7 @@ public class Main {
file = new File(bukkitConfiguration.getString("settings.world-container", "."));
}
// Paper end - fix SPIGOT-5824
- Services services = Services.create(new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionset); // Paper
+ Services services = Services.create(new top.leavesmc.leaves.profile.LeavesAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionset); // Paper // Leaves - extra-yggdrasil-service
- Services services = Services.create(new com.destroystokyo.paper.profile.PaperAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionset); // Paper - pass OptionSet to load paper config files; override authentication service; fix world-container
+ Services services = Services.create(new top.leavesmc.leaves.profile.LeavesAuthenticationService(Proxy.NO_PROXY), file, userCacheFile, optionset); // Paper - pass OptionSet to load paper config files; override authentication service; fix world-container // Leaves - extra-yggdrasil-service
// CraftBukkit start
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 89a50e07bc79cb0d5353f5a06fa037f3942c5940..760b1fb833fea279062965002686b57f967a5eaf 100644
index bc8d5b9d79fff1fdf10f6458e5a84eef98adbf0e..c01e6d6844f174eceadc05d137fb4c47aadcde6a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -260,7 +260,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

16
patches/server/0053-Use-vanilla-random-config.patch
View File

@@ -5,10 +5,10 @@ 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 1f3a8f314832acc575e7d9d054eaa09ab6fdd1e4..042653db5ec360e0dc67b7457b742432b76458a6 100644
index 8e64aa46fab22ba507d9e4d1418dc103d53c61f6..15961ba0f3a70e680e1e32d0a502fcfb4cff705a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -547,7 +547,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -549,7 +549,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.bb = Entity.INITIAL_AABB;
this.stuckSpeedMultiplier = Vec3.ZERO;
this.nextStep = 1.0F;
@@ -44,11 +44,11 @@ index f60c4cd0543fd5d50fa7e2c1a9e8381227adb540..8c9c694744951dc11b9f8828f27e4d4a
}
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 1b6cd8276c6bda2832f6447a2cceb75f11e6811a..c8abafdfc2bd09429fe0a509b1afa1579d5d75b6 100644
index 5dacb8896d8b78b0c467aa156c497a3eb35df26c..454bcdc843425d67e265e7ec7b56e9dd90dc0030 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -73,7 +73,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
// Paper start - don't use world random in entity constructor
// Paper start - Don't use level random in entity constructors (to make them thread-safe)
this(EntityType.ITEM, world);
this.setPos(x, y, z);
- this.setDeltaMovement(this.random.nextDouble() * 0.2D - 0.1D, 0.2D, this.random.nextDouble() * 0.2D - 0.1D);
@@ -60,18 +60,18 @@ index 1b6cd8276c6bda2832f6447a2cceb75f11e6811a..c8abafdfc2bd09429fe0a509b1afa157
+ }
+ // Leaves end - vanilla yes, paper no
this.setItem(stack);
// Paper end
// Paper end - Don't use level random in entity constructors
// Leaves start - stackable shulker boxes
diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
index 1d3764c2278a5daf1cfddf28c6ae78dd8809d4ff..8c96f1ad6b6de5f42b275f08ad47ce8d8f7aea49 100644
index 0b8f2affbea2b1e166aa574a432a51f30d60386f..defc764756f73b278d3e87216c2cb8c6739736ab 100644
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
@@ -43,7 +43,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
public PrimedTnt(Level world, double x, double y, double z, @Nullable LivingEntity igniter) {
this(EntityType.TNT, world);
this.setPos(x, y, z);
- double d3 = this.random.nextDouble() * 6.2831854820251465D; // Paper - don't use world random in entity constructor
+ double d3 = (top.leavesmc.leaves.LeavesConfig.useVanillaRandom ? world.random.nextDouble() : this.random.nextDouble()) * 6.2831854820251465D; // Paper - don't use world random in entity constructor // Leaves - why?
- double d3 = this.random.nextDouble() * 6.2831854820251465D; // Paper - Don't use level random in entity constructors
+ double d3 = (top.leavesmc.leaves.LeavesConfig.useVanillaRandom ? world.random.nextDouble() : this.random.nextDouble()) * 6.2831854820251465D; // Paper - Don't use level random in entity constructors // Leaves - why?
this.setDeltaMovement(-Math.sin(d3) * 0.02D, 0.20000000298023224D, -Math.cos(d3) * 0.02D);
this.setFuse(80);

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix update suppression crash
diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
index de9a8ba5317d6e5ae682a2376c8d04512a0b0936..c2c399be2d8d0d58ab43b36926ba9c45962ac322 100644
index d0a487f0d563181818c5670749e8dd3a9d939265..140a9070fb5859e762e40ddb1e4259f666a8ed1e 100644
--- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
+++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
@@ -51,6 +51,10 @@ public class PacketUtils {
@@ -20,10 +20,10 @@ index de9a8ba5317d6e5ae682a2376c8d04512a0b0936..c2c399be2d8d0d58ab43b36926ba9c45
label25:
{
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 760b1fb833fea279062965002686b57f967a5eaf..b22327cbda661538fbf1c9f32de6449d6039f04f 100644
index c01e6d6844f174eceadc05d137fb4c47aadcde6a..18b134cf2ef2af3b713f94084ea9d0ad3643cbbc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1695,7 +1695,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1689,7 +1689,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.push("tick");
try {

10
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 b22327cbda661538fbf1c9f32de6449d6039f04f..f49270818284b27eb755b5edd99e6d0441adbdca 100644
index 18b134cf2ef2af3b713f94084ea9d0ad3643cbbc..badbe74cc193a53d66551e423027f751fb7cf3d7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1739,6 +1739,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1725,6 +1725,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.profiler.popPush("server gui refresh");
top.leavesmc.leaves.protocol.core.LeavesProtocolManager.handleTick(); // Leaves - protocol
@@ -17,7 +17,7 @@ index b22327cbda661538fbf1c9f32de6449d6039f04f..f49270818284b27eb755b5edd99e6d04
for (int i = 0; i < this.tickables.size(); ++i) {
((Runnable) this.tickables.get(i)).run();
diff --git a/src/main/java/net/minecraft/server/ServerScoreboard.java b/src/main/java/net/minecraft/server/ServerScoreboard.java
index 5cc8173e845bf8d3414ac3347d25e1f6d0c65ce9..96b5afb3ec53fe50f6e9ee47c85db2dcce835058 100644
index 76d67d01388ecc1af6b43212e018edc678e84d72..5e8d281760e509dd353b052c29f058ed1f1075aa 100644
--- a/src/main/java/net/minecraft/server/ServerScoreboard.java
+++ b/src/main/java/net/minecraft/server/ServerScoreboard.java
@@ -144,6 +144,7 @@ public class ServerScoreboard extends Scoreboard {
@@ -37,7 +37,7 @@ index 5cc8173e845bf8d3414ac3347d25e1f6d0c65ce9..96b5afb3ec53fe50f6e9ee47c85db2dc
this.stopTrackingObjective(objective);
}
diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
index b9025fcc6a4db9533cdc42034c9e77323d0785fa..eeb159f05d4877ff0843052cf9ccfc87f3fc1e59 100644
index 470495903a9f0f8b925ddc4fb3d8213c556fccd9..eccc31755dfdea31c0dc5a652f24bca93befee3c 100644
--- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
@@ -105,6 +105,11 @@ public class PistonBaseBlock extends DirectionalBlock {
@@ -55,7 +55,7 @@ index b9025fcc6a4db9533cdc42034c9e77323d0785fa..eeb159f05d4877ff0843052cf9ccfc87
@@ -290,13 +295,24 @@ public class PistonBaseBlock extends DirectionalBlock {
}
}
// Paper end
// Paper end - Fix sticky pistons and BlockPistonRetractEvent
- world.removeBlock(pos.relative(enumdirection), false);
+ // Leaves start - break bedrock list
+ BlockPos pos1 = pos.relative(enumdirection);

37
patches/server/0056-Fix-trapdoor-feature.patch
View File

@@ -5,34 +5,25 @@ Subject: [PATCH] Fix trapdoor feature
diff --git a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
index ab5d25e2e1e86804c91885739c4f86770c40143c..c1fd5151b69df56b9379368bf1063d001fe3e186 100644
index 1027e5e8da4323714a3e7fed8d39264b8b9e50e7..c0c28e905b2cf8db1aff105dd2055702df670ff9 100644
--- a/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/TrapDoorBlock.java
@@ -153,26 +153,7 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
@@ -153,6 +153,8 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
flag1 = eventRedstone.getNewCurrent() > 0;
}
// CraftBukkit end
- boolean open = (Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1; // Paper - break redstone on trapdoors early
- // Paper start - break redstone on trapdoors early
- // note: this must run before any state for this block/its neighborus are written to the world
- // we allow the redstone event to fire so that plugins can block
- if (flag1 && open) { // if we are now powered and it caused the trap door to open
- // in this case, first check for the redstone on top first
- BlockPos abovePos = pos.above();
- BlockState above = world.getBlockState(abovePos);
- if (above.getBlock() instanceof RedStoneWireBlock) {
- world.setBlock(abovePos, Blocks.AIR.defaultBlockState(), Block.UPDATE_CLIENTS | Block.UPDATE_NEIGHBORS);
- Block.popResource(world, abovePos, new net.minecraft.world.item.ItemStack(net.minecraft.world.item.Items.REDSTONE));
- // now check that this didn't change our state
- if (world.getBlockState(pos) != state) {
- // our state was changed, so we cannot propagate this update
- return;
- }
- }
- }
- // Paper end - break redstone on trapdoors early
- if (open) { // Paper - break redstone on trapdoors early
+ if ((Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1) { // Leaves - it is feature, not bug!
+
+ /* Leaves - it is feature, not bug!
// Paper start - break redstone on trapdoors early
boolean open = (Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1;
// note: this must run before any state for this block/its neighborus are written to the world
@@ -173,6 +175,9 @@ public class TrapDoorBlock extends HorizontalDirectionalBlock implements SimpleW
}
if (open) {
// Paper end - break redstone on trapdoors early
+ */
+
+ if ((Boolean) state.getValue(TrapDoorBlock.OPEN) != flag1) {
state = (BlockState) state.setValue(TrapDoorBlock.OPEN, flag1);
this.playSound((Player) null, world, pos, flag1);
}

4
patches/server/0058-Disable-distance-check-for-UseItemOnPacket.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8cae2004b3ffec981be1fe277a97321843f4a2cf..bcd90c6a9173d2b089995cd1049e0db1d7316719 100644
index 4028861fe9d2fd15179238be473165689fc39619..4bddf96387d6429cd02943f16d797cf78c62aab1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1936,7 +1936,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1938,7 +1938,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;

6
patches/server/0062-Disable-check-out-of-order-command.patch
View File

@@ -5,15 +5,15 @@ Subject: [PATCH] Disable check out-of-order command
diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
index 85a8a687b1568a56e3e646b37ef78b562c1b8a82..90eb8e13c9ef9b966c6abf5a56f69f44a296e969 100644
index 22ead092ae984d1eaa052fe97981ce3c49b521d8..9036306e153a7b3e919a9c8ecdf162d91359e38e 100644
--- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
+++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
@@ -38,7 +38,7 @@ public class SignedMessageChain {
throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.chain_broken"), false); // Paper - diff on change (if disconnects, need a new kick event cause)
} else if (playerPublicKey.data().hasExpired()) {
throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.expiredProfileKey", org.bukkit.event.player.PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY), false); // Paper - kick event causes
throw new SignedMessageChain.DecodeException(Component.translatable("chat.disabled.expiredProfileKey"), false, org.bukkit.event.player.PlayerKickEvent.Cause.EXPIRED_PROFILE_PUBLIC_KEY); // Paper - kick event causes
- } else if (body.timeStamp().isBefore(this.lastTimeStamp)) {
+ } else if (body.timeStamp().isBefore(this.lastTimeStamp) && !top.leavesmc.leaves.LeavesConfig.disableCheckOutOfOrderCommand) { // Leaves - disable check to support Velocity
throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.out_of_order_chat", org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT), true); // Paper - kick event causes
throw new SignedMessageChain.DecodeException(Component.translatable("multiplayer.disconnect.out_of_order_chat"), true, org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event causes
} else {
this.lastTimeStamp = body.timeStamp();

10
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 ccc1caafb0ada52c7b99b7358253826f5390843e..a37e5fccd714bc52a13132bcd6565c352e0a423c 100644
index 54a77399c1c42a1bcdbb4fd2cc09469a4838bd7c..22d014ec4cc7f3ad5df6cf28988b0bd983de301f 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -238,8 +238,8 @@ public abstract class Player extends LivingEntity {
@@ -60,7 +60,7 @@ index ccc1caafb0ada52c7b99b7358253826f5390843e..a37e5fccd714bc52a13132bcd6565c35
public boolean canBeHitByProjectile() {
return !this.isSpectator() && super.canBeHitByProjectile();
diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
index ef484b74c8e3eedba18978534b70b396810880f8..d1697d1de87632eabedb32dba6d73ee25107d7c7 100644
index 247aec2924558e52b460deb36c9a2592a38a98e8..6027e593e41cb4873da22659880047ed9f4e2fcf 100644
--- a/src/main/java/net/minecraft/world/item/BlockItem.java
+++ b/src/main/java/net/minecraft/world/item/BlockItem.java
@@ -228,7 +228,7 @@ public class BlockItem extends Item {
@@ -71,9 +71,9 @@ index ef484b74c8e3eedba18978534b70b396810880f8..d1697d1de87632eabedb32dba6d73ee2
+ boolean defaultReturn = (!this.mustSurvive() || state.canSurvive(context.getLevel(), context.getClickedPos())) && (top.leavesmc.leaves.LeavesConfig.creativeNoClip ? context.getPlayer().canSpectatingPlace(world, state, context.getClickedPos(), voxelshapecollision) : world.checkEntityCollision(state, entityhuman, voxelshapecollision, context.getClickedPos(), true)); // Paper // Leaves - creative no clip
org.bukkit.entity.Player player = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - expose hand
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(context.getLevel(), context.getClickedPos()), player, CraftBlockData.fromData(state), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
diff --git a/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java b/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java
index e641360a3e82cb03393b856fa545d6b0089a8dbf..73642f3a7826a3fd2f0460fffcf7c4eb3b52865d 100644
index 0b761f3ae15ad4a3b8152f497a60403212109534..fdb2bb8a5e6c5d69692804adb086a2d476d558cd 100644
--- a/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java
+++ b/src/main/java/net/minecraft/world/item/StandingAndWallBlockItem.java
@@ -56,7 +56,7 @@ public class StandingAndWallBlockItem extends BlockItem {
@@ -84,7 +84,7 @@ index e641360a3e82cb03393b856fa545d6b0089a8dbf..73642f3a7826a3fd2f0460fffcf7c4eb
+ boolean defaultReturn = context.getPlayer() != null ? context.getPlayer().canSpectatingPlace(world, iblockdata1, blockposition, CollisionContext.empty()) : world.isUnobstructed(iblockdata1, blockposition, CollisionContext.empty()); // Leaves - creative no clip
org.bukkit.entity.Player player = (context.getPlayer() instanceof ServerPlayer) ? (org.bukkit.entity.Player) context.getPlayer().getBukkitEntity() : null;
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(world, blockposition), player, CraftBlockData.fromData(iblockdata1), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - expose hand
BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(world, blockposition), player, CraftBlockData.fromData(iblockdata1), defaultReturn, org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(context.getHand())); // Paper - Expose hand in BlockCanBuildEvent
diff --git a/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java
index 5c311270a39f6b4996c8b58822d24556c67adc41..cb40179236952edcc1678a58a5886b1916349314 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/ShulkerBoxBlockEntity.java

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Elytra aeronautics no chunk load
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index de5061ae7d0ecbb34a10f630a3ebd38c89e9862f..6edd6ae82a049d988331a22af8440ffacf0a6bbe 100644
index eb85cdc005be3cd2fc95e5e207a2621dfc298f05..b9529693ff28e3be6fc20523e76d3cc7ccacec6f 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -150,7 +150,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -45,7 +45,7 @@ index de5061ae7d0ecbb34a10f630a3ebd38c89e9862f..6edd6ae82a049d988331a22af8440ffa
SectionPos sectionposition = player.getLastSectionPos();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index bcd90c6a9173d2b089995cd1049e0db1d7316719..5c305cfc4142aa859b3e2e065645f505fda22717 100644
index 4bddf96387d6429cd02943f16d797cf78c62aab1..f840bc9bd3ee059a66aec64d0c6a9b65cbc0d42b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -549,7 +549,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -58,10 +58,10 @@ index bcd90c6a9173d2b089995cd1049e0db1d7316719..5c305cfc4142aa859b3e2e065645f505
!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 042653db5ec360e0dc67b7457b742432b76458a6..bfc65a9360e14093bb8e34e33b1cb3bf574bf575 100644
index 15961ba0f3a70e680e1e32d0a502fcfb4cff705a..219e61d5a3644fb4ced66c4375ab551955fa043c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1072,7 +1072,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1074,7 +1074,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
return;
}
}
@@ -76,7 +76,7 @@ index 042653db5ec360e0dc67b7457b742432b76458a6..bfc65a9360e14093bb8e34e33b1cb3bf
this.level().getProfiler().push("move");
if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
movement = movement.multiply(this.stuckSpeedMultiplier);
@@ -2007,6 +2013,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -2009,6 +2015,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.yo = y;
this.zo = d4;
this.setPos(d3, y, d4);
@@ -85,12 +85,12 @@ index 042653db5ec360e0dc67b7457b742432b76458a6..bfc65a9360e14093bb8e34e33b1cb3bf
}
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 c908ddf5214a6c9a5800fff87f5865b110d24fe1..82b73e4080ee8a1883847db378e373bfde7e8e1e 100644
index 22d014ec4cc7f3ad5df6cf28988b0bd983de301f..8f617ceb59393aebd4770fba82494713648685ec 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
public boolean affectsSpawning = true;
public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
// Paper end
+ public boolean elytraAeronauticsNoChunk = false; // Leaves - Elytra aeronautics

10
patches/server/0074-No-block-update-command.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] No block update command
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 9145d1d7f84b973bd905c6cad15cfce82b861c3d..18bf70e15ee98bc2c2dd3a6091d3f41300345a65 100644
index 720a89e315225cf15342bc52d337ab5762e6d126..c9d4d9a3c1165ffff78dba1e894d1899a9f121b4 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2527,6 +2527,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2526,6 +2526,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@Override
public void blockUpdated(BlockPos pos, Block block) {
@@ -17,7 +17,7 @@ index 9145d1d7f84b973bd905c6cad15cfce82b861c3d..18bf70e15ee98bc2c2dd3a6091d3f413
// CraftBukkit start
if (this.populating) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index 5b8a1f31e0b55da15daa4ab271317e4393a87e96..a489f3a8df86434ccadd97311f1e26999c27db79 100644
index d1effd5d7b9eb2d715c9a3e16adbef2541b1ccf2..bffb03816205ed1241a7bd28bc52753d91a94a43 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -482,7 +482,7 @@ public final class ItemStack {
@@ -30,7 +30,7 @@ index 5b8a1f31e0b55da15daa4ab271317e4393a87e96..a489f3a8df86434ccadd97311f1e2699
world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 685c619a48e9787d927d812642f4c51cef1664e4..ed288e84029d5ef7e9b7eb2827458c258f0ce10e 100644
index 8268600fc06c500cbbb5658b0626ce4e36854e95..b52ac7c98e42d9e80c55bfb9ea562fcbf3c729d0 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -481,7 +481,7 @@ public class LevelChunk extends ChunkAccess {
@@ -55,7 +55,7 @@ index 3cf6e62ceb555eedf133e0ba82445caadaab7743..8c3c9c64ea9de68a57d18164e0166020
FluidState fluid1 = this.getNewLiquid(world, pos, world.getBlockState(pos));
int i = this.getSpreadDelay(world, pos, state, fluid1);
diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
index 598dc0d3a2b9387e76d7e4e19e54c4573a24bc54..dda7e3c78aa62636a1f6834392df87a8bc428f04 100644
index 395bb163fb1d62dd2e6949e1146c337c0bbc626f..9da8651a12db6a2442578a2c1d59e75216d96753 100644
--- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
+++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
@@ -46,6 +46,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {

4
patches/server/0076-Container-open-passthrough.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Container open passthrough
diff --git a/src/main/java/net/minecraft/world/level/block/SignBlock.java b/src/main/java/net/minecraft/world/level/block/SignBlock.java
index a09f6a2f9fdbe8361f67b543f3b337789897b982..fa9670bec73398225f670f64dc96ce9ee17443a9 100644
index 27a1e8ffc43efe4e086e7fd88ee4d80c23f98674..aafe4fd8b406f6b880ab37d39958e57550d5b6a1 100644
--- a/src/main/java/net/minecraft/world/level/block/SignBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/SignBlock.java
@@ -117,6 +117,25 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
@@ -32,5 +32,5 @@ index a09f6a2f9fdbe8361f67b543f3b337789897b982..fa9670bec73398225f670f64dc96ce9e
+ return InteractionResult.PASS;
+ // Leaves end - signContainerPassthrough
} else if (!this.otherPlayerIsEditingSign(player, tileentitysign) && player.mayBuild() && this.hasEditableText(player, tileentitysign, flag1)) {
this.openTextEdit(player, tileentitysign, flag1, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.INTERACT); // Paper
this.openTextEdit(player, tileentitysign, flag1, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.INTERACT); // Paper - Add PlayerOpenSignEvent
return this.getInteractionResult(flag);

6
patches/server/0079-SIMD-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] SIMD support
diff --git a/build.gradle.kts b/build.gradle.kts
index 914c6520398045ad30537d7493a79a55ad4ddee2..25def80ee99baa1dfc5e0a785a2b190d1beb4865 100644
index 32fb084862ce074cdbf69fff4847aa31bfd08db2..3f1316110dd00ae51e2bde8bd87e3b582587b92c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,6 +69,7 @@ tasks.withType<JavaCompile> {
@@ -68,6 +68,7 @@ tasks.withType<JavaCompile> {
compilerArgs.add("-Xlint:-module")
compilerArgs.add("-Xlint:-removal")
compilerArgs.add("-Xlint:-dep-ann")
@@ -16,7 +16,7 @@ index 914c6520398045ad30537d7493a79a55ad4ddee2..25def80ee99baa1dfc5e0a785a2b190d
}
// Leaves end - hide irrelevant compilation warnings
@@ -193,6 +194,8 @@ fun TaskContainer.registerRunTask(
@@ -192,6 +193,8 @@ fun TaskContainer.registerRunTask(
minHeapSize = "${memoryGb}G"
maxHeapSize = "${memoryGb}G"

42
patches/server/0090-Reduce-array-allocations.patch
View File

@@ -214,7 +214,7 @@ index c6f773afc39e7c97d13d1977a7609fc46714709d..9cdf39bef3112ac0a522c8bc8cb1b2b5
public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index b0517b9483a8cfd74997f89efdc0d8559b80ae4a..e7cfc98aa6dc19c5adad4c797ae7292a339986a6 100644
index 7f5a5403959a54dd794b1a0f492f40c925622928..8c90406bf8b6c3d459dc27adf3671b72ac764867 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -348,7 +348,7 @@ public class ServerEntity {
@@ -227,18 +227,18 @@ index b0517b9483a8cfd74997f89efdc0d8559b80ae4a..e7cfc98aa6dc19c5adad4c797ae7292a
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 18bf70e15ee98bc2c2dd3a6091d3f41300345a65..f802ff2a34900b57f3dd5f5f454f872708a8d375 100644
index c9d4d9a3c1165ffff78dba1e894d1899a9f121b4..721d46d649cb2ffdf087f2d289cd3e8cc05ed241 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -178,6 +178,7 @@ import org.bukkit.event.world.GenericGameEvent;
@@ -177,6 +177,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
import org.bukkit.event.world.GenericGameEvent;
import org.bukkit.event.world.TimeSkipEvent;
// CraftBukkit end
import it.unimi.dsi.fastutil.ints.IntArrayList; // Paper
+import top.leavesmc.leaves.util.ArrayConstants;
public class ServerLevel extends Level implements WorldGenLevel {
@@ -1075,7 +1076,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1074,7 +1075,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
BlockPos blockposition2 = blockposition.set(j + randomX, randomY, k + randomZ);
BlockState iblockdata = com.destroystokyo.paper.util.maplist.IBlockDataList.getBlockDataFromRaw(raw);
@@ -247,7 +247,7 @@ index 18bf70e15ee98bc2c2dd3a6091d3f41300345a65..f802ff2a34900b57f3dd5f5f454f8727
}
// We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
// TODO CHECK ON UPDATE (ping the Canadian)
@@ -1381,7 +1382,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1380,7 +1381,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
public static List<Entity> getCurrentlyTickingEntities() {
Entity ticking = currentlyTickingEntity.get();
@@ -257,7 +257,7 @@ index 18bf70e15ee98bc2c2dd3a6091d3f41300345a65..f802ff2a34900b57f3dd5f5f454f8727
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5c305cfc4142aa859b3e2e065645f505fda22717..770213578923a0b2b226cb5a33991647c5f9131c 100644
index f840bc9bd3ee059a66aec64d0c6a9b65cbc0d42b..c9cc163b67a8c71e2ff482da768f8fab8fac6acb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -243,6 +243,7 @@ import org.bukkit.inventory.EquipmentSlot;
@@ -284,7 +284,7 @@ index 5c305cfc4142aa859b3e2e065645f505fda22717..770213578923a0b2b226cb5a33991647
return;
}
// Paper end
@@ -3209,7 +3210,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -3211,7 +3212,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
// Paper start
if (!org.bukkit.Bukkit.isPrimaryThread()) {
if (this.recipeSpamPackets.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.recipeSpamLimit) {
@@ -294,7 +294,7 @@ index 5c305cfc4142aa859b3e2e065645f505fda22717..770213578923a0b2b226cb5a33991647
}
}
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index 8ce2fd887d9c2cf86fa4ec0332b70681f1572911..f20b8676d3de17cf8eac428d1c2ae7db6ae65bb8 100644
index a9f5af48c1f97b2e635727b48f4383502b17d82f..17997f3b4ee9e166372cdcb6c43ba49bb70e56fd 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -44,6 +44,7 @@ import org.bukkit.craftbukkit.util.Waitable;
@@ -316,7 +316,7 @@ index 8ce2fd887d9c2cf86fa4ec0332b70681f1572911..f20b8676d3de17cf8eac428d1c2ae7db
this.requestedUsername = packet.name();
GameProfile gameprofile = this.server.getSingleplayerProfile();
@@ -218,7 +219,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@@ -223,7 +224,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
@Override
public void handleKey(ServerboundKeyPacket packet) {
@@ -326,7 +326,7 @@ index 8ce2fd887d9c2cf86fa4ec0332b70681f1572911..f20b8676d3de17cf8eac428d1c2ae7db
final String s;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index fe13fe480fdd932f7ed4444488d7c9b01a5cf49f..5e156b229f132626ed1e15a92302f8c4e06b47db 100644
index f304ee9293828302ca26d9af766abdbcc842a3c1..12577cbfe26eaa65f475ec3385d362b4c4fa7595 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -122,6 +122,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
@@ -396,10 +396,10 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408
private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, 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 ab8e19e67f173a6c05b4895b3fa78a1eb2b13675..7e6f28c0d10e70acdaedb06314f1f5fc67e86de4 100644
index 6771f0e4a35e4f82b8c905dc8c30cdc8752864c8..b6115b44d1654dbc62019dffd8c8163f37e8f7e7 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3143,7 +3143,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3144,7 +3144,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@Nullable
private Map<EquipmentSlot, ItemStack> collectEquipmentChanges() {
Map<EquipmentSlot, ItemStack> map = null;
@@ -409,7 +409,7 @@ index ab8e19e67f173a6c05b4895b3fa78a1eb2b13675..7e6f28c0d10e70acdaedb06314f1f5fc
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 f0e1318a0a7d7a409df8fc5567040de9da25b75d..3d7eaf2564c3dceb7b5c658940ead6da90256efb 100644
index 65e13870262c67cd51a129b5954b2a34a51b5eb3..23e0e9125f7f68a602fa4d6c3c9562fe25bb3374 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1082,7 +1082,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -449,7 +449,7 @@ index f0e1318a0a7d7a409df8fc5567040de9da25b75d..3d7eaf2564c3dceb7b5c658940ead6da
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
index 94396ad1a3c280787d36c6c18256d10340ace488..ae0de0d0cb970a10a8a612cf34810a3613ac6c73 100644
index 7de9d012e7416eaa0189b513a0972c846e93c4b6..505cae0013a501cbff094a83c491af963087d58f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
+++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -237,7 +237,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -462,7 +462,7 @@ index 94396ad1a3c280787d36c6c18256d10340ace488..ae0de0d0cb970a10a8a612cf34810a36
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index a489f3a8df86434ccadd97311f1e26999c27db79..9293e1d9c13cab5511211f37ce00286ef4d5d1d5 100644
index bffb03816205ed1241a7bd28bc52753d91a94a43..b6f0e75270b22df4aff8feee4b8ae7cd0295aec7 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -1052,7 +1052,7 @@ public final class ItemStack {
@@ -504,7 +504,7 @@ index 6c2e8049c2197ddc912c1a0fc99c87beae81e25b..be13baa7b51c4ad377b50d8ca8f7cfad
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 e304b4977dd77bd770335accae697e7c7bc90ecc..6517b7f2c21c971b6af3324c5a91bc17a052f349 100644
index ab3b63c9e48570d203dfcf0b8d30ab0ae85719bc..3f8113b22ebbb7ff783308033edcf10259dc0e82 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -97,6 +97,7 @@ import org.bukkit.craftbukkit.util.CraftSpawnCategory;
@@ -525,7 +525,7 @@ index e304b4977dd77bd770335accae697e7c7bc90ecc..6517b7f2c21c971b6af3324c5a91bc17
return slices.getChunkEntities();
}
diff --git a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
index de8b5cab7925c1c46478952ed2cb2bd40f9a9c48..3ea1c2a9a3e6dfb65d95b5ed92d21f401a1c0cd2 100644
index d78fe4081bc2938326066e0afddb4a6c833a4bf7..4246f6edb9f4989227fb3c3709f8e22eeeb44f4b 100644
--- a/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/ComposterBlock.java
@@ -44,6 +44,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
@@ -564,10 +564,10 @@ index de8b5cab7925c1c46478952ed2cb2bd40f9a9c48..3ea1c2a9a3e6dfb65d95b5ed92d21f40
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
index eeed0ccbf0fc04e12dea5e8602f67d862fbd3600..0caf6040c2da342971c37a9af5d83f3263909361 100644
index d31bcddad2fa2ebac6269cc7bf22254710c1843e..2d167509b24c690f14fc0584fde0bedd267cb0f8 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -58,6 +58,7 @@ import org.bukkit.event.inventory.FurnaceSmeltEvent;
@@ -59,6 +59,7 @@ import org.bukkit.event.inventory.FurnaceSmeltEvent;
import org.bukkit.event.inventory.FurnaceStartSmeltEvent;
import org.bukkit.inventory.CookingRecipe;
// CraftBukkit end
@@ -575,7 +575,7 @@ index eeed0ccbf0fc04e12dea5e8602f67d862fbd3600..0caf6040c2da342971c37a9af5d83f32
public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntity implements WorldlyContainer, RecipeCraftingHolder, StackedContentsCompatible {
@@ -65,7 +66,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -66,7 +67,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
protected static final int SLOT_FUEL = 1;
protected static final int SLOT_RESULT = 2;
public static final int DATA_LIT_TIME = 0;

6
patches/server/0091-Optimize-sun-burn-tick.patch
View File

@@ -6,10 +6,10 @@ 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 bfc65a9360e14093bb8e34e33b1cb3bf574bf575..19f25eeb534f259c4280530ad488f00d710dfe77 100644
index 219e61d5a3644fb4ced66c4375ab551955fa043c..c3a91af3a6e9ca8177994bacaf375d1e7df1d0c4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1993,8 +1993,22 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1995,8 +1995,22 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
/** @deprecated */
@Deprecated
public float getLightLevelDependentMagicValue() {
@@ -34,7 +34,7 @@ index bfc65a9360e14093bb8e34e33b1cb3bf574bf575..19f25eeb534f259c4280530ad488f00d
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 3d7eaf2564c3dceb7b5c658940ead6da90256efb..9df2ee40e46087e4d03de7caea01af280fe0e0d0 100644
index 23e0e9125f7f68a602fa4d6c3c9562fe25bb3374..3209b9116b4bfcdc99d91aae09bc06b2a8d98d34 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1716,15 +1716,41 @@ public abstract class Mob extends LivingEntity implements Targeting {

8
patches/server/0093-Use-optimized-collection.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Use optimized collection
This patch is Powered by Gale(https://github.com/GaleMC/Gale)
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 6edd6ae82a049d988331a22af8440ffacf0a6bbe..61a84fd1aeaa4ddd506a1879183c532540a055a6 100644
index b9529693ff28e3be6fc20523e76d3cc7ccacec6f..5dea3d1a33f107959562d64493baffc7dc6dfdd3 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -237,7 +237,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -71,7 +71,7 @@ index b738ee2d3801fadfd09313f05ae24593e56b0ec6..2d1abb9518795875b3719efe91e60508
private final EnumSet<Goal.Flag> disabledFlags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<net.minecraft.world.entity.ai.goal.Goal.Flag> goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
index 4f2fa47d094348bb8f86a86e808019ddba56e187..e6938589bf12ccd401cc6700cfa5f28cefc93c9f 100644
index afe91d02363bf7385d34447dda8960980ec48443..f33e42303f15be4910e0edbacbe46853800d2321 100644
--- a/src/main/java/net/minecraft/world/level/GameRules.java
+++ b/src/main/java/net/minecraft/world/level/GameRules.java
@@ -141,7 +141,7 @@ public class GameRules {
@@ -81,10 +81,10 @@ index 4f2fa47d094348bb8f86a86e808019ddba56e187..e6938589bf12ccd401cc6700cfa5f28c
- this.rules = rules;
+ this.rules = top.leavesmc.leaves.LeavesConfig.useOptimizedCollection ? new it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap<>(rules) : rules; // Leaves - replace game rules map with optimized collection
// Paper start
// Paper start - Perf: Use array for gamerule storage
int arraySize = rules.keySet().stream().mapToInt(key -> key.gameRuleIndex).max().orElse(-1) + 1;
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index c498d397938c973608634867366aea8bfad7b3c9..96bf3845f5c76363726ebb934ab008c4c1807f26 100644
index cb724beef6fe6750c63622500fc0f278bba1d8ca..37a17ea3c240ab62c1265061bdd160b582aad5e6 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -62,6 +62,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;

4
patches/server/0097-Cache-ominous-banner-item.patch
View File

@@ -38,7 +38,7 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..5ceef34c59f1fca9a539ce93aa181456
CompoundTag nbttagcompound = new CompoundTag();
ListTag nbttaglist = (new BannerPattern.Builder()).addPattern(BannerPatterns.RHOMBUS_MIDDLE, DyeColor.CYAN).addPattern(BannerPatterns.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.STRIPE_CENTER, DyeColor.GRAY).addPattern(BannerPatterns.BORDER, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.STRIPE_MIDDLE, DyeColor.BLACK).addPattern(BannerPatterns.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.BORDER, DyeColor.BLACK).toListTag();
diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
index b89deba5bf6a78c26485633421c7d0b3b1462219..f713935af2c20b3c01b43a918f471a0a90d44351 100644
index e046a733ab380d21b7e7f6dd7b5dbbcb5cf62232..e1ea327c94e6d9cc030b0f891476cf36d296f36f 100644
--- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
+++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
@@ -47,7 +47,7 @@ public abstract class Raider extends PatrollingMonster {
@@ -65,7 +65,7 @@ index b89deba5bf6a78c26485633421c7d0b3b1462219..f713935af2c20b3c01b43a918f471a0a
- if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, Raid.getLeaderBannerInstance())) {
+ if (this.hasActiveRaid() && !flag && ItemStack.matches(itemstack, top.leavesmc.leaves.LeavesConfig.cacheOminousBannerItem ? Raid.LEADER_BANNER : Raid.getLeaderBannerInstance())) { // Leaves - cache ominous banner item
// Paper start
// Paper start - EntityPickupItemEvent fixes
if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPickupItemEvent(this, item, 0, false).isCancelled()) {
return;
@@ -322,7 +322,7 @@ public abstract class Raider extends PatrollingMonster {

6
patches/server/0098-Skip-entity-move-if-movement-is-zero.patch
View File

@@ -6,10 +6,10 @@ 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 19f25eeb534f259c4280530ad488f00d710dfe77..c31fe20217872ed083e9283d21efacdd9f1029f8 100644
index c3a91af3a6e9ca8177994bacaf375d1e7df1d0c4..f9682798c74aaae9c0610c00b2f52cda990e35a4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -315,6 +315,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -317,6 +317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
public float yRotO;
public float xRotO;
private AABB bb;
@@ -17,7 +17,7 @@ index 19f25eeb534f259c4280530ad488f00d710dfe77..c31fe20217872ed083e9283d21efacdd
public boolean onGround;
public boolean horizontalCollision;
public boolean verticalCollision;
@@ -1050,6 +1051,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1052,6 +1053,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
// Paper end - detailed watchdog information
public void move(MoverType movementType, Vec3 movement) {

4
patches/server/0100-Skip-negligible-planar-movement-multiplication.patch
View File

@@ -6,10 +6,10 @@ 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 c31fe20217872ed083e9283d21efacdd9f1029f8..1010859ff55d1a62aa49bc05ba4467e15aa9ed4a 100644
index f9682798c74aaae9c0610c00b2f52cda990e35a4..bb575f1fa289e90a242f5b2ca0d18c5fccd41718 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1221,9 +1221,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -1223,9 +1223,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
this.tryCheckInsideBlocks();

18
patches/server/0108-Replay-Mod-API.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Replay Mod API
This patch is Powered by ReplayMod(https://github.com/ReplayMod)
diff --git a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
index 150daf6bf4b27a6ff984d872a28002f19beef51c..a9bbb0894a122d03cffc74b574936064981aedb9 100644
index 8d79cfa371546996ef65f94232c1d344e7c590ec..9c262c82d9ab24bdbbe03df8cee3d5d99e8f8868 100644
--- a/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
+++ b/src/main/java/net/minecraft/commands/arguments/EntityArgument.java
@@ -147,6 +147,7 @@ public class EntityArgument implements ArgumentType<EntitySelector> {
@@ -18,7 +18,7 @@ index 150daf6bf4b27a6ff984d872a28002f19beef51c..a9bbb0894a122d03cffc74b574936064
collection.add(player.getGameProfile().getName());
}
diff --git a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
index 73c15a0c56a103ba4e62f0a51af8d42566b07245..a2dd8434cdf1f7b117b46fbb14e75890efd38d5e 100644
index 676a1499747b071515479130875157263d3a8352..e5ef298dc1df9cc42b3d349939a966b77fc0d554 100644
--- a/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
+++ b/src/main/java/net/minecraft/commands/arguments/selector/EntitySelector.java
@@ -122,6 +122,7 @@ public class EntitySelector {
@@ -107,7 +107,7 @@ index f941e7add46e690e21d39111bed520df9156f154..5ea28c20b34b46eb68fb8a2d468ea009
}
// Leaves end - bot can't get advancement
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 770213578923a0b2b226cb5a33991647c5f9131c..aa5fc061e905bc901ae6672cd54c3c9bca4cee76 100644
index c9cc163b67a8c71e2ff482da768f8fab8fac6acb..1d5e7cde06e4f4aa65caaf9b28c1663a59b62679 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -300,7 +300,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -120,7 +120,7 @@ index 770213578923a0b2b226cb5a33991647c5f9131c..aa5fc061e905bc901ae6672cd54c3c9b
} else {
connection.setListener(this);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5e156b229f132626ed1e15a92302f8c4e06b47db..a7eb6319f274c3fc7071251fe3a6aedb46133817 100644
index 12577cbfe26eaa65f475ec3385d362b4c4fa7595..eb3e88093fc7862a134b130f63768d1bba7990a7 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -123,6 +123,7 @@ import org.bukkit.event.player.PlayerSpawnChangeEvent;
@@ -278,9 +278,9 @@ index 5e156b229f132626ed1e15a92302f8c4e06b47db..a7eb6319f274c3fc7071251fe3a6aedb
+ }
+ // Leaves end - skip photographer
+
onlinePlayers.add(entityplayer1); // Paper - use single player info update packet
onlinePlayers.add(entityplayer1); // Paper - Use single player info update packet on join
}
// Paper start - use single player info update packet
// Paper start - Use single player info update packet on join
@@ -613,6 +736,43 @@ public abstract class PlayerList {
}
@@ -334,7 +334,7 @@ index 5e156b229f132626ed1e15a92302f8c4e06b47db..a7eb6319f274c3fc7071251fe3a6aedb
this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
UUID uuid = entityplayer.getUUID();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1dc51050065af9bfc760f0a2cd7a479817888280..3997e5b56d99cb7374a0983ddb12caac12776b07 100644
index 69a7933bca98d29f215edfe3839e416207d083f9..7e97276a05a2771d644b1f3a54363dad485b4eac 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -260,6 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -347,7 +347,7 @@ index 1dc51050065af9bfc760f0a2cd7a479817888280..3997e5b56d99cb7374a0983ddb12caac
import javax.annotation.Nonnull; // Paper
@@ -307,6 +308,7 @@ public final class CraftServer implements Server {
private final io.papermc.paper.logging.SysoutCatcher sysoutCatcher = new io.papermc.paper.logging.SysoutCatcher(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper
private final CraftPotionBrewer potionBrewer = new CraftPotionBrewer(); // Paper - Custom Potion Mixes
private final CraftBotManager botManager = new CraftBotManager();
+ private final CraftPhotographerManager photographerManager = new CraftPhotographerManager();
@@ -362,7 +362,7 @@ index 1dc51050065af9bfc760f0a2cd7a479817888280..3997e5b56d99cb7374a0983ddb12caac
@Override
public CraftPlayer apply(ServerPlayer player) {
return player.getBukkitEntity();
@@ -3253,4 +3255,11 @@ public final class CraftServer implements Server {
@@ -3252,4 +3254,11 @@ public final class CraftServer implements Server {
return botManager;
}
// Leaves end - Bot API

6
patches/server/0110-Leaves-I18n.patch
View File

@@ -51,16 +51,16 @@ index 571fdf253ebc5cf2a3ec120c53293b37b770836d..800cadbb379cb90d5351c6d73f994713
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
BiConsumer<String, String> biConsumer = builder::put;
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index d4932ba7042b897a8561103367d0b7cf9a08234c..e23d90e2952efbab58e43b795550ae0db7b3c883 100644
index 9229b76bb0bb87797cc3f5615d85fe2e5fd0c027..9c981632854acf2d26057882cb0b82812885b912 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -222,6 +222,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
top.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
System.setProperty("spark.serverconfigs.extra", "leaves.yml"); // Leaves - spark config
+ net.minecraft.locale.Language.loadI18N(top.leavesmc.leaves.LeavesConfig.serverLang); // Leaves - i18n
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Leaves - down
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
diff --git a/src/main/resources/assets/minecraft/lang/zh_cn.json b/src/main/resources/assets/minecraft/lang/zh_cn.json
new file mode 100644

4
patches/server/0112-Wool-Hopper-Counter.patch
View File

@@ -19,11 +19,11 @@ index 7c29750e534eae4266bf7a63c50e3827401d6569..ab9a8c428975d016fbfa210b3a8cb531
public ItemStack[] itemStacks;
@Nullable
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 5fabdda079ebcb0e5d119f3e60f7447d88dd2707..659d4e62bb57946e595174d758c351e4feed1952 100644
index 62d1c35e78f84f561deea990b4938258a482fe39..0260b72aa06fb9e7260ece98832a56ea72dc4255 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -444,6 +444,13 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
// Paper end
// Paper end - Perf: Optimize Hoppers
private static boolean ejectItems(Level world, BlockPos blockposition, BlockState iblockdata, Container iinventory, HopperBlockEntity hopper) { // CraftBukkit
+ // Leaves start - hopper counter

4
patches/server/0117-Servux-Protocol.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Servux Protocol
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index ed288e84029d5ef7e9b7eb2827458c258f0ce10e..99ad309a2957e25004138a4b32a701108b832514 100644
index b52ac7c98e42d9e80c55bfb9ea562fcbf3c729d0..2b0937072cd3b3d59379781557844438eaefad2d 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -935,6 +935,7 @@ public class LevelChunk extends ChunkAccess {
@@ -934,6 +934,7 @@ public class LevelChunk extends ChunkAccess {
// Leaves start - bbor
if (loaded) {
top.leavesmc.leaves.protocol.BBORProtocol.onChunkLoaded(this);

4
patches/server/0120-Disable-offline-warn-if-use-proxy.patch
View File

@@ -5,13 +5,13 @@ Subject: [PATCH] Disable offline warn if use proxy
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index e23d90e2952efbab58e43b795550ae0db7b3c883..f855d6a7dfe563476c35219a6195916fbbcb53aa 100644
index 9c981632854acf2d26057882cb0b82812885b912..3fa1a5bb3ee4db5100c0f9bbd1c1ccbf80dc0270 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -283,7 +283,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
String proxyFlavor = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "Velocity" : "BungeeCord";
String proxyLink = (io.papermc.paper.configuration.GlobalConfiguration.get().proxies.velocity.enabled) ? "https://docs.papermc.io/velocity/security" : "http://www.spigotmc.org/wiki/firewall-guide/";
// Paper end
// Paper end - Add Velocity IP Forwarding Support
- if (!this.usesAuthentication()) {
+ if (!io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode()) { // Leaves - bungee or velocity
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");

6
patches/server/0121-Disable-moved-wrongly-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable moved wrongly threshold
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index aa5fc061e905bc901ae6672cd54c3c9bca4cee76..d4bb01f41dc46bb4ea01472e04238c39ef865788 100644
index 1d5e7cde06e4f4aa65caaf9b28c1663a59b62679..ce64b31bee8003942ad6f9dae64d41b0b07218fa 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -559,7 +559,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -26,7 +26,7 @@ index aa5fc061e905bc901ae6672cd54c3c9bca4cee76..d4bb01f41dc46bb4ea01472e04238c39
flag2 = true; // Paper - diff on change, this should be moved wrongly
ServerGamePacketListenerImpl.LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", new Object[]{entity.getName().getString(), this.player.getName().getString(), Math.sqrt(d10)});
}
@@ -1426,7 +1426,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1428,7 +1428,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
io.papermc.paper.event.player.PlayerFailMoveEvent event = fireFailMove(io.papermc.paper.event.player.PlayerFailMoveEvent.FailReason.MOVED_TOO_QUICKLY,
toX, toY, toZ, toYaw, toPitch, true);
if (!event.isAllowed()) {
@@ -35,7 +35,7 @@ index aa5fc061e905bc901ae6672cd54c3c9bca4cee76..d4bb01f41dc46bb4ea01472e04238c39
ServerGamePacketListenerImpl.LOGGER.warn("{} moved too quickly! {},{},{}", new Object[]{this.player.getName().getString(), d6, d7, d8});
this.teleport(this.player.getX(), this.player.getY(), this.player.getZ(), this.player.getYRot(), this.player.getXRot());
return;
@@ -1496,7 +1496,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1498,7 +1498,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
d10 = d6 * d6 + d7 * d7 + d8 * d8;
boolean flag2 = false;

14
patches/server/0126-Linear-region-file-format.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Linear region file format
This patch is Powered by LinearPurpur(https://github.com/StupidCraft/LinearPurpur)
diff --git a/build.gradle.kts b/build.gradle.kts
index 25def80ee99baa1dfc5e0a785a2b190d1beb4865..64f783d8508c38630b2324574a6d44d38029c810 100644
index 3f1316110dd00ae51e2bde8bd87e3b582587b92c..32977ad358c48cc17b0c56f516f74c42336eb38a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,6 +36,10 @@ dependencies {
@@ -18,8 +18,8 @@ index 25def80ee99baa1dfc5e0a785a2b190d1beb4865..64f783d8508c38630b2324574a6d44d3
+ implementation("org.lz4:lz4-java:1.8.0")
+ // Leaves end - Linear format
implementation("org.apache.logging.log4j:log4j-iostreams:2.19.0") // Paper - remove exclusion
implementation("org.ow2.asm:asm:9.5")
implementation("org.ow2.asm:asm-commons:9.5") // Paper - ASM event executor generation
implementation("org.ow2.asm:asm-commons:9.5")
implementation("org.spongepowered:configurate-yaml:4.2.0-SNAPSHOT") // Paper - config files
diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
index f2c27e0ac65be4b75c1d86ef6fd45fdb538d96ac..036da95df5280e547e60d3b4641dad63ec15c224 100644
--- a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
@@ -103,7 +103,7 @@ index 8a11e10b01fa012b2f98b1c193c53251e848f909..17057486c031708d3aab82a01031cfef
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 61a84fd1aeaa4ddd506a1879183c532540a055a6..e1d7131cfadba66c55afb49b4cb91ae1a94864fb 100644
index 5dea3d1a33f107959562d64493baffc7dc6dfdd3..983a2cd560921b41bd393bd11b15f0735144d6d3 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -868,13 +868,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -166,7 +166,7 @@ index f2a7cb6ebed7a4b4019a09af2a025f624f6fe9c9..c54b88834981d3a2a23c862cc54733b2
try {
for (int i1 = 0; i1 < 32; ++i1) {
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
index 9248769e6d357f6eec68945fd7700e79b2942c41..fa07c03d353b032b3f3088ef9de012bbe839dc0e 100644
index c50d317d63f5ce61788abf449ec59a542b021f50..20b347d80757a702b630d816bbac55a1bea68512 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
@@ -26,7 +26,7 @@ import net.minecraft.nbt.NbtIo; // Paper
@@ -227,7 +227,7 @@ index 9248769e6d357f6eec68945fd7700e79b2942c41..fa07c03d353b032b3f3088ef9de012bb
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 6eaeb2db0da59611501f2b1a63b5b48816a0ba48..dab05cb925a8b0e1bd022560b8ed9da83684a7c3 100644
index 6bec4549fbcfb68a053300451e25babf8ff38e99..b25f674e68714b11a9ca2a231f470082392641c8 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,9 +21,14 @@ public class RegionFileStorage implements AutoCloseable {
@@ -482,7 +482,7 @@ index 6eaeb2db0da59611501f2b1a63b5b48816a0ba48..dab05cb925a8b0e1bd022560b8ed9da8
regionfile.flush();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8f57c3805547354af3f5167acc7efca9047f91e2..9c9240a5b871b8dca42b2dc44b861e965ce19212 100644
index 2916fb49c69daaa660fc7f53821e8be766226345..433bbdb42ba5a7b4454eca2895dbf9dbf01086d5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -567,7 +567,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {