Remaking PR 229 by squidicuzz
This commit is contained in:
parent
3938c92740
commit
10455c7acd
@ -85,8 +85,6 @@ public class CmdFactionsJoin extends FCommand
|
||||
// then make 'em pay (if applicable)
|
||||
if (samePlayer && ! payForCommand(ConfServer.econCostJoin, "to join a faction", "for joining a faction")) return;
|
||||
|
||||
fme.setRole(ConfServer.factionRankDefault); // They have just joined a faction, start them out on the lowest rank (default config).
|
||||
|
||||
if (!samePlayer)
|
||||
fplayer.msg("<i>%s moved you into the faction %s.", fme.describeTo(fplayer, true), faction.getTag(fplayer));
|
||||
faction.msg("<i>%s joined your faction.", fplayer.describeTo(faction, true));
|
||||
@ -94,6 +92,7 @@ public class CmdFactionsJoin extends FCommand
|
||||
|
||||
fplayer.resetFactionData();
|
||||
fplayer.setFaction(faction);
|
||||
fme.setRole(ConfServer.factionRankDefault); // They have just joined a faction, start them out on the lowest rank (default config).
|
||||
|
||||
faction.deinvite(fplayer);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user