From abd76fe89fa7563372bce92f23c675c00fcde158 Mon Sep 17 00:00:00 2001 From: joshuaptfan Date: Sun, 3 Nov 2019 00:04:15 -0700 Subject: [PATCH] Checking unlocked status of blocks from getByCategory() is no longer necessary --- .../mindustry/ui/fragments/PlacementFragment.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index fcf3a7bc41..3c7d7b4cd0 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -125,7 +125,7 @@ public class PlacementFragment extends Fragment{ case 13: //down j = (j < blocks.size - 4 ? j + 4 : j % 4); } - input.block = (unlocked(blocks.get(j))) ? blocks.get(j) : null; + input.block = blocks.get(j); selectedBlocks.put(currentCategory, input.block); break; } @@ -147,7 +147,7 @@ public class PlacementFragment extends Fragment{ blockSelectEnd = true; } Array blocks = getByCategory(currentCategory); - input.block = (i < blocks.size && unlocked(blocks.get(i))) ? blocks.get(i) : null; + input.block = (i < blocks.size) ? blocks.get(i) : null; selectedBlocks.put(currentCategory, input.block); blockSelectSeqMillis = Time.millis(); } @@ -197,11 +197,6 @@ public class PlacementFragment extends Fragment{ blockTable.row(); } - if(!unlocked(block)){ - blockTable.add().size(46); - continue; - } - ImageButton button = blockTable.addImageButton(Icon.lockedSmall, Styles.selecti, () -> { if(unlocked(block)){ control.input.block = control.input.block == block ? null : block; @@ -353,7 +348,7 @@ public class PlacementFragment extends Fragment{ //update category empty values for(Category cat : Category.all){ Array blocks = getByCategory(cat); - categoryEmpty[cat.ordinal()] = blocks.isEmpty() || !unlocked(blocks.first()); + categoryEmpty[cat.ordinal()] = blocks.isEmpty(); } int f = 0;