From ad35d12c44e95059fda5d19d8a6b18d1313eb04c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Jan 2015 15:20:23 -0600 Subject: [PATCH] This... might? fix the jenkins build errors? Maybe? --- .../modtweaker/mods/thaumcraft/ThaumcraftHelper.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java b/src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java index 205a189..e3d057b 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java +++ b/src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java @@ -31,7 +31,11 @@ public class ThaumcraftHelper { public static AspectList parseAspects(AspectList list, String str) { AspectList output=new AspectList(); if (list != null) - output.add(list); + for(Aspect aspect : list.getAspectsSortedAmount()) + { + if(aspect!=null) + output.add(aspect, list.getAmount(aspect)); + } if (str == null || str.equals("")) return list; String[] aspects = str.split(","); for (String aspect : aspects) { @@ -46,7 +50,11 @@ public class ThaumcraftHelper { public static AspectList removeAspects(AspectList list, String str) { AspectList output=new AspectList(); if (list != null) - output.add(list); + for(Aspect aspect : list.getAspectsSortedAmount()) + { + if(aspect!=null) + output.add(aspect, list.getAmount(aspect)); + } String[] aspects = str.split(","); for (String aspect : aspects) { if (aspect.startsWith(" ")) aspect = aspect.replaceFirst(" ", "");