Merge pull request #338 from FTBTeam/dev

Dev
FTBTeam · Dec 6, 2024 · 6ed0496 · 6ed0496
2 parents 5e7606e + cb47714
commit 6ed0496
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2101.1.5]
+
+### Fixed
+* Fixed client-side issues with piston checking (from last update) when connected to dedicated server
+
 ## [2101.1.4]
 
 ### Added

diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/util/PistonHelper.java b/common/src/main/java/dev/ftb/mods/ftbchunks/util/PistonHelper.java
@@ -32,7 +32,7 @@ public class PistonHelper {
      * @return true if the piston should be prevented from moving, false to let it move
      */
     public static boolean shouldPreventPistonMovement(Level level, BlockPos pistonPos, PistonStructureResolver resolver) {
-        if (FTBChunksWorldConfig.PISTON_PROTECTION.get() && !FTBChunksWorldConfig.DISABLE_PROTECTION.get()) {
+        if (!level.isClientSide && FTBChunksWorldConfig.PISTON_PROTECTION.get() && !FTBChunksWorldConfig.DISABLE_PROTECTION.get()) {
             PrivacyProperty editProp = Platform.isFabric() ?
                     FTBChunksProperties.BLOCK_EDIT_AND_INTERACT_MODE :
                     FTBChunksProperties.BLOCK_EDIT_MODE;

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ readable_name=FTB Chunks
 maven_group=dev.ftb.mods
 mod_author=FTB Team
 
-mod_version=2101.1.4
+mod_version=2101.1.5
 minecraft_version=1.21.1
 
 # Deps