prepare for 1.21.4 update

2026-02-19 01:17:42 +01:00 · 2024-12-03 20:24:56 -08:00
parent 0493ac329f
commit f5dd02249f
351 changed files with 6 additions and 6 deletions
--- a/patches/server/0094-Configurable-daylight-cycle.patch
+++ b/patches/server/0094-Configurable-daylight-cycle.patch
@@ -1,94 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sat, 10 Oct 2020 14:29:55 -0500
-Subject: [PATCH] Configurable daylight cycle
-
-
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e1858bc2b043f0edf5d3f1393340f40aa7bcb36a..1349b2bbdc38e9f13617c78d3f1079b9e36aece4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1858,7 +1858,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             long worldTime = level.getGameTime();
-             final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
-             for (Player entityhuman : level.players()) {
-                if (!(entityhuman instanceof ServerPlayer) || (tickCount + entityhuman.getId()) % 20 != 0) {
-+                if (!(entityhuman instanceof ServerPlayer) || (!level.isForceTime() && (tickCount + entityhuman.getId()) % 20 != 0)) { // Purpur
-                     continue;
-                 }
-                 ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 8584dfc20fcbf8c1f490dfe117f2cd72a5aaf3be..cc1edc2e4d62501fcce5353e622e24268b1ab698 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -223,6 +223,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-     private final StructureManager structureManager;
-     private final StructureCheck structureCheck;
-     private final boolean tickTime;
-+    private double preciseTime; // Purpur
-+    private boolean forceTime; // Purpur
-     private final RandomSequences randomSequences;
- 
-     // CraftBukkit start
-@@ -694,6 +696,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-         this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler);
-         // Paper end - rewrite chunk system
-         this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
-+        this.preciseTime = this.serverLevelData.getDayTime(); // Purpur
-     }
- 
-     // Paper start
-@@ -873,6 +876,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
-             this.serverLevelData.getScheduledEvents().tick(this.server, i);
-             Profiler.get().pop();
-             if (this.serverLevelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
-+                // Purpur start
-+                int incrementTicks = isDay() ? this.purpurConfig.daytimeTicks : this.purpurConfig.nighttimeTicks;
-+                if (incrementTicks != 12000) {
-+                    this.preciseTime += 12000 / (double) incrementTicks;
-+                    this.setDayTime(this.preciseTime);
-+                } else
-+                // Purpur end
-                 this.setDayTime(this.levelData.getDayTime() + 1L);
-             }
- 
-@@ -881,7 +891,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
- 
-     public void setDayTime(long timeOfDay) {
-         this.serverLevelData.setDayTime(timeOfDay);
-+        // Purpur start
-+        this.preciseTime = timeOfDay;
-+        this.forceTime = false;
-     }
-+    public void setDayTime(double i) {
-+        this.serverLevelData.setDayTime((long) i);
-+        this.forceTime = true;
-+        // Purpur end
-+    }
-+
-+    // Purpur start
-+    public boolean isForceTime() {
-+        return this.forceTime;
-+    }
-+    // Purpur end
- 
-     public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
-         Iterator iterator = this.customSpawners.iterator();
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0716bd2728be4fcaa4f13485591008ce270ecf82..1060208faaa18020c5762a2eb4851f6148b5f215 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -119,6 +119,13 @@ public class PurpurWorldConfig {
-         raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
-     }
- 
-+    public int daytimeTicks = 12000;
-+    public int nighttimeTicks = 12000;
-+    private void daytimeCycleSettings() {
-+        daytimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.daytime", daytimeTicks);
-+        nighttimeTicks = getInt("gameplay-mechanics.daylight-cycle-ticks.nighttime", nighttimeTicks);
-+    }
-+
-     public int elytraDamagePerSecond = 1;
-     public double elytraDamageMultiplyBySpeed = 0;
-     public int elytraDamagePerFireworkBoost = 0;