diff --git a/gradle.properties b/gradle.properties index fcc72a04..5b618226 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ version = 1.19-R0.1-SNAPSHOT mcVersion = 1.19 packageVersion = 1_19_R0 org.gradle.jvmargs=-Xmx2G -paperRef=cd215af6eb784724868ea0d276e6cc0f06fc2624 +paperRef=b7faa655cb617549a3437f33c353cbaddb1746ff diff --git a/patches/server/0003-Leaves-Server-Config.patch b/patches/server/0003-Leaves-Server-Config.patch index 59adc681..6f9f672a 100644 --- a/patches/server/0003-Leaves-Server-Config.patch +++ b/patches/server/0003-Leaves-Server-Config.patch @@ -31,7 +31,7 @@ index c2a521c546089e33ef08f0874b50072152ba8bb0..83a38995f63c855892fdf7e6c05ad789 org.spigotmc.WatchdogThread.hasStarted = true; // Paper Arrays.fill( 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 aea18838a17fc52e1bf8cd84cd185565e6e2246d..2294294bd192d380d99189a1884db7f2be885d04 100644 +index b42327dcf0cc9feaf4fdb67de949dd36cf71bbaa..055260dd5a9f106e6e81aae48407f1711d6a93ab 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -226,6 +226,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -44,19 +44,18 @@ index aea18838a17fc52e1bf8cd84cd185565e6e2246d..2294294bd192d380d99189a1884db7f2 this.setPvpAllowed(dedicatedserverproperties.pvp); this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..f15a1025c9edb4de8bfdfd9b0109e616edb20cbb 100644 +index 9467ccaa1d73e1913495a46919aee530e749977d..4ea3b42c62b657ba386c9dca3d2afe5cd9b256a5 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -174,6 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -174,6 +174,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { // Paper end public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray -+ + public final top.leavesmc.leaves.LeavesConfig.WorldConfig leavesConfig; // Leaves - World Config - public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot -@@ -275,6 +277,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + private org.spigotmc.TickLimiter entityLimiter; +@@ -274,6 +275,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, Holder holder, Supplier 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 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