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

MassiveCore - Working on DataItemStack. Not done yet.

Browse Source
This commit is contained in:
Olof Larsson 2016-04-24 08:38:51 +02:00
parent 32db800fe1
commit 4a91e9f068
No known key found for this signature in database
GPG Key ID: BBEF14F97DA52474
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/massivecraft/factions/FactionListComparator.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.factions;
import java.util.Comparator; import java.util.Comparator;
import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.Faction;
import com.massivecraft.massivecore.comparator.ComparatorComparable;
import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.MUtil;
public class FactionListComparator implements Comparator<Faction> public class FactionListComparator implements Comparator<Faction>
@ -44,7 +45,7 @@ public class FactionListComparator implements Comparator<Faction>
if (ret != 0) return ret; if (ret != 0) return ret;
// Tie by Id // Tie by Id
return MUtil.compare(f1.getId(), f2.getId()); return ComparatorComparable.get().compare(f1.getId(), f2.getId());
} }
} }

4
src/com/massivecraft/factions/entity/MFlag.java
View File

@ -7,7 +7,7 @@ import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.Prioritized; import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.Registerable; import com.massivecraft.massivecore.Registerable;
import com.massivecraft.massivecore.collections.MassiveList; 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.predicate.PredicateIsRegistered;
import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.Txt; import com.massivecraft.massivecore.util.Txt;
@ -66,7 +66,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable, N
{ {
setupStandardFlags(); setupStandardFlags();
new EventFactionsCreateFlags(isAsync).run(); new EventFactionsCreateFlags(isAsync).run();
return MFlagColl.get().getAll(PredicateIsRegistered.get(), ComparatorPriority.get()); return MFlagColl.get().getAll(PredicateIsRegistered.get(), ComparatorSmart.get());
} }
public static void setupStandardFlags() public static void setupStandardFlags()

4
src/com/massivecraft/factions/entity/MPerm.java
View File

@ -15,7 +15,7 @@ import com.massivecraft.factions.event.EventFactionsCreatePerms;
import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.Prioritized; import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.Registerable; 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.predicate.PredicateIsRegistered;
import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.store.Entity; import com.massivecraft.massivecore.store.Entity;
@ -99,7 +99,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable, N
setupStandardPerms(); setupStandardPerms();
new EventFactionsCreatePerms().run(); new EventFactionsCreatePerms().run();
return MPermColl.get().getAll(PredicateIsRegistered.get(), ComparatorPriority.get()); return MPermColl.get().getAll(PredicateIsRegistered.get(), ComparatorSmart.get());
} }
public static void setupStandardPerms() public static void setupStandardPerms()