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

Improving the faction tag matching

Browse Source
This commit is contained in:
Olof Larsson 2011-10-22 17:42:13 +02:00
parent 75cd9b5e18
commit 7ebed6db9c
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/massivecraft/factions/Faction.java
View File

@ -188,7 +188,7 @@ public class Faction extends Entity implements EconomyParticipator
// ------------------------------- // -------------------------------
// Relation and relation colors TODO // Relation and relation colors
// ------------------------------- // -------------------------------
@Override @Override
@ -298,7 +298,7 @@ public class Faction extends Entity implements EconomyParticipator
} }
// ------------------------------- // -------------------------------
// Fplayers // FPlayers
// ------------------------------- // -------------------------------
public ArrayList<FPlayer> getFPlayers() public ArrayList<FPlayer> getFPlayers()
@ -347,12 +347,15 @@ public class Faction extends Entity implements EconomyParticipator
return null; return null;
} }
public ArrayList<FPlayer> getFPlayersWhereRole(Role role) { public ArrayList<FPlayer> getFPlayersWhereRole(Role role)
{
ArrayList<FPlayer> ret = new ArrayList<FPlayer>(); ArrayList<FPlayer> ret = new ArrayList<FPlayer>();
if ( ! this.isNormal()) return ret; if ( ! this.isNormal()) return ret;
for (FPlayer fplayer : FPlayers.i.get()) { for (FPlayer fplayer : FPlayers.i.get())
if (fplayer.getFaction() == this && fplayer.getRole() == role) { {
if (fplayer.getFaction() == this && fplayer.getRole() == role)
{
ret.add(fplayer); ret.add(fplayer);
} }
} }

15
src/com/massivecraft/factions/cmd/FCommand.java
View File

@ -223,8 +223,19 @@ public abstract class FCommand extends MCommand<P>
if (name != null) if (name != null)
{ {
// First we match faction tags Faction faction = null;
Faction faction = Factions.i.getBestTagMatch(name);
// 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 // Next we match player names
if (faction == null) if (faction == null)

1
src/com/massivecraft/factions/util/MiscUtil.java
View File

@ -53,6 +53,7 @@ public class MiscUtil
String ret = ""; String ret = "";
str = ChatColor.stripColor(str); str = ChatColor.stripColor(str);
str = str.toLowerCase();
for (char c : str.toCharArray()) for (char c : str.toCharArray())
{ {