Skip to content

Commit

Permalink
add cherry_log, cherry_wood, bamboo_block to strippables config
Browse files Browse the repository at this point in the history
  • Loading branch information
granny committed May 1, 2023
1 parent a54b535 commit 21411de
Show file tree
Hide file tree
Showing 49 changed files with 275 additions and 267 deletions.
6 changes: 3 additions & 3 deletions patches/server/0004-Purpur-config-files.patch
Expand Up @@ -179,7 +179,7 @@ index 755c223ab2a046285eb9916b6195093714f4c5ba..5758ce3033c2d4121970eb8757beabc1
.withRequiredArg()
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..bd9ea8dfbd986c96000efb7dc36fc93d12a2c8b9
index 0000000000000000000000000000000000000000..43884d28fe27962a5ca895315849318975cb3011
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -0,0 +1,175 @@
Expand Down Expand Up @@ -260,8 +260,8 @@ index 0000000000000000000000000000000000000000..bd9ea8dfbd986c96000efb7dc36fc93d
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 31);
+ set("config-version", 31);
+ version = getInt("config-version", 32);
+ set("config-version", 32);
+
+ readConfig(PurpurConfig.class, null);
+
Expand Down
12 changes: 10 additions & 2 deletions patches/server/0193-Tool-actionable-options.patch
Expand Up @@ -122,10 +122,10 @@ index 180aec596110309aade13d2080f8824d152b07cb..c4aec1e5135a79837918b692e75a7b55
return InteractionResult.PASS;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6c912eed4ba23d06152d27c6f5e51780a6b525b2..527a1c3205b2a284096ed308fe7947c4cdde2831 100644
index 6c912eed4ba23d06152d27c6f5e51780a6b525b2..e7c6f73fecea09c0f26307a9d18a967652f6200a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -524,6 +524,159 @@ public class PurpurWorldConfig {
@@ -524,6 +524,167 @@ public class PurpurWorldConfig {
});
}

