dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3023 from BlueAgent/fix-craftable-filter-delta-2

Browse Source 
Fix craftable stack vanishing or duplicating when using craftable view
This commit is contained in:
Darkere
2021-10-15 18:32:24 +02:00
committed by GitHub
parent 21d35bcffd 4e035b0312
commit e6155d76f8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/refinedmods/refinedstorage/screen/grid/view/GridViewImpl.java
View File

@@ -141,6 +141,7 @@ public class GridViewImpl implements IGridView {
craftingStack = null; craftingStack = null;
} }
Predicate<IGridStack> activeFilters = getActiveFilters();
IGridStack existing = map.get(stack.getId()); IGridStack existing = map.get(stack.getId());
boolean stillExists = true; boolean stillExists = true;
boolean shouldSort = screen.canSort(); boolean shouldSort = screen.canSort();
@@ -151,7 +152,7 @@ public class GridViewImpl implements IGridView {
map.put(stack.getId(), stack); map.put(stack.getId(), stack);
existing = stack; existing = stack;
if (craftingStack != null && shouldSort) { if (craftingStack != null && shouldSort && activeFilters.test(existing)) {
stacks.remove(craftingStack); stacks.remove(craftingStack);
} }
} else { } else {
@@ -163,7 +164,7 @@ public class GridViewImpl implements IGridView {
map.remove(existing.getId()); map.remove(existing.getId());
stillExists = false; stillExists = false;
if (craftingStack != null && shouldSort && getActiveFilters().test(craftingStack)) { if (craftingStack != null && shouldSort && activeFilters.test(existing) && activeFilters.test(craftingStack)) {
addStack(craftingStack); addStack(craftingStack);
} }
} }
@@ -172,7 +173,7 @@ public class GridViewImpl implements IGridView {
} }
if (shouldSort) { if (shouldSort) {
if (stillExists && getActiveFilters().test(existing)) { if (stillExists && activeFilters.test(existing)) {
addStack(existing); addStack(existing);
} }
this.screen.updateScrollbar(); this.screen.updateScrollbar();