From 10455c7acdd80c2dda808913c04685aff9761e0c Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Thu, 18 Apr 2013 08:00:18 +0200 Subject: [PATCH] Remaking PR 229 by squidicuzz --- src/com/massivecraft/factions/cmd/CmdFactionsJoin.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index b03b615b..b299872e 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -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("%s moved you into the faction %s.", fme.describeTo(fplayer, true), faction.getTag(fplayer)); faction.msg("%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);