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

MassiveCore - Heavy Refactoring and Command improvements

Browse Source
This commit is contained in:
Olof Larsson
2015-10-21 19:35:41 +02:00
parent b371ec9c98
commit 753310561a
67 changed files with 376 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import com.massivecraft.factions.EconomyParticipator;
import com.massivecraft.factions.FactionEqualsPredictate;
import com.massivecraft.factions.FactionEqualsPredicate;
import com.massivecraft.factions.Factions;
import com.massivecraft.factions.Lang;
import com.massivecraft.factions.Rel;
@ -1213,34 +1213,34 @@ public class Faction extends Entity<Faction> implements EconomyParticipator
public boolean sendMessage(Object message)
{
return Mixin.messagePredictate(new FactionEqualsPredictate(this), message);
return Mixin.messagePredicate(new FactionEqualsPredicate(this), message);
}
public boolean sendMessage(Object... messages)
{
return Mixin.messagePredictate(new FactionEqualsPredictate(this), messages);
return Mixin.messagePredicate(new FactionEqualsPredicate(this), messages);
}
public boolean sendMessage(Collection<Object> messages)
{
return Mixin.messagePredictate(new FactionEqualsPredictate(this), messages);
return Mixin.messagePredicate(new FactionEqualsPredicate(this), messages);
}
// CONVENIENCE MSG
public boolean msg(String msg)
{
return Mixin.msgPredictate(new FactionEqualsPredictate(this), msg);
return Mixin.msgPredicate(new FactionEqualsPredicate(this), msg);
}
public boolean msg(String msg, Object... args)
{
return Mixin.msgPredictate(new FactionEqualsPredictate(this), msg, args);
return Mixin.msgPredicate(new FactionEqualsPredicate(this), msg, args);
}
public boolean msg(Collection<String> msgs)
{
return Mixin.msgPredictate(new FactionEqualsPredictate(this), msgs);
return Mixin.msgPredicate(new FactionEqualsPredicate(this), msgs);
}
}

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

@ -3,7 +3,7 @@ package com.massivecraft.factions.entity;
import java.util.List;
import com.massivecraft.factions.event.EventFactionsCreateFlags;
import com.massivecraft.massivecore.PredictateIsRegistered;
import com.massivecraft.massivecore.PredicateIsRegistered;
import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.PriorityComparator;
import com.massivecraft.massivecore.Registerable;
@ -63,7 +63,7 @@ public class MFlag extends Entity<MFlag> implements Prioritized, Registerable
{
setupStandardFlags();
new EventFactionsCreateFlags(isAsync).run();
return MFlagColl.get().getAll(PredictateIsRegistered.get(), PriorityComparator.get());
return MFlagColl.get().getAll(PredicateIsRegistered.get(), PriorityComparator.get());
}
public static void setupStandardFlags()

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

@ -12,7 +12,7 @@ import com.massivecraft.factions.Perm;
import com.massivecraft.factions.Rel;
import com.massivecraft.factions.TerritoryAccess;
import com.massivecraft.factions.event.EventFactionsCreatePerms;
import com.massivecraft.massivecore.PredictateIsRegistered;
import com.massivecraft.massivecore.PredicateIsRegistered;
import com.massivecraft.massivecore.Prioritized;
import com.massivecraft.massivecore.PriorityComparator;
import com.massivecraft.massivecore.Registerable;
@ -98,7 +98,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
setupStandardPerms();
new EventFactionsCreatePerms().run();
return MPermColl.get().getAll(PredictateIsRegistered.get(), PriorityComparator.get());
return MPermColl.get().getAll(PredicateIsRegistered.get(), PriorityComparator.get());
}
public static void setupStandardPerms()
@ -297,7 +297,7 @@ public class MPerm extends Entity<MPerm> implements Prioritized, Registerable
Player player = mplayer.getPlayer();
if (player != null && Perm.ADMIN.has(player))
{
ret += Txt.parse("\n<i>You can bypass by using " + Factions.get().getOuterCmdFactions().cmdFactionsAdmin.getUseageTemplate(false).toPlain(true));
ret += Txt.parse("\n<i>You can bypass by using " + Factions.get().getOuterCmdFactions().cmdFactionsAdmin.getTemplate(false).toPlain(true));
}
return ret;