Revert "Remove need to iterate through list every frame"

This reverts commit 0d6234e.
mindustry-antigrief · Dec 30, 2023 · 4e43d28 · 4e43d28
1 parent f5ff822
commit 4e43d28
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -292,7 +292,6 @@ void addBuild(BuildPlan place, boolean tail){
             planSeq.clear();
         }
         if(replace != null){
-            replace.removed = true;
             plans.remove(replace);
             if(isLocalPlayer) control.input.playerPlanTree.remove(replace);
         }

diff --git a/core/src/mindustry/entities/units/BuildPlan.java b/core/src/mindustry/entities/units/BuildPlan.java
@@ -37,8 +37,6 @@ public class BuildPlan implements Position, Pool.Poolable, QuadTreeObject{
     public boolean initialized, stuck, cachedValid;
     /** If true, this plan is in the world. If false, it is being rendered in a schematic. */
     public boolean worldContext = true;
-    /** Has the plan been removed from the world? */
-    public boolean removed = false;
 
     /** Visual scale. Used only for rendering. */
     public float animScale = 0f;

diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
@@ -1523,7 +1523,6 @@ protected void removeSelection(int x1, int y1, int x2, int y2, boolean flush, in
         while(it.hasNext()){
             var plan = it.next();
             if(!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)){
-                plan.removed = true;
                 it.remove();
             }
         }
@@ -1532,7 +1531,6 @@ protected void removeSelection(int x1, int y1, int x2, int y2, boolean flush, in
         while(it.hasNext()){
             var plan = it.next();
             if(!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)){
-                plan.removed = true;
                 it.remove();
             }
         }
@@ -1541,10 +1539,7 @@ protected void removeSelection(int x1, int y1, int x2, int y2, boolean flush, in
             it = frozenPlans.iterator();
             while (it.hasNext()) {
                 BuildPlan plan = it.next();
-                if (!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)) {
-                    plan.removed = true;
-                    it.remove();
-                }
+                if (!plan.breaking && plan.bounds(Tmp.r2).overlaps(Tmp.r1)) it.remove();
             }
         }
 
@@ -1577,7 +1572,6 @@ protected void removeSelectionPlans(int x1, int y1, int x2, int y2, int maxLengt
         while(it.hasNext()){
             BuildPlan plan = it.next();
             if(plan.bounds(Tmp.r2, true).overlaps(Tmp.r1)){
-                plan.removed = true;
                 it.remove();
             }
         }
@@ -1586,7 +1580,6 @@ protected void removeSelectionPlans(int x1, int y1, int x2, int y2, int maxLengt
         while(it.hasNext()){
             BuildPlan plan = it.next();
             if(plan.bounds(Tmp.r2, true).overlaps(Tmp.r1)){
-                plan.removed = true;
                 it.remove();
             }
         }
@@ -1595,9 +1588,7 @@ protected void removeSelectionPlans(int x1, int y1, int x2, int y2, int maxLengt
             it = frozenPlans.iterator();
             while (it.hasNext()) {
                 BuildPlan plan = it.next();
-                if (plan.bounds(Tmp.r2, true).overlaps(Tmp.r1)) {
-                    it.remove();
-                }
+                if (plan.bounds(Tmp.r2, true).overlaps(Tmp.r1)) it.remove();
             }
         }
     }

diff --git a/core/src/mindustry/ui/fragments/PlanConfigFragment.java b/core/src/mindustry/ui/fragments/PlanConfigFragment.java
@@ -60,7 +60,8 @@ public void showConfig(BuildPlan plan) {
 				this.hide();
 				return;
 			}
-			if (plan.removed) {
+			boolean planExists = control.input.selectPlans.contains(plan) || player.unit().plans.contains(plan);
+			if (!planExists) {
 				this.hide();
 				return;
 			}