From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Encode42 Date: Wed, 24 Mar 2021 20:30:37 -0400 Subject: [PATCH] Configurable sponge absorption Allows the total area and radius of water blocks the sponge can absorb to be changed. diff --git a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java index 11b40defd5f5362346fd8a70a1141cd6425cefa7..fe4fdd21ae22970ddd8c7f5cd72bdf88b9be0a20 100644 --- a/src/main/java/net/minecraft/world/level/block/SpongeBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SpongeBlock.java @@ -76,13 +76,13 @@ public class SpongeBlock extends Block { if (fluid.is(FluidTags.WATER)) { if (iblockdata.getBlock() instanceof BucketPickup && !((BucketPickup) iblockdata.getBlock()).pickupBlock(blockList, blockposition2, iblockdata).isEmpty()) { // CraftBukkit ++i; - if (j < 6) { + if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur queue.add(new Tuple<>(blockposition2, j + 1)); } } else if (iblockdata.getBlock() instanceof LiquidBlock) { blockList.setBlock(blockposition2, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit ++i; - if (j < 6) { + if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur queue.add(new Tuple<>(blockposition2, j + 1)); } } else if (material == Material.WATER_PLANT || material == Material.REPLACEABLE_WATER_PLANT) { @@ -93,14 +93,14 @@ public class SpongeBlock extends Block { blockList.setBlock(blockposition2, Blocks.AIR.defaultBlockState(), 3); // CraftBukkit end ++i; - if (j < 6) { + if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur queue.add(new Tuple<>(blockposition2, j + 1)); } } } } - if (i > 64) { + if (i > world.purpurConfig.spongeAbsorptionArea) { // Purpur break; } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java index 490b1147688313660a779997ae07c33da04a1676..d31159c88273c0910c52db82853678102815192f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -608,6 +608,13 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } + public int spongeAbsorptionArea = 64; + public int spongeAbsorptionRadius = 6; + private void spongeSettings() { + spongeAbsorptionArea = getInt("blocks.sponge.absorption.area", spongeAbsorptionArea); + spongeAbsorptionRadius = getInt("blocks.sponge.absorption.radius", spongeAbsorptionRadius); + } + public float stonecutterDamage = 0.0F; private void stonecutterSettings() { stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);