From 97df50658e416d825c6c038da4b88eec16aa5fd0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 23 Jan 2015 16:36:22 -0500 Subject: [PATCH] Switch back to a standard hashmap to prevent crashes --- .../com/cricketcraft/chisel/carving/GroupList.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java b/src/main/java/com/cricketcraft/chisel/carving/GroupList.java index e829999c..7d0a2f0c 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java +++ b/src/main/java/com/cricketcraft/chisel/carving/GroupList.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Set; import net.minecraft.block.Block; @@ -13,7 +12,6 @@ import org.apache.commons.lang3.tuple.Pair; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.google.common.collect.HashBiMap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -79,7 +77,7 @@ public class GroupList implements Set { } private HashMap groups = Maps.newHashMap(); - private HashBiMap lookup = HashBiMap.create(); + private HashMap lookup = Maps.newHashMap(); @Override public int size() { @@ -133,11 +131,10 @@ public class GroupList implements Set { @Override public boolean remove(Object o) { if (o instanceof ICarvingGroup) { - Map reverse = lookup.inverse(); List toRemove = Lists.newArrayList(); - for (ICarvingGroup g : reverse.keySet()) { - if (g.getName().equals(((ICarvingGroup) o).getName())) { - toRemove.add(reverse.get(g)); + for (VariationWrapper v : lookup.keySet()) { + if (lookup.get(v).getName().equals(((ICarvingGroup) o).getName())) { + toRemove.add(v); } } for (VariationWrapper v : toRemove) {