From 585e6ca366d639825f042fd78f13018d4ab6b1ae Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sun, 21 Sep 2025 22:18:56 -0700
Subject: [PATCH] other things i missed

---
 .../net/minecraft/server/level/ServerLevel.java.patch | 11 ++---------
 .../net/minecraft/world/entity/animal/Bee.java.patch  |  9 +++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
index 34fb37fd2..bd0a05826 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
@@ -52,14 +52,6 @@
              // Paper start - create time skip event - move up calculations
              final long newDayTime = this.levelData.getDayTime() + 24000L;
              org.bukkit.event.world.TimeSkipEvent event = new org.bukkit.event.world.TimeSkipEvent(
-@@ -855,6 +_,7 @@
-         this.debugSynchronizers.tick(this.server.debugSubscribers());
-         profilerFiller.pop();
-     }
-+    // Purpur end - Configurable daylight cycle
- 
-     @Override
-     public boolean shouldTickBlocksAt(long chunkPos) {
 @@ -872,6 +_,13 @@
              this.serverLevelData.getScheduledEvents().tick(this.server, l);
              Profiler.get().pop();
@@ -74,7 +66,7 @@
                  this.setDayTime(this.levelData.getDayTime() + 1L);
              }
          }
-@@ -879,6 +_,19 @@
+@@ -879,6 +_,20 @@
  
      public void setDayTime(long time) {
          this.serverLevelData.setDayTime(time);
@@ -91,6 +83,7 @@
 +    // Purpur start - Configurable daylight cycle
 +    public boolean isForceTime() {
 +        return this.forceTime;
++    // Purpur end - Configurable daylight cycle
      }
  
      public void tickCustomSpawners(boolean flag) {
diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch
index 15c6e1abf..022c7eaff 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch
@@ -18,6 +18,15 @@
      }
  
      public void setStayOutOfHiveCountdown(int stayOutOfHiveCountdown) {
+@@ -391,7 +_,7 @@
+     @Override
+     protected void customServerAiStep(ServerLevel level) {
+         boolean hasStung = this.hasStung();
+-        if (this.isInWater()) {
++        if (this.level().purpurConfig.beeCanInstantlyStartDrowning && this.isInWater()) { // Purpur - bee can instantly start drowning in water option
+             this.underWaterTicks++;
+         } else {
+             this.underWaterTicks = 0;
 @@ -401,6 +_,7 @@
              this.hurtServer(level, this.damageSources().drown(), 1.0F);
          }