diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/block/SprinklerBlock.java b/api/src/main/java/net/momirealms/customcrops/api/core/block/SprinklerBlock.java index be92902..623bd02 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/core/block/SprinklerBlock.java +++ b/api/src/main/java/net/momirealms/customcrops/api/core/block/SprinklerBlock.java @@ -266,7 +266,7 @@ public class SprinklerBlock extends AbstractCustomCropsBlock { return state; } - private void tickSprinkler(CustomCropsBlockState state, CustomCropsWorld world, Pos3 location, boolean offline) { + public void tickSprinkler(CustomCropsBlockState state, CustomCropsWorld world, Pos3 location, boolean offline) { SprinklerConfig config = config(state); if (config == null) { BukkitCustomCropsPlugin.getInstance().getPluginLogger().warn("Sprinkler data is removed at location[" + world.worldName() + "," + location + "] because the sprinkler config[" + id(state) + "] has been removed."); diff --git a/gradle.properties b/gradle.properties index 116e8d0..02b41e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.14.1 +project_version=3.6.15 config_version=41 project_group=net.momirealms # Dependency settings paper_version=1.20.4 jetbrains_annotations_version=24.0.0 -slf4j_version=2.0.13 -log4j_version=2.23.1 -gson_version=2.10.1 -asm_version=9.7 -asm_commons_version=9.7 +slf4j_version=2.0.16 +log4j_version=2.24.1 +gson_version=2.11.0 +asm_version=9.7.1 +asm_commons_version=9.7.1 jar_relocator_version=1.7 adventure_bundle_version=4.17.0 adventure_platform_version=4.3.4 @@ -23,18 +23,18 @@ cloud_bukkit_version=2.0.0-beta.10 cloud_paper_version=2.0.0-beta.10 cloud_minecraft_extras_version=2.0.0-beta.10 boosted_yaml_version=1.3.7 -byte_buddy_version=1.14.18 +byte_buddy_version=1.15.3 mojang_brigadier_version=1.0.18 bstats_version=3.0.2 -geantyref_version=1.3.15 +geantyref_version=1.3.16 caffeine_version=3.1.8 rtag_version=1.5.7 exp4j_version=0.4.8 placeholder_api_version=2.11.6 anti_grief_version=0.13 -zstd_version=1.5.6-5 +zstd_version=1.5.6-6 flow_nbt_version=2.0.2 -guava_version=33.2.0-jre +guava_version=33.3.1-jre vault_version=1.7 # Proxy settings diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/PlayerActionManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/PlayerActionManager.java index d15e692..ff9d96f 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/PlayerActionManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/action/PlayerActionManager.java @@ -486,13 +486,15 @@ public class PlayerActionManager extends AbstractActionManager { Optional> optionalWorld = plugin.getWorldManager().getWorld(location.getWorld()); optionalWorld.ifPresent(world -> world.getChunk(pos3.toChunkPos()).flatMap(chunk -> chunk.getBlockState(pos3)).ifPresent(state -> { CustomCropsBlock customCropsBlock = state.type(); - customCropsBlock.randomTick(state, world, pos3, false); - customCropsBlock.scheduledTick(state, world, pos3, false); if (customCropsBlock instanceof SprinklerBlock sprinklerBlock) { int water = sprinklerBlock.water(state); SprinklerConfig config = sprinklerBlock.config(state); context.arg(ContextKeys.CURRENT_WATER, water); context.arg(ContextKeys.WATER_BAR, Optional.ofNullable(config.waterBar()).map(it -> it.getWaterBar(water, config.storage())).orElse("")); + sprinklerBlock.tickSprinkler(state, world, pos3, false); + } else { + customCropsBlock.randomTick(state, world, pos3, false); + customCropsBlock.scheduledTick(state, world, pos3, false); } })); }, "force-tick");