Improving the faction tag matching
This commit is contained in:
		@@ -188,7 +188,7 @@ public class Faction extends Entity implements EconomyParticipator
 | 
			
		||||
	
 | 
			
		||||
	
 | 
			
		||||
	// -------------------------------
 | 
			
		||||
	// Relation and relation colors TODO
 | 
			
		||||
	// Relation and relation colors
 | 
			
		||||
	// -------------------------------
 | 
			
		||||
	
 | 
			
		||||
	@Override
 | 
			
		||||
@@ -298,7 +298,7 @@ public class Faction extends Entity implements EconomyParticipator
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	// -------------------------------
 | 
			
		||||
	// Fplayers
 | 
			
		||||
	// FPlayers
 | 
			
		||||
	// -------------------------------
 | 
			
		||||
	
 | 
			
		||||
	public ArrayList<FPlayer> getFPlayers()
 | 
			
		||||
@@ -347,12 +347,15 @@ public class Faction extends Entity implements EconomyParticipator
 | 
			
		||||
		return null;
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
	public ArrayList<FPlayer> getFPlayersWhereRole(Role role) {
 | 
			
		||||
	public ArrayList<FPlayer> getFPlayersWhereRole(Role role)
 | 
			
		||||
	{
 | 
			
		||||
		ArrayList<FPlayer> ret = new ArrayList<FPlayer>();
 | 
			
		||||
		if ( ! this.isNormal()) return ret;
 | 
			
		||||
		
 | 
			
		||||
		for (FPlayer fplayer : FPlayers.i.get()) {
 | 
			
		||||
			if (fplayer.getFaction() == this && fplayer.getRole() == role) {
 | 
			
		||||
		for (FPlayer fplayer : FPlayers.i.get())
 | 
			
		||||
		{
 | 
			
		||||
			if (fplayer.getFaction() == this && fplayer.getRole() == role)
 | 
			
		||||
			{
 | 
			
		||||
				ret.add(fplayer);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 
 | 
			
		||||
@@ -223,9 +223,20 @@ public abstract class FCommand extends MCommand<P>
 | 
			
		||||
		
 | 
			
		||||
		if (name != null)
 | 
			
		||||
		{
 | 
			
		||||
			// First we match faction tags
 | 
			
		||||
			Faction faction = Factions.i.getBestTagMatch(name);
 | 
			
		||||
			Faction faction = null;
 | 
			
		||||
			
 | 
			
		||||
			// First we try an exact match
 | 
			
		||||
			if (faction == null)
 | 
			
		||||
			{
 | 
			
		||||
				faction = Factions.i.getByTag(name);
 | 
			
		||||
			}
 | 
			
		||||
			
 | 
			
		||||
			// Next we match faction tags
 | 
			
		||||
			if (faction == null)
 | 
			
		||||
			{
 | 
			
		||||
				faction = Factions.i.getBestTagMatch(name);
 | 
			
		||||
			}
 | 
			
		||||
				
 | 
			
		||||
			// Next we match player names
 | 
			
		||||
			if (faction == null)
 | 
			
		||||
			{
 | 
			
		||||
 
 | 
			
		||||
@@ -53,6 +53,7 @@ public class MiscUtil
 | 
			
		||||
		String ret = "";
 | 
			
		||||
		
 | 
			
		||||
		str = ChatColor.stripColor(str);
 | 
			
		||||
		str = str.toLowerCase();
 | 
			
		||||
		
 | 
			
		||||
		for (char c : str.toCharArray())
 | 
			
		||||
		{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user