Skip to content
This repository was archived by the owner on Apr 13, 2025. It is now read-only.

Commit 65637fa

Browse files
committed
fix(mobs/bee): Set takes-damage-from-water back to false by default, closes PurpurMC#1639
Also migrates the value to false for old configs. Users who previously set this to true will need to re-enable it.
1 parent 2fe4cf1 commit 65637fa

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

purpur-server/src/main/java/org/purpurmc/purpur/PurpurConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public static void init(File configFile) {
7474
commands = new HashMap<>();
7575
commands.put("purpur", new PurpurCommand("purpur"));
7676

77-
version = getInt("config-version", 39);
78-
set("config-version", 39);
77+
version = getInt("config-version", 40);
78+
set("config-version", 40);
7979

8080
readConfig(PurpurConfig.class, null);
8181

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1229,7 +1229,7 @@ private void batSettings() {
12291229
public double beeMaxHealth = 10.0D;
12301230
public double beeScale = 1.0D;
12311231
public int beeBreedingTicks = 6000;
1232-
public boolean beeTakeDamageFromWater = true;
1232+
public boolean beeTakeDamageFromWater = false;
12331233
public boolean beeCanWorkAtNight = false;
12341234
public boolean beeCanWorkInRain = false;
12351235
public boolean beeAlwaysDropExp = false;
@@ -1247,6 +1247,9 @@ private void beeSettings() {
12471247
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
12481248
beeScale = Mth.clamp(getDouble("mobs.bee.attributes.scale", beeScale), 0.0625D, 16.0D);
12491249
beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks);
1250+
if (PurpurConfig.version < 40) {
1251+
set("mobs.bee.takes-damage-from-water", false);
1252+
}
12501253
beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater);
12511254
beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
12521255
beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);

0 commit comments

Comments
 (0)