Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Identified for id in comparator

Browse Source
This commit is contained in:
Olof Larsson 2016-03-09 13:05:04 +01:00
parent a2e390f2b3
commit 0399041b76
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/massivecraft/massivecore/comparator/ComparatorAbstract.java
View File

@ -2,9 +2,9 @@ package com.massivecraft.massivecore.comparator;
import java.util.Comparator; import java.util.Comparator;
import com.massivecraft.massivecore.Identified;
import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.Prioritized; import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.MUtil;
public class ComparatorAbstract<T> implements Comparator<T> public class ComparatorAbstract<T> implements Comparator<T>
@ -68,12 +68,12 @@ public class ComparatorAbstract<T> implements Comparator<T>
if (ret != null) return ret; if (ret != null) return ret;
} }
// EntityId // Identified
if (type1 instanceof Entity<?>) if (type1 instanceof Identified)
{ {
Entity<?> entity1 = (Entity<?>)type1; Identified identified1 = (Identified)type1;
Entity<?> entity2 = (Entity<?>)type2; Identified identified2 = (Identified)type2;
ret = MUtil.compare(entity1.getId(), entity2.getId()); ret = MUtil.compare(identified1.getId(), identified2.getId());
if (ret != null) return ret; if (ret != null) return ret;
} }