From 32217b290802a79354f6039daae2db37603e0db7 Mon Sep 17 00:00:00 2001 From: DoctaEnkoda Date: Sat, 11 Jan 2025 19:03:24 -0800 Subject: [PATCH] Bee can work when raining or at night --- ...ee-can-work-when-raining-or-at-night.patch | 41 ------------------- .../world/entity/animal/Bee.java.patch | 11 +++++ .../purpurmc/purpur/PurpurWorldConfig.java | 4 ++ 3 files changed, 15 insertions(+), 41 deletions(-) delete mode 100644 patches/server/0165-Bee-can-work-when-raining-or-at-night.patch create mode 100644 purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch diff --git a/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch deleted file mode 100644 index 1a950aba6..000000000 --- a/patches/server/0165-Bee-can-work-when-raining-or-at-night.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: DoctaEnkoda -Date: Thu, 27 May 2021 06:46:30 +0200 -Subject: [PATCH] Bee can work when raining or at night - - -diff --git a/net/minecraft/world/entity/animal/Bee.java b/net/minecraft/world/entity/animal/Bee.java -index 40137a98174cd0238d06c894373984a403f96fbc..e191e27308dd8c5c8702692091541756f2b57ac1 100644 ---- a/net/minecraft/world/entity/animal/Bee.java -+++ b/net/minecraft/world/entity/animal/Bee.java -@@ -430,7 +430,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { - } - - public static boolean isNightOrRaining(Level world) { -- return world.dimensionType().hasSkyLight() && (world.isNight() || world.isRaining()); -+ return world.dimensionType().hasSkyLight() && ((world.isNight() && !world.purpurConfig.beeCanWorkAtNight) || (world.isRaining() && !world.purpurConfig.beeCanWorkInRain)); // Purpur - } - - public void setStayOutOfHiveCountdown(int cannotEnterHiveTicks) { -diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 427e257d7e53d0dc5fbd4acbaa2c1d1f2a12fff8..8eaff3384ed2fa6b4f557e82b6c0f89fa8ae7cb4 100644 ---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -750,6 +750,8 @@ public class PurpurWorldConfig { - public double beeScale = 1.0D; - public int beeBreedingTicks = 6000; - public boolean beeTakeDamageFromWater = true; -+ public boolean beeCanWorkAtNight = false; -+ public boolean beeCanWorkInRain = false; - private void beeSettings() { - beeRidable = getBoolean("mobs.bee.ridable", beeRidable); - beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater); -@@ -764,6 +766,8 @@ public class PurpurWorldConfig { - beeScale = Mth.clamp(getDouble("mobs.bee.attributes.scale", beeScale), 0.0625D, 16.0D); - beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks); - beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater); -+ beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight); -+ beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain); - } - - public boolean blazeRidable = false; 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 new file mode 100644 index 000000000..6c5dc1389 --- /dev/null +++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/animal/Bee.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/entity/animal/Bee.java ++++ b/net/minecraft/world/entity/animal/Bee.java +@@ -365,7 +_,7 @@ + } + + public static boolean isNightOrRaining(Level level) { +- return level.dimensionType().hasSkyLight() && (level.isNight() || level.isRaining()); ++ return level.dimensionType().hasSkyLight() && (level.isNight() && !level.purpurConfig.beeCanWorkAtNight || level.isRaining() && !level.purpurConfig.beeCanWorkInRain); // Purpur - Bee can work when raining or at night + } + + public void setStayOutOfHiveCountdown(int stayOutOfHiveCountdown) { diff --git a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index a4f33415f..4aa54aff4 100644 --- a/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -742,6 +742,8 @@ public class PurpurWorldConfig { public double beeScale = 1.0D; public int beeBreedingTicks = 6000; public boolean beeTakeDamageFromWater = true; + public boolean beeCanWorkAtNight = false; + public boolean beeCanWorkInRain = false; private void beeSettings() { beeRidable = getBoolean("mobs.bee.ridable", beeRidable); beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater); @@ -756,6 +758,8 @@ public class PurpurWorldConfig { beeScale = Mth.clamp(getDouble("mobs.bee.attributes.scale", beeScale), 0.0625D, 16.0D); beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks); beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater); + beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight); + beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain); } public boolean blazeRidable = false;