diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java index 14ba96df..4867e484 100644 --- a/src/com/massivecraft/massivecore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -812,7 +812,7 @@ public class Coll extends CollAbstract // -------------------------------------------- // @SuppressWarnings("unchecked") - public Coll(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing) + public Coll(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing, boolean sorted) { // Setup the name and the parsed parts this.name = name; @@ -838,8 +838,8 @@ public class Coll extends CollAbstract this.collDriverObject = db.createCollDriverObject(this); // STORAGE - this.id2entity = new ConcurrentSkipListMap(NaturalOrderComparator.get()); - this.entity2id = Entity.class.isAssignableFrom(entityClass) ? new ConcurrentSkipListMap((Comparator) ComparatorEntityId.get()) : new ConcurrentHashMap(); + this.id2entity = (sorted) ? new ConcurrentSkipListMap(NaturalOrderComparator.get()) : new ConcurrentHashMap(); + this.entity2id = (Entity.class.isAssignableFrom(entityClass) && sorted) ? new ConcurrentSkipListMap((Comparator) ComparatorEntityId.get()) : new ConcurrentHashMap(); // IDENTIFIED MODIFICATIONS this.identifiedModifications = new ConcurrentHashMap(); @@ -857,7 +857,7 @@ public class Coll extends CollAbstract public Coll(String name, Class entityClass, Db db, Plugin plugin) { - this(name, entityClass, db, plugin, false, false); + this(name, entityClass, db, plugin, false, false, false); } @Override diff --git a/src/com/massivecraft/massivecore/store/SenderColl.java b/src/com/massivecraft/massivecore/store/SenderColl.java index b61eedfb..1a10df2d 100644 --- a/src/com/massivecraft/massivecore/store/SenderColl.java +++ b/src/com/massivecraft/massivecore/store/SenderColl.java @@ -21,14 +21,14 @@ public class SenderColl> extends Coll implements Se // CONSTRUCT // -------------------------------------------- // - public SenderColl(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing) + public SenderColl(String name, Class entityClass, Db db, Plugin plugin, boolean creative, boolean lowercasing, boolean sorted) { - super(name, entityClass, db, plugin, creative, lowercasing); + super(name, entityClass, db, plugin, creative, lowercasing, sorted); } public SenderColl(String name, Class entityClass, Db db, Plugin plugin) { - super(name, entityClass, db, plugin, true, true); + super(name, entityClass, db, plugin, true, true, false); } // -------------------------------------------- //