EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MassiveCore - Comparators, Predicates and Map Editor

Browse Source
This commit is contained in:
Olof Larsson
2016-02-03 05:06:49 +01:00
parent c8433a4770
commit 89dd975a6e
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/massivecraft/factions/entity/Faction.java
View File

@@ -26,13 +26,13 @@ import com.massivecraft.factions.Rel;
import com.massivecraft.factions.RelationParticipator;
import com.massivecraft.factions.util.MiscUtil;
import com.massivecraft.factions.util.RelationUtil;
import com.massivecraft.massivecore.CaseInsensitiveComparator;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.Predicate;
import com.massivecraft.massivecore.collections.MassiveMapDef;
import com.massivecraft.massivecore.collections.MassiveTreeSetDef;
import com.massivecraft.massivecore.comparator.ComparatorCaseInsensitive;
import com.massivecraft.massivecore.mixin.Mixin;
import com.massivecraft.massivecore.money.Money;
import com.massivecraft.massivecore.predicate.Predicate;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.store.SenderColl;
@@ -138,7 +138,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
// This is the ids of the invited players.
// They are actually "senderIds" since you can invite "@console" to your faction.
// Null means no one is invited
private MassiveTreeSetDef<String, CaseInsensitiveComparator> invitedPlayerIds = new MassiveTreeSetDef<String, CaseInsensitiveComparator>(CaseInsensitiveComparator.get());
private MassiveTreeSetDef<String, ComparatorCaseInsensitive> invitedPlayerIds = new MassiveTreeSetDef<String, ComparatorCaseInsensitive>(ComparatorCaseInsensitive.get());
// The keys in this map are factionIds.
// Null means no special relation whishes.
@@ -451,7 +451,7 @@ public class Faction extends Entity<Faction> implements EconomyParticipator, Nam
public void setInvitedPlayerIds(Collection<String> invitedPlayerIds)
{
// Clean input
MassiveTreeSetDef<String, CaseInsensitiveComparator> target = new MassiveTreeSetDef<String, CaseInsensitiveComparator>(CaseInsensitiveComparator.get());
MassiveTreeSetDef<String, ComparatorCaseInsensitive> target = new MassiveTreeSetDef<String, ComparatorCaseInsensitive>(ComparatorCaseInsensitive.get());
if (invitedPlayerIds != null)
{
for (String invitedPlayerId : invitedPlayerIds)

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

@@ -4,11 +4,11 @@ import java.util.List;
import com.massivecraft.factions.event.EventFactionsCreateFlags;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.PredicateIsRegistered;
import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.PriorityComparator;
import com.massivecraft.massivecore.Registerable;
import com.massivecraft.massivecore.collections.MassiveList;
import com.massivecraft.massivecore.comparator.ComparatorPriority;
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(), PriorityComparator.get());
return MFlagColl.get().getAll(PredicateIsRegistered.get(), ComparatorPriority.get());
}
public static void setupStandardFlags()

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

@@ -13,10 +13,10 @@ import com.massivecraft.factions.Rel;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.event.EventFactionsCreatePerms;
import com.massivecraft.massivecore.Named;
import com.massivecraft.massivecore.PredicateIsRegistered;
import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.PriorityComparator;
import com.massivecraft.massivecore.Registerable;
import com.massivecraft.massivecore.comparator.ComparatorPriority;
import com.massivecraft.massivecore.predicate.PredicateIsRegistered;
import com.massivecraft.massivecore.ps.PS;
import com.massivecraft.massivecore.store.Entity;
import com.massivecraft.massivecore.util.MUtil;
@@ -99,7 +99,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable, N
setupStandardPerms();
new EventFactionsCreatePerms().run();
return MPermColl.get().getAll(PredicateIsRegistered.get(), PriorityComparator.get());
return MPermColl.get().getAll(PredicateIsRegistered.get(), ComparatorPriority.get());
}
public static void setupStandardPerms()