Disable old fix

APDevTeam · Sep 11, 2024 · ce5640b · ce5640b
1 parent 09ae415
commit ce5640b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/async/rotation/RotationTask.java b/Movecraft/src/main/java/net/countercraft/movecraft/async/rotation/RotationTask.java
@@ -115,13 +115,13 @@ protected void execute() {
             newHitBox.add(newLocation);
 
             //Prevent piston bug
-            if (originalLocation.toBukkit(getCraft().getWorld()).getBlock().getType().equals(Material.MOVING_PISTON)) {
-                failed = true;
-                failMessage = (String.format(I18nSupport.getInternationalisedString("Translation - Failed Craft is obstructed")
-                                + " @ %d,%d,%d,%s", originalLocation.getX(), originalLocation.getY(), originalLocation.getZ(),
-                        originalLocation.toBukkit(craft.getWorld()).getBlock().getType()));
-                break;
-            }
+            //if (originalLocation.toBukkit(getCraft().getWorld()).getBlock().getType().equals(Material.MOVING_PISTON)) {
+            //    failed = true;
+            //    failMessage = (String.format(I18nSupport.getInternationalisedString("Translation - Failed Craft is obstructed")
+            //                    + " @ %d,%d,%d,%s", originalLocation.getX(), originalLocation.getY(), originalLocation.getZ(),
+            //            originalLocation.toBukkit(craft.getWorld()).getBlock().getType()));
+            //    break;
+            //}
 
             Material oldMaterial = originalLocation.toBukkit(w).getBlock().getType();
             //prevent chests collision

diff --git a/Movecraft/src/main/java/net/countercraft/movecraft/async/translation/TranslationTask.java b/Movecraft/src/main/java/net/countercraft/movecraft/async/translation/TranslationTask.java
@@ -167,10 +167,10 @@ protected void execute() throws InterruptedException, ExecutionException {
                 continue;
             }
             //Prevent piston bug
-            if (oldLocation.toBukkit(world).getBlock().getType().equals(Material.MOVING_PISTON))
-                fail(String.format(I18nSupport.getInternationalisedString("Translation - Failed Craft is obstructed")
-                                + " @ %d,%d,%d,%s", oldLocation.getX(), oldLocation.getY(), oldLocation.getZ(),
-                        oldLocation.toBukkit(craft.getWorld()).getBlock().getType()));
+            //if (oldLocation.toBukkit(world).getBlock().getType().equals(Material.MOVING_PISTON))
+            //    fail(String.format(I18nSupport.getInternationalisedString("Translation - Failed Craft is obstructed")
+            //                    + " @ %d,%d,%d,%s", oldLocation.getX(), oldLocation.getY(), oldLocation.getZ(),
+            //            oldLocation.toBukkit(craft.getWorld()).getBlock().getType()));
 
             final Material testMaterial = newLocation.toBukkit(world).getBlock().getType();