增加vanilla.preventPistonPushTileEntity选项 (Fixed Luohuayu#523)

wdbb666 · Jul 26, 2022 · d4bc4dc · d4bc4dc
1 parent 53c04ea
commit d4bc4dc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/patches/net/minecraft/block/BlockPistonBase.java.patch b/patches/net/minecraft/block/BlockPistonBase.java.patch
@@ -84,7 +84,7 @@
 +            // CatServer start - prevent move or break tileentity or some block
 +            boolean cancell = false;
 +            for (BlockPos blockPos : moved) {
-+                if (worldIn.getTileEntity(blockPos) != null) {
++                if (catserver.server.CatServer.getConfig().preventPistonPushTileEntity && worldIn.getTileEntity(blockPos) != null) {
 +                    cancell = true;
 +                    break;
 +                }

diff --git a/src/main/java/catserver/server/CatServerConfig.java b/src/main/java/catserver/server/CatServerConfig.java
@@ -28,6 +28,7 @@ public class CatServerConfig {
 
     public boolean fixPlayBossSoundToOtherWorld = true;
     public boolean fixLessCrystalRespawnDragon = false;
+    public boolean preventPistonPushTileEntity = true;
     public boolean preventPistonPushRail = false;
     public boolean preventPistonPushSlimeBlock = false;
     public boolean limitFastClickGUI = false;
@@ -76,6 +77,7 @@ public void loadConfig() {
         // vanilla
         fixPlayBossSoundToOtherWorld = getOrWriteBooleanConfig("vanilla.fixPlayBossSoundToOtherWorld", fixPlayBossSoundToOtherWorld);
         fixLessCrystalRespawnDragon = getOrWriteBooleanConfig("vanilla.fixLessCrystalRespawnDragon", fixLessCrystalRespawnDragon);
+        preventPistonPushTileEntity = getOrWriteBooleanConfig("vanilla.preventPistonPushTileEntity", preventPistonPushTileEntity);
         preventPistonPushRail = getOrWriteBooleanConfig("vanilla.preventPistonPushRail", preventPistonPushRail);
         preventPistonPushSlimeBlock = getOrWriteBooleanConfig("vanilla.preventPistonPushSlimeBlock", preventPistonPushRail);
         limitFastClickGUI = getOrWriteBooleanConfig("vanilla.limitFastClickGUI", limitFastClickGUI);