Factionless players now have nothing extra shown over their heads, instead of "Factionless"

Also added AuthMe to softdepend list to have it load first
This commit is contained in:
Brettflan 2011-08-28 18:24:05 -05:00
parent c512f80866
commit 55c9067e34
2 changed files with 13 additions and 7 deletions

View File

@ -135,9 +135,10 @@ public class SpoutFeatures {
SpoutPlayer sPlayer = SpoutManager.getPlayer(viewer); SpoutPlayer sPlayer = SpoutManager.getPlayer(viewer);
if (Conf.spoutFactionTagsOverNames || Conf.spoutFactionTitlesOverNames) { if (Conf.spoutFactionTagsOverNames || Conf.spoutFactionTitlesOverNames) {
if (viewedFaction.isNormal()) {
String addTag = ""; String addTag = "";
if (Conf.spoutFactionTagsOverNames) { if (Conf.spoutFactionTagsOverNames) {
addTag += !viewedFaction.isNormal() ? "Factionless" : viewedFaction.getTag(relation.getColor().toString() + "[") + "]"; addTag += viewedFaction.getTag(relation.getColor().toString() + "[") + "]";
} }
String rolePrefix = viewedRole.getPrefix(); String rolePrefix = viewedRole.getPrefix();
if (Conf.spoutFactionTitlesOverNames && (!viewedTitle.isEmpty() || !rolePrefix.isEmpty())) { if (Conf.spoutFactionTitlesOverNames && (!viewedTitle.isEmpty() || !rolePrefix.isEmpty())) {
@ -145,6 +146,10 @@ public class SpoutFeatures {
} }
spoutApp.setPlayerTitle(sPlayer, viewed, addTag + "\n" + viewed.getDisplayName()); spoutApp.setPlayerTitle(sPlayer, viewed, addTag + "\n" + viewed.getDisplayName());
} }
else {
spoutApp.resetPlayerTitle(sPlayer, viewed);
}
}
if ( if (
(Conf.spoutFactionAdminCapes && viewedRole.equals(Role.ADMIN)) (Conf.spoutFactionAdminCapes && viewedRole.equals(Role.ADMIN))

View File

@ -9,6 +9,7 @@ softdepend:
- iChat - iChat
- LocalAreaChat - LocalAreaChat
- nChat - nChat
- AuthMe
- iConomy - iConomy
- Spout - Spout
commands: commands: