diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java index a71becec..c4366560 100644 --- a/src/com/massivecraft/massivecore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashSet; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -135,13 +136,12 @@ public class Coll implements CollInterface @Override public Collection getAll() { - return Collections.unmodifiableCollection(this.entity2id.keySet()); } - @Override public Collection getAll(Predictate where) { return MStoreUtil.uglySQL(this.getAll(), where, null, null, null); } - @Override public Collection getAll(Predictate where, Comparator orderby) { return MStoreUtil.uglySQL(this.getAll(), where, orderby, null, null); } - @Override public Collection getAll(Predictate where, Comparator orderby, Integer limit) { return MStoreUtil.uglySQL(this.getAll(), where, orderby, limit, null); } - @Override public Collection getAll(Predictate where, Comparator orderby, Integer limit, Integer offset) { return MStoreUtil.uglySQL(this.getAll(), where, orderby, limit, offset); } + @Override public List getAll(Predictate where) { return MStoreUtil.uglySQL(this.getAll(), where, null, null, null); } + @Override public List getAll(Predictate where, Comparator orderby) { return MStoreUtil.uglySQL(this.getAll(), where, orderby, null, null); } + @Override public List getAll(Predictate where, Comparator orderby, Integer limit) { return MStoreUtil.uglySQL(this.getAll(), where, orderby, limit, null); } + @Override public List getAll(Predictate where, Comparator orderby, Integer limit, Integer offset) { return MStoreUtil.uglySQL(this.getAll(), where, orderby, limit, offset); } @Override public String fixId(Object oid) diff --git a/src/com/massivecraft/massivecore/store/CollInterface.java b/src/com/massivecraft/massivecore/store/CollInterface.java index 3880d595..96a77aa5 100644 --- a/src/com/massivecraft/massivecore/store/CollInterface.java +++ b/src/com/massivecraft/massivecore/store/CollInterface.java @@ -2,6 +2,7 @@ package com.massivecraft.massivecore.store; import java.util.Collection; import java.util.Comparator; +import java.util.List; import java.util.Map; import org.bukkit.plugin.Plugin; @@ -42,10 +43,10 @@ public interface CollInterface public String getId(Object entity); public boolean containsEntity(Object entity); public Collection getAll(); - public Collection getAll(Predictate where); - public Collection getAll(Predictate where, Comparator orderby); - public Collection getAll(Predictate where, Comparator orderby, Integer limit); - public Collection getAll(Predictate where, Comparator orderby, Integer limit, Integer offset); + public List getAll(Predictate where); + public List getAll(Predictate where, Comparator orderby); + public List getAll(Predictate where, Comparator orderby, Integer limit); + public List getAll(Predictate where, Comparator orderby, Integer limit, Integer offset); public String fixId(Object oid);