diff --git a/gradle.properties b/gradle.properties index 6a0aede87..eb05fe283 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=com.lokamc.slice version=1.20.1-R0.1-SNAPSHOT mcVersion=1.20.1 -paperRef=6813244fb06e416bf30542905b7bedfb94facecf +paperRef=b4e3b3d1dd447bac4cbf478595c1ec320bc6dd4b org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch index f554047a5..0d7c38dec 100644 --- a/patches/server/0001-Build-Changes.patch +++ b/patches/server/0001-Build-Changes.patch @@ -42,10 +42,10 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..2e1cea360bb6ff85eb8da54237bc4076 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 435f5ee3388f5da93df938c43ea2578f7d586407..ac1cb065ace9198e7e8fe65b3225d0caf456b9dc 100644 +index 67ee3a4ca8a6cdeb275653d492a1fea8037c51fb..915340fedc6c0b3d70ee065482dbe621b7c0b0a8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; -@@ -2651,4 +2652,18 @@ public class ServerPlayer extends Player { +@@ -2656,4 +2657,18 @@ public class ServerPlayer extends Player { return (CraftPlayer) super.getBukkitEntity(); } // CraftBukkit end diff --git a/patches/server/0030-Shared-Data-Storage.patch b/patches/server/0030-Shared-Data-Storage.patch index 2509c3aca..19968666c 100644 --- a/patches/server/0030-Shared-Data-Storage.patch +++ b/patches/server/0030-Shared-Data-Storage.patch @@ -17,7 +17,7 @@ index 019d3bbd78fb0b06861979d223915fedb6c99442..89ec08d2550084c1456ce885c71d1e5d public BlockUpdates blockUpdates; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ac1cb065ace9198e7e8fe65b3225d0caf456b9dc..0d92e021d83a6f467131b079660624be7cd8c137 100644 +index 915340fedc6c0b3d70ee065482dbe621b7c0b0a8..fc6fa65dae66d695b5fd732cc495d3649a28862c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -28,7 +28,7 @@ index ac1cb065ace9198e7e8fe65b3225d0caf456b9dc..0d92e021d83a6f467131b079660624be import com.google.common.collect.ImmutableList; import co.aikar.timings.Timings; import com.destroystokyo.paper.event.server.PaperServerListPingEvent; -@@ -311,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -411,6 +413,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop +Date: Tue, 29 Aug 2023 09:23:11 -0500 +Subject: [PATCH] Biome freeze override + + +diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java +index 65012a12e1430956ef55ced56773e6354ac26444..0178017cb2d871dd344e3da910ee724cac05d7e5 100644 +--- a/src/main/java/net/minecraft/world/level/biome/Biome.java ++++ b/src/main/java/net/minecraft/world/level/biome/Biome.java +@@ -76,6 +76,7 @@ public final class Biome { + return long2FloatLinkedOpenHashMap; + }); + }); ++ public Boolean canFreeze = null; // Slice + + Biome(Biome.ClimateSettings weather, BiomeSpecialEffects effects, BiomeGenerationSettings generationSettings, MobSpawnSettings spawnSettings) { + this.climateSettings = weather; +@@ -138,6 +139,8 @@ public final class Biome { + } + + public boolean shouldFreeze(LevelReader world, BlockPos pos, boolean doWaterCheck) { ++ if (canFreeze != null) return canFreeze; // Slice ++ + if (this.warmEnoughToRain(pos)) { + return false; + } else {