Merge remote-tracking branch 'origin/master' into fabric-1.16

# Conflicts: # src/main/java/appeng/block/AEBaseBlockItem.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/parts/PartPlacement.java
2020-07-02 01:15:30 +02:00
parent 3b4302583d f573b52b1b
commit dd9346e53f
5 changed files with 53 additions and 25 deletions
@@ -122,7 +122,7 @@ public class AEBaseBlockItem extends BlockItem {
        }

        ActionResult result = super.place(context);
-        if (result != ActionResult.SUCCESS) {
+        if (!result.isAccepted()) {
            return result;
        }

@@ -132,7 +132,7 @@ public class AEBaseBlockItem extends BlockItem {
            ori = tile;

            if (tile == null) {
-                return ActionResult.SUCCESS;
+                return result;
            }

            if (ori.canBeRotated() && !this.blockType.hasCustomRotation()) {
@@ -148,7 +148,7 @@ public class AEBaseBlockItem extends BlockItem {
            ori.setOrientation(forward, up);
        }

-        return ActionResult.SUCCESS;
+        return result;

    }
 }