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

Fix a couple of old cases where it said Admin instead of Leader.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-19 15:32:16 +02:00
parent c2063a47b2
commit 2299949a4a
6 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/massivecraft/factions/cmd/CmdFactionsDisband.java
View File

@ -62,7 +62,7 @@ public class CmdFactionsDisband extends FCommand
// Inform all players
for (FPlayer fplayer : FPlayerColl.get().getAllOnline())
{
String who = senderIsConsole ? "A server admin" : fme.describeTo(fplayer);
String who = fme.describeTo(fplayer);
if (fplayer.getFaction() == faction)
{
fplayer.msg("<h>%s<i> disbanded your faction.", who);

2
src/com/massivecraft/factions/cmd/CmdFactionsLeader.java
View File

@ -76,7 +76,7 @@ public class CmdFactionsLeader extends FCommand
{
targetFaction.promoteNewLeader();
msg("<i>You have demoted %s<i> from the position of faction leader.", newLeader.describeTo(fme, true));
newLeader.msg("<i>You have been demoted from the position of faction leader by %s<i>.", senderIsConsole ? "a server admin" : fme.describeTo(newLeader, true));
newLeader.msg("<i>You have been demoted from the position of faction leader by %s<i>.", fme.describeTo(newLeader, true));
return;
}

4
src/com/massivecraft/factions/cmd/CmdFactionsShow.java
View File

@ -34,7 +34,7 @@ public class CmdFactionsShow extends FCommand
Faction faction = this.arg(0, ARFaction.get(), myFaction);
if (faction == null) return;
Collection<FPlayer> admins = faction.getFPlayersWhereRole(Rel.LEADER);
Collection<FPlayer> leaders = faction.getFPlayersWhereRole(Rel.LEADER);
Collection<FPlayer> mods = faction.getFPlayersWhereRole(Rel.OFFICER);
Collection<FPlayer> normals = faction.getFPlayersWhereRole(Rel.MEMBER);
Collection<FPlayer> recruits = faction.getFPlayersWhereRole(Rel.RECRUIT);
@ -100,7 +100,7 @@ public class CmdFactionsShow extends FCommand
List<String> memberOnlineNames = new ArrayList<String>();
List<String> memberOfflineNames = new ArrayList<String>();
for (FPlayer follower : admins)
for (FPlayer follower : leaders)
{
if (follower.isOnline() && Mixin.isVisible(me, follower.getId()))
{

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

@ -38,7 +38,7 @@ public abstract class FCommand extends MCommand
if (you.getRole().equals(Rel.LEADER))
{
i.sendMessage(Txt.parse("<b>Only the faction admin can do that."));
i.sendMessage(Txt.parse("<b>Only the faction leader can do that."));
}
else if (i.getRole().equals(Rel.OFFICER))
{