Fix #249

mindustry-antigrief · Dec 2, 2024 · 7793979 · 7793979
1 parent 8914bbf
commit 7793979
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
@@ -39,6 +39,7 @@
 import mindustry.world.*;
 import mindustry.world.blocks.logic.*;
 import mindustry.world.blocks.payloads.*;
+import mindustry.world.blocks.storage.*;
 import mindustry.world.meta.*;
 
 import static arc.Core.*;
@@ -882,6 +883,7 @@ void pollInput(){
             else if (Core.input.ctrl()) {
                 temp.set(frozenPlans);
                 flushPlans(temp, false, false, true);
+                temp.clear();
             }
             else {
                 isBuilding = !isBuilding;
@@ -912,8 +914,9 @@ else if (Core.input.ctrl()) {
                 mode = none;
             }else if(selectPlans.any()){
                 flushPlans(
-                    temp.selectFrom(selectPlans, s -> !(s.block.buildVisibility == BuildVisibility.sandboxOnly && s.block.category != Category.defense)),
+                    temp.selectFrom(selectPlans, s -> s.block.isVisible() || s.block instanceof CoreBlock),
                     isFreezeQueueing, Core.input.keyDown(Binding.force_place_modifier), isFreezeQueueing);
+                temp.clear();
             }else if(isPlacing()){
                 selectX = cursorX;
                 selectY = cursorY;

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
@@ -1370,6 +1370,7 @@ protected void flushSelectPlans(Seq<BuildPlan> plans){
     protected void flushPlansReverse(Seq<BuildPlan> plans){ // FINISHME: Does this method work as intended?
         temp.set(plans);
         flushPlans(temp.reverse());
+        temp.clear();
     }
 
     public void flushPlans(Seq<BuildPlan> plans) {
@@ -1666,6 +1667,7 @@ protected void freezeSelection(int x1, int y1, int x2, int y2, boolean flush, in
             }  
             frozenPlans.addAll(frozenFromSelection).addAll(frozenFromUnit);
         }
+        unfreeze.clear();
     }
 
     private void updateWallLine(int x1, int y1, int x2, int y2){