Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2026-01-04 15:31:45 +00:00
Code Issues Releases Activity

Cleanup Predict Halloween

Browse Source
This commit is contained in:
Dreeam
2024-10-28 06:10:06 -04:00
parent 761682257b
commit 8fe4d47184
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0016-Predict-Halloween.patch
View File

@@ -7,17 +7,9 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
index dc27ddf5131e7398a5390a5187261d4c7fb6ccaa..f223e369dd8d781e32e1f06572b2ae717afd6f32 100644
index dc27ddf5131e7398a5390a5187261d4c7fb6ccaa..c888ca771efa7a570b8302d48e69fbb69bf98bd9 100644
--- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
@@ -1,6 +1,6 @@
package net.minecraft.world.entity.ambient;
-import java.time.LocalDate;
+import java.time.OffsetDateTime;
import java.time.temporal.ChronoField;
import javax.annotation.Nullable;
import net.minecraft.core.BlockPos;
@@ -239,12 +239,60 @@ public class Bat extends AmbientCreature {
}
}
@@ -65,18 +57,18 @@ index dc27ddf5131e7398a5390a5187261d4c7fb6ccaa..f223e369dd8d781e32e1f06572b2ae71
+ if (currentEpochMillis >= nextHalloweenEnd) {
+ // Update prediction
+
+ OffsetDateTime currentDate = OffsetDateTime.now();
+ int currentMonthOfYear = currentDate.get(ChronoField.MONTH_OF_YEAR);
+ int currentDayOfMonth = currentDate.get(ChronoField.DAY_OF_YEAR);
+ java.time.OffsetDateTime currentDate = java.time.OffsetDateTime.now();
+ int currentMonthOfYear = currentDate.getMonth().ordinal() + 1; // Same as getValue()
+ int currentDayOfMonth = currentDate.getDayOfYear();
+
+ OffsetDateTime nextHalloweenStartDate = currentDate.with(ChronoField.MONTH_OF_YEAR, halloweenStartMonthOfYear).with(ChronoField.DAY_OF_MONTH, halloweenStartDayOfMonth);
+ java.time.OffsetDateTime nextHalloweenStartDate = currentDate.withMonth(halloweenStartMonthOfYear).withDayOfMonth(halloweenStartDayOfMonth);
+ if (currentMonthOfYear > halloweenStartMonthOfYear || (currentMonthOfYear == halloweenStartMonthOfYear && currentDayOfMonth >= halloweenStartDayOfMonth)) {
+ nextHalloweenStartDate = nextHalloweenStartDate.with(ChronoField.YEAR, nextHalloweenStartDate.get(ChronoField.YEAR) + 1);
+ nextHalloweenStartDate = nextHalloweenStartDate.withYear(nextHalloweenStartDate.getYear() + 1);
+ }
- return j == 10 && i >= 20 || j == 11 && i <= 3;
+ nextHalloweenStart = nextHalloweenStartDate.toEpochSecond();
+ nextHalloweenEnd = nextHalloweenStartDate.with(ChronoField.MONTH_OF_YEAR, halloweenEndMonthOfYear).with(ChronoField.DAY_OF_MONTH, halloweenEndDayOfMonth).toEpochSecond();
+ nextHalloweenEnd = nextHalloweenStartDate.withMonth(halloweenEndMonthOfYear).withDayOfMonth(halloweenEndDayOfMonth).toEpochSecond();
+ }
+ return currentEpochMillis >= nextHalloweenStart;
+ // Gale end - predict Halloween