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

Update Paper

Browse Source
This commit is contained in:
violetc
2022-10-08 07:55:51 +08:00
parent 905b8b537e
commit 767d58b190
37 changed files with 215 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0027-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 8efd9b1edb12e415434d71f6b644273876d6ac3d..69bd4ca57102ef757cfb5ea8442c26eac7cbc1f7 100644
index e310660e50867715dfcce041d7c8d4904a7dca12..2ff80dbb41324c5ea9dfa1f0b16983452d8778fa 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -762,7 +762,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -792,7 +792,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 8efd9b1edb12e415434d71f6b644273876d6ac3d..69bd4ca57102ef757cfb5ea8442c26ea
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 512bd7b5f01b00d82aa29e3659a5b5b64a1351e7..32ad2282a78f913c16a94ed06a81b3bdf6de0760 100644
index 22838524727a1755739d056b726cf8321b7b4883..2e19e8cf66063a789770531fe399d81ebb20cfda 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -272,6 +272,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -31,8 +31,8 @@ index 512bd7b5f01b00d82aa29e3659a5b5b64a1351e7..32ad2282a78f913c16a94ed06a81b3bd
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, 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
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
@@ -361,6 +363,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.entitySliceManager = new io.papermc.paper.world.EntitySliceManager((ServerLevel)this); // Paper
@@ -360,6 +362,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
}
+ // Leaves start - thread unsafe random get