Merge remote-tracking branch 'origin/master'

2023-06-16 17:03:46 -04:00
parent b4a32f506e 26c0c7467b
commit 9eefea3c6f
6 changed files with 27 additions and 13 deletions
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -1343,9 +1343,14 @@ public class Block extends UnlockableContent implements Senseable{
        packer.add(PageType.editor, name + "-icon-editor", editorBase);
    }

+    public int planRotation(int rot){
+        if(!rotate) return 0;
+        return rot;
+    }
+
    public void flipRotation(BuildPlan req, boolean x){
        if((x == (req.rotation % 2 == 0)) != invertFlip){
-            req.rotation = Mathf.mod(req.rotation + 2, 4);
+            req.rotation = planRotation(Mathf.mod(req.rotation + 2, 4));
        }
    }