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

MCorify the MPlugin class Factions slightly.

Browse Source
This commit is contained in:
Olof Larsson
2013-04-09 13:12:13 +02:00
parent ecefb44d10
commit c8870d10d4
44 changed files with 139 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,7 +452,7 @@ public class Faction extends Entity implements EconomyParticipator
ArrayList<Player> ret = new ArrayList<Player>();
//if (this.isPlayerFreeType()) return ret;
for (Player player: Factions.p.getServer().getOnlinePlayers())
for (Player player: Factions.get().getServer().getOnlinePlayers())
{
FPlayer fplayer = FPlayers.i.get(player);
if (fplayer.getFaction() == this)
@@ -488,7 +488,7 @@ public class Faction extends Entity implements EconomyParticipator
// no members left and faction isn't permanent, so disband it
if (Conf.logFactionDisband)
Factions.p.log("The faction "+this.getTag()+" ("+this.getId()+") has been disbanded since it has no members left.");
Factions.get().log("The faction "+this.getTag()+" ("+this.getId()+") has been disbanded since it has no members left.");
for (FPlayer fplayer : FPlayers.i.getOnline())
{
@@ -503,7 +503,7 @@ public class Faction extends Entity implements EconomyParticipator
oldLeader.setRole(Rel.MEMBER);
replacements.get(0).setRole(Rel.LEADER);
this.msg("<i>Faction leader <h>%s<i> has been removed. %s<i> has been promoted as the new faction leader.", oldLeader == null ? "" : oldLeader.getName(), replacements.get(0).getName());
Factions.p.log("Faction "+this.getTag()+" ("+this.getId()+") leader was removed. Replacement leader: "+replacements.get(0).getName());
Factions.get().log("Faction "+this.getTag()+" ("+this.getId()+") leader was removed. Replacement leader: "+replacements.get(0).getName());
}
}
@@ -512,7 +512,7 @@ public class Faction extends Entity implements EconomyParticipator
//----------------------------------------------//
public void msg(String message, Object... args)
{
message = Factions.p.txt.parse(message, args);
message = Factions.get().txt.parse(message, args);
for (FPlayer fplayer : this.getFPlayersWhereOnline(true))
{