From edb6225c434bbdaecc4c2513e811c30fef7a4a75 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Tue, 9 Dec 2014 13:42:14 +1000 Subject: [PATCH] Add some try catch guards around sorting and filtering exceptions --- src/codechicken/nei/ItemList.java | 17 +++++++++++------ src/codechicken/nei/ItemSorter.java | 6 +++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/codechicken/nei/ItemList.java b/src/codechicken/nei/ItemList.java index c868e29c..79f63f9d 100644 --- a/src/codechicken/nei/ItemList.java +++ b/src/codechicken/nei/ItemList.java @@ -71,16 +71,21 @@ public class ItemList public void itemsLoaded(); } - public static boolean itemMatches(ItemStack item, List filters) { - for(ItemFilter filter : filters) - if(!filter.matches(item)) - return false; + public static boolean itemMatchesAll(ItemStack item, List filters) { + for(ItemFilter filter : filters) { + try { + if (!filter.matches(item)) + return false; + } catch (Exception e) { + NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e); + } + } return true; } public static boolean itemMatches(ItemStack item) { - return itemMatches(item, getItemFilters()); + return itemMatchesAll(item, getItemFilters()); } public static List getItemFilters() { @@ -170,7 +175,7 @@ public class ItemList for(ItemStack item : items) { if (interrupted()) return; - if(itemMatches(item, filters)) + if(itemMatchesAll(item, filters)) filtered.add(item); } diff --git a/src/codechicken/nei/ItemSorter.java b/src/codechicken/nei/ItemSorter.java index 46a30ca9..a9b78178 100644 --- a/src/codechicken/nei/ItemSorter.java +++ b/src/codechicken/nei/ItemSorter.java @@ -43,7 +43,11 @@ public class ItemSorter implements Comparator, ItemsLoadedCallback public HashMap ordering = null; public static void sort(ArrayList items) { - Collections.sort(items, instance); + try { + Collections.sort(items, instance); + } catch (Exception e) { + NEIClientConfig.logger.error("Exception sorting item list", e); + } } @Override