Set the bee's takes-damage-from-water option to true by default (#1614

)
PurpurMC · Nov 27, 2024 · 420a1ce · 420a1ce
1 parent 06dde9d
commit 420a1ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0122-Toggle-for-water-sensitive-mob-damage.patch
@@ -1199,7 +1199,7 @@ index 738df68a988a8ba428bf2c74a12cb8d9dd525bee..116f47c7342dade1eaf0fabc62fb0ba2
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 126d2689166579785735cf250ddf0838512ce81b..5480f6fbc3b3f99297ff4de83c6501fa2161714a 100644
+index 126d2689166579785735cf250ddf0838512ce81b..9ab4dfe8cccbb8e4cc200930059acde1fb0341a6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -549,12 +549,14 @@ public class PurpurWorldConfig {
@@ -1237,7 +1237,7 @@ index 126d2689166579785735cf250ddf0838512ce81b..5480f6fbc3b3f99297ff4de83c6501fa
      public double beeMaxHealth = 10.0D;
      public double beeScale = 1.0D;
      public int beeBreedingTicks = 6000;
-+    public boolean beeTakeDamageFromWater = false;
++    public boolean beeTakeDamageFromWater = true;
      private void beeSettings() {
          beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
          beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);

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
@@ -18,13 +18,13 @@ index d47e5f774567aa4710686430b66eb1409c2f0c97..8caee835f524d23d061ff73d9fb60948
 
      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 cf07ee866e9b12be43a129a541e17b6cde0d936b..398cb3dfc7baac5ee610475b3709fdd3252c02e9 100644
+index db82c66338f2224ac887f3a47fe5e7fcb3ba0a57..1083c6cc35206e09b57ae993623bffa5eecfb1f6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -748,6 +748,8 @@ public class PurpurWorldConfig {
      public double beeScale = 1.0D;
      public int beeBreedingTicks = 6000;
-     public boolean beeTakeDamageFromWater = false;
+     public boolean beeTakeDamageFromWater = true;
 +    public boolean beeCanWorkAtNight = false;
 +    public boolean beeCanWorkInRain = false;
      private void beeSettings() {

diff --git a/patches/server/0216-Mobs-always-drop-experience.patch b/patches/server/0216-Mobs-always-drop-experience.patch
@@ -1157,7 +1157,7 @@ index 7d219c1bfdcdc6d06dcb91c33ef09f88dca13aa3..37ba31724fb3630c9c7d8040f47be36e
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6954e3491cc21577931f9bd5eec33b05a670aca4..ecad05c231bee0245db1b30e9955fa6edd1596b0 100644
+index b9b47cd429c73c856d6ecd9d48fe0c46cee7330d..744730583ec613adc8e31565780fbcae72a9b69c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1087,6 +1087,7 @@ public class PurpurWorldConfig {
@@ -1193,7 +1193,7 @@ index 6954e3491cc21577931f9bd5eec33b05a670aca4..ecad05c231bee0245db1b30e9955fa6e
 
      public boolean beeRidable = false;
 @@ -1142,6 +1146,7 @@ public class PurpurWorldConfig {
-     public boolean beeTakeDamageFromWater = false;
+     public boolean beeTakeDamageFromWater = true;
      public boolean beeCanWorkAtNight = false;
      public boolean beeCanWorkInRain = false;
 +    public boolean beeAlwaysDropExp = false;