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

Factions are not removed properly... this needs to be sorted out before release

Browse Source
This commit is contained in:
Olof Larsson 2011-10-12 21:54:38 +02:00
parent f25daa228a
commit f575ad6bc0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/factions/FPlayer.java
View File

@ -615,21 +615,29 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
if (myFaction.isNormal()) if (myFaction.isNormal())
{ {
myFaction.msg("%s<i> left your faction.", this.getNameAndRelevant(myFaction)); //myFaction.msg("%s<i> left your faction.", this.getNameAndRelevant(myFaction));
for (FPlayer fplayer : myFaction.getFPlayersWhereOnline(true))
{
fplayer.msg("%s<i> left your faction.", this.describeTo(fplayer, true));
}
} }
this.resetFactionData();
if (myFaction.isNormal() && !perm && myFaction.getFPlayers().isEmpty()) if (myFaction.isNormal() && !perm && myFaction.getFPlayers().isEmpty())
{ {
// Transfer all money
Econ.transferMoney(this, myFaction, this, myFaction.getAccount().balance());
// Remove this faction // Remove this faction
for (FPlayer fplayer : FPlayers.i.getOnline()) for (FPlayer fplayer : FPlayers.i.getOnline())
{ {
fplayer.msg("<i>The faction %s<i> was disbanded.", myFaction.getTag(fplayer)); fplayer.msg("<i>%s<i> was disbanded.", myFaction.describeTo(fplayer, true));
} }
//Faction.delete(myFaction.getId()); //Faction.delete(myFaction.getId());
myFaction.detach(); myFaction.detach();
} }
this.resetFactionData();
} }
public boolean attemptClaim(boolean notifyFailure) public boolean attemptClaim(boolean notifyFailure)