Skip to content

Commit c9967d5

Browse files
committed
Tweak spawnunit and some searching (again)
1 parent 8828000 commit c9967d5

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

core/src/mindustry/editor/BannedContentDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void build(){
5656
t.table(s -> {
5757
s.label(() -> "@search").padRight(10);
5858
var field = s.field(contentSearch, value -> {
59-
contentSearch = value.trim().toLowerCase();
59+
contentSearch = value.trim().replaceAll(" +", " ").toLowerCase();
6060
rebuildTables();
6161
}).get();
6262
s.button(Icon.cancel, Styles.emptyi, () -> {

core/src/mindustry/editor/MapEditorDialog.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ private void rebuildBlockSelection(String searchText){
757757

758758
if(!Core.atlas.isFound(region) || !block.inEditor
759759
|| block.buildVisibility == BuildVisibility.debugOnly
760-
|| (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.toLowerCase()))
760+
|| (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.trim().replaceAll(" +", " ").toLowerCase()))
761761
) continue;
762762

763763
ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);

core/src/mindustry/logic/LExecutor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ public void run(LExecutor exec){
14311431

14321432
Team t = team.team();
14331433

1434-
if(type.obj() instanceof UnitType type && !type.internal && !type.hidden && t != null && Units.canCreate(t, type)){
1434+
if(type.obj() instanceof UnitType type && t != null && Units.canCreate(t, type)){
14351435
//random offset to prevent stacking
14361436
var unit = type.spawn(t, World.unconv(x.numf()) + Mathf.range(0.01f), World.unconv(y.numf()) + Mathf.range(0.01f));
14371437
spawner.spawnEffect(unit, rotation.numf());

core/src/mindustry/ui/fragments/HudFragment.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void rebuildBlockSelection(Table blockSelection, String searchText){
107107
|| (!block.inEditor && !(block instanceof RemoveWall) && !(block instanceof RemoveOre))
108108
|| !block.isOnPlanet(state.rules.planet)
109109
|| block.buildVisibility == BuildVisibility.debugOnly
110-
|| (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.toLowerCase()))
110+
|| (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.trim().replaceAll(" +", " ").toLowerCase()))
111111
) continue;
112112

113113
ImageButton button = new ImageButton(Tex.whiteui, Styles.clearNoneTogglei);

0 commit comments

Comments
 (0)