MassiveCore - Working on DataItemStack. Not done yet.
This commit is contained in:
parent
32db800fe1
commit
4a91e9f068
@ -3,6 +3,7 @@ package com.massivecraft.factions;
|
||||
import java.util.Comparator;
|
||||
|
||||
import com.massivecraft.factions.entity.Faction;
|
||||
import com.massivecraft.massivecore.comparator.ComparatorComparable;
|
||||
import com.massivecraft.massivecore.util.MUtil;
|
||||
|
||||
public class FactionListComparator implements Comparator<Faction>
|
||||
@ -44,7 +45,7 @@ public class FactionListComparator implements Comparator<Faction>
|
||||
if (ret != 0) return ret;
|
||||
|
||||
// Tie by Id
|
||||
return MUtil.compare(f1.getId(), f2.getId());
|
||||
return ComparatorComparable.get().compare(f1.getId(), f2.getId());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -7,7 +7,7 @@ import com.massivecraft.massivecore.Named;
|
||||
import com.massivecraft.massivecore.Prioritized;
|
||||
import com.massivecraft.massivecore.Registerable;
|
||||
import com.massivecraft.massivecore.collections.MassiveList;
|
||||
import com.massivecraft.massivecore.comparator.ComparatorPriority;
|
||||
import com.massivecraft.massivecore.comparator.ComparatorSmart;
|
||||
import com.massivecraft.massivecore.predicate.PredicateIsRegistered;
|
||||
import com.massivecraft.massivecore.store.Entity;
|
||||
import com.massivecraft.massivecore.util.Txt;
|
||||
@ -66,7 +66,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable, N
|
||||
{
|
||||
setupStandardFlags();
|
||||
new EventFactionsCreateFlags(isAsync).run();
|
||||
return MFlagColl.get().getAll(PredicateIsRegistered.get(), ComparatorPriority.get());
|
||||
return MFlagColl.get().getAll(PredicateIsRegistered.get(), ComparatorSmart.get());
|
||||
}
|
||||
|
||||
public static void setupStandardFlags()
|
||||
|
@ -15,7 +15,7 @@ import com.massivecraft.factions.event.EventFactionsCreatePerms;
|
||||
import com.massivecraft.massivecore.Named;
|
||||
import com.massivecraft.massivecore.Prioritized;
|
||||
import com.massivecraft.massivecore.Registerable;
|
||||
import com.massivecraft.massivecore.comparator.ComparatorPriority;
|
||||
import com.massivecraft.massivecore.comparator.ComparatorSmart;
|
||||
import com.massivecraft.massivecore.predicate.PredicateIsRegistered;
|
||||
import com.massivecraft.massivecore.ps.PS;
|
||||
import com.massivecraft.massivecore.store.Entity;
|
||||
@ -99,7 +99,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable, N
|
||||
setupStandardPerms();
|
||||
new EventFactionsCreatePerms().run();
|
||||
|
||||
return MPermColl.get().getAll(PredicateIsRegistered.get(), ComparatorPriority.get());
|
||||
return MPermColl.get().getAll(PredicateIsRegistered.get(), ComparatorSmart.get());
|
||||
}
|
||||
|
||||
public static void setupStandardPerms()
|
||||
|
Loading…
Reference in New Issue
Block a user