Expand Down Expand Up @@ -154,6 +154,11 @@ index 6c912eed4ba23d06152d27c6f5e51780a6b525b2..527a1c3205b2a284096ed308fe7947c4
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:mangrove_log", Map.of("into", "minecraft:stripped_mangrove_log", "drops", new HashMap<String, Double>()));
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:mangrove_wood", Map.of("into", "minecraft:stripped_mangrove_wood", "drops", new HashMap<String, Double>()));
+ }
+ if (PurpurConfig.version < 32) {
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:cherry_log", Map.of("into", "minecraft:stripped_cherry_log", "drops", new HashMap<String, Double>()));
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:cherry_wood", Map.of("into", "minecraft:stripped_cherry_wood", "drops", new HashMap<String, Double>()));
+ PurpurConfig.config.set("world-settings.default.tools.axe.strippables.minecraft:bamboo_block", Map.of("into", "minecraft:stripped_bamboo_block", "drops", new HashMap<String, Double>()));
+ }
+ getMap("tools.axe.strippables", Map.ofEntries(
+ Map.entry("minecraft:oak_wood", Map.of("into", "minecraft:stripped_oak_wood", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:oak_log", Map.of("into", "minecraft:stripped_oak_log", "drops", new HashMap<String, Double>())),
Expand All @@ -169,6 +174,9 @@ index 6c912eed4ba23d06152d27c6f5e51780a6b525b2..527a1c3205b2a284096ed308fe7947c4
+ Map.entry("minecraft:spruce_log", Map.of("into", "minecraft:stripped_spruce_log", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:mangrove_wood", Map.of("into", "minecraft:stripped_mangrove_wood", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:mangrove_log", Map.of("into", "minecraft:stripped_mangrove_log", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:cherry_log", Map.of("into", "minecraft:stripped_cherry_log", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:cherry_wood", Map.of("into", "minecraft:stripped_cherry_wood", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:bamboo_block", Map.of("into", "minecraft:stripped_bamboo_block", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:warped_stem", Map.of("into", "minecraft:stripped_warped_stem", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:warped_hyphae", Map.of("into", "minecraft:stripped_warped_hyphae", "drops", new HashMap<String, Double>())),
+ Map.entry("minecraft:crimson_stem", Map.of("into", "minecraft:stripped_crimson_stem", "drops", new HashMap<String, Double>())),
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0198-Silk-touchable-budding-amethyst.patch
Expand Up @@ -24,10 +24,10 @@ index bedccb8717d08d5a60058445b04ddff149e7d36c..5293ffca3da94c9c485a87d1232b6a90
+ // Purpur end
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 403420313834bd9f025a8f069291cfea71348804..5e120ed76f0531ee24bd285a1ad16114a571978e 100644
index a587f7c8eb8400caf37dc87fd305b960ba7cb577..e0597971dbf26d38d69909d50d39c260bc026fd4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -718,6 +718,11 @@ public class PurpurWorldConfig {
@@ -726,6 +726,11 @@ public class PurpurWorldConfig {
}
}

Expand All @@ -39,7 +39,7 @@ index 403420313834bd9f025a8f069291cfea71348804..5e120ed76f0531ee24bd285a1ad16114
public boolean chestOpenWithBlockOnTop = false;
private void chestSettings() {
chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop);
@@ -2757,3 +2762,4 @@ public class PurpurWorldConfig {
@@ -2765,3 +2770,4 @@ public class PurpurWorldConfig {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
}
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0199-Big-dripleaf-tilt-delay.patch
Expand Up @@ -24,10 +24,10 @@ index 8537581e7ca1f4efb492a2e734f46f947f36cffa..5f89229ff68d923c5cdee40e72e379ba
if (i != -1) {
world.scheduleTick(blockposition, (Block) this, i);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 5e120ed76f0531ee24bd285a1ad16114a571978e..312f1a7cc9f15d0cd7627f32cfa9f86ae12eae7a 100644
index e0597971dbf26d38d69909d50d39c260bc026fd4..c3fc9f7dab12b0dfd7041962191eb419b3199008 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -718,6 +718,22 @@ public class PurpurWorldConfig {
@@ -726,6 +726,22 @@ public class PurpurWorldConfig {
}
}

Expand Down
Expand Up @@ -17,18 +17,18 @@ index bfde674f2e5f88cfe9a4c760a9f8eb9038eaef21..0cb3a52990eb17339fbd61e1649a2774
for (int i = 0; i < 64; ++i) {
if (this.teleport()) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b368159f9e7cb5c048673d3330693f8b02c2a7c1..572e4c14f2dfa3b0ff50c7322932e3083d37fe70 100644
index 2613b962d13fecc6c6bb029b98ea47b338188b2f..6ea932028d3d429b23f3ed9e5f7fe852a0534ad4 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1340,6 +1340,7 @@ public class PurpurWorldConfig {
@@ -1348,6 +1348,7 @@ public class PurpurWorldConfig {
public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false;
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
+ public boolean endermanIgnoreProjectiles = false;
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1362,6 +1363,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1371,7 @@ public class PurpurWorldConfig {
endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned);
endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);
Expand Down
Expand Up @@ -18,10 +18,10 @@ index 6e1caf05b5577fec82354b4c59e3f86b3c1c1dbc..a6d9354d8ddac808cc89c5fe70842fc2

return InteractionResult.SUCCESS;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 79d08b70a28c407be3cbdea7a80c38651a068441..08dee270faec81a9b99d8d7ca8fed6ed3eb00cc7 100644
index 5ddb672215761df5b19cde908ff2d31c933894b1..9c4a8fffcb992e7a1f7422ec1ac1535f795a053d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2741,6 +2741,8 @@ public class PurpurWorldConfig {
@@ -2749,6 +2749,8 @@ public class PurpurWorldConfig {
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
public boolean zombieVillagerTakeDamageFromWater = false;
Expand All @@ -30,7 +30,7 @@ index 79d08b70a28c407be3cbdea7a80c38651a068441..08dee270faec81a9b99d8d7ca8fed6ed
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2756,6 +2758,8 @@ public class PurpurWorldConfig {
@@ -2764,6 +2766,8 @@ public class PurpurWorldConfig {
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater);
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0206-Option-for-sponges-to-work-on-lava.patch
Expand Up @@ -18,10 +18,10 @@ index d96e3fbc0fd4275c29e7e6154ef66e9ed1a5d829..df04a571ebd3c04bc7b58c1ee5661a1f
++i;
if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 08dee270faec81a9b99d8d7ca8fed6ed3eb00cc7..7e161a793c13f53104ec7178320ce36c5aa1320c 100644
index 9c4a8fffcb992e7a1f7422ec1ac1535f795a053d..92d1abe0854603bedfd6f38404d8716d57572be2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -929,9 +929,11 @@ public class PurpurWorldConfig {
@@ -937,9 +937,11 @@ public class PurpurWorldConfig {

public int spongeAbsorptionArea = 64;
public int spongeAbsorptionRadius = 6;
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0207-Toggle-for-Wither-s-spawn-sound.patch
Expand Up @@ -18,18 +18,18 @@ index eeab4bb9727be75a4167aeb8ed1c80a2a2145be9..b746f793228560275e2a50bd2342f20d
// this.world.globalLevelEvent(1023, new BlockPosition(this), 0);
int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16;
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 7e161a793c13f53104ec7178320ce36c5aa1320c..928b2e580ab629de5f0ad072f9fb62f5df4399cf 100644
index 92d1abe0854603bedfd6f38404d8716d57572be2..f920f804b22b3fc03f03b66bfc8a382a1d89929f 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2586,6 +2586,7 @@ public class PurpurWorldConfig {
@@ -2594,6 +2594,7 @@ public class PurpurWorldConfig {
public boolean witherTakeDamageFromWater = false;
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
+ public boolean witherPlaySpawnSound = true;
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2607,6 +2608,7 @@ public class PurpurWorldConfig {
@@ -2615,6 +2616,7 @@ public class PurpurWorldConfig {
witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater);
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
Expand Down
Expand Up @@ -18,10 +18,10 @@ index 7579946ce222b6ab3685a7fd9821bcd5a4babe33..2fffe4452d8f3fa5b9365dff1cfe5b5d
return false;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 928b2e580ab629de5f0ad072f9fb62f5df4399cf..6b0ed4fc2138f2a8f91cc90af334e4a502929d88 100644
index f920f804b22b3fc03f03b66bfc8a382a1d89929f..32d2d06e70566bac1cced7e6358acc328e8d56b9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -750,6 +750,11 @@ public class PurpurWorldConfig {
@@ -758,6 +758,11 @@ public class PurpurWorldConfig {
buddingAmethystSilkTouch = getBoolean("blocks.budding_amethyst.silk-touch", buddingAmethystSilkTouch);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/server/0210-Conduit-behavior-configuration.patch
Expand Up @@ -77,10 +77,10 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e
});

diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index daf3c30dc7f8d40e6e71184b6e0a2f5305027849..b4488467a30e40d9b89a979819142d8863444778 100644
index 87b54db440a793f805cfa6abfe9d5c5b6f37aaae..944ea228713704695dfaf4c673178ceb73d08008 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2805,5 +2805,28 @@ public class PurpurWorldConfig {
@@ -2813,5 +2813,28 @@ public class PurpurWorldConfig {
private void hungerSettings() {
hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage);
}
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0211-Cauldron-fill-chances.patch
Expand Up @@ -47,10 +47,10 @@ index 6b909d41ccdf6c1ac3ac0c4e673ff52f0d14a238..b8f69063cec4d31c9d9525a04c46ed89

if (dripChance < f1) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b4488467a30e40d9b89a979819142d8863444778..7265366cf680f8587b49995705a3f5a1083c67fe 100644
index 944ea228713704695dfaf4c673178ceb73d08008..711cc863c06731e347893c75fe84d9873859297e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2828,5 +2828,16 @@ public class PurpurWorldConfig {
@@ -2836,5 +2836,16 @@ public class PurpurWorldConfig {
});
conduitBlocks = conduitBlockList.toArray(Block[]::new);
}
Expand Down
6 changes: 3 additions & 3 deletions patches/server/0213-Shulker-change-color-with-dye.patch
Expand Up @@ -47,18 +47,18 @@ index 144a872afd4585767d1e96c3e51d4b9fd87dbf89..ec90f23f64ce4fefa0960ae9ddf72b77

@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ec5adf9fafbfa451ba610f132c8dc249c7bf4812..2c6e4905e691338de60d60cfe27fefce1854e102 100644
index 5356508723b92fa608c86179d0de5850f240ecaf..ae41ff2cd534efaacf8ca1f108b7cdc079b2a1b5 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2148,6 +2148,7 @@ public class PurpurWorldConfig {
@@ -2156,6 +2156,7 @@ public class PurpurWorldConfig {
public double shulkerSpawnFromBulletNearbyRange = 8.0D;
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
+ public boolean shulkerChangeColorWithDye = false;
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2164,6 +2165,7 @@ public class PurpurWorldConfig {
@@ -2172,6 +2173,7 @@ public class PurpurWorldConfig {
shulkerSpawnFromBulletNearbyRange = getDouble("mobs.shulker.spawn-from-bullet.nearby-range", shulkerSpawnFromBulletNearbyRange);
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);
Expand Down
Expand Up @@ -45,10 +45,10 @@ index 8584a65433555133cdcfc24a078fb0b53b9f83bc..4afc4670f9b00a4087410ec366fe45fe
public static final Block PINK_PETALS = register("pink_petals", new PinkPetalsBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().sound(SoundType.PINK_PETALS).requiredFeatures(FeatureFlags.UPDATE_1_20)));
public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS)));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2faddfef9b38d35cfcd6ffdb8a93b0c831f59bf2..983ce2c38f27be08cb9a95305ff465222c8d307a 100644
index c62c3b29fd9178952610f47d5fc30096cd2829da..b0b0f8b250a789e1e137305cbec4722e91b8047d 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -705,6 +705,11 @@ public class PurpurWorldConfig {
@@ -713,6 +713,11 @@ public class PurpurWorldConfig {
anvilColorsUseMiniMessage = getBoolean("blocks.anvil.use-mini-message", anvilColorsUseMiniMessage);
}

Expand All @@ -60,7 +60,7 @@ index 2faddfef9b38d35cfcd6ffdb8a93b0c831f59bf2..983ce2c38f27be08cb9a95305ff46522
public int beaconLevelOne = 20;
public int beaconLevelTwo = 30;
public int beaconLevelThree = 40;
@@ -847,6 +852,11 @@ public class PurpurWorldConfig {
@@ -855,6 +860,11 @@ public class PurpurWorldConfig {
farmlandTramplingFeatherFalling = getBoolean("blocks.farmland.feather-fall-distance-affects-trampling", farmlandTramplingFeatherFalling);
}

Expand Down
Expand Up @@ -47,18 +47,18 @@ index f8d3a5d2dc254501c7e4405444ed4439f9af915e..c038a23c4e19c5bf160792cf599acc8f

public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 19108c36e9ceeb28c74f7b87547d5ad6ea267f2e..16954ae2a65b54b77807b5fcb6b07da3b4aa4056 100644
index ec8ce58e11a31d5de4db55cd4030aa3526161d49..989347b0958fb096437d9c3fd7004b32dc335944 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1246,6 +1246,7 @@ public class PurpurWorldConfig {
@@ -1254,6 +1254,7 @@ public class PurpurWorldConfig {
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
+ public double dolphinNaturallyAggressiveToPlayersChance = 0.0D;
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1260,6 +1261,7 @@ public class PurpurWorldConfig {
@@ -1268,6 +1269,7 @@ public class PurpurWorldConfig {
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);
Expand Down

0 comments on commit 21411de

Please sign in to comment.