6329fd0eaf
Patrick's Custom Event System Changes: ---------------------------------------- * FPlayerLeaveEvent now fires for all faction players in cmdDisband() * FPlayerLeaveEvent removed from cmdJoin() * FPlayerJoinEvent now only fires when the faction is different in cmdLeade * Added FactionRenameEvent, firing on cmdTag() * Added FactionRelationEvent, firing on FRelationCommand extensions * Fixed FPlayerJoinEvent to fire after tag is set in cmdCreate() * Added getFactionId() to FactionCreateEvent TODO: ------- * cmdLeader() might need a FPlayerLeaveEvent for the same reason it needs a FPlayerJoinEvent? On branch CustomFactionEvents modified: src/com/massivecraft/factions/cmd/CmdCreate.java modified: src/com/massivecraft/factions/cmd/CmdDisband.java modified: src/com/massivecraft/factions/cmd/CmdJoin.java modified: src/com/massivecraft/factions/cmd/CmdKick.java modified: src/com/massivecraft/factions/cmd/CmdLeader.java modified: src/com/massivecraft/factions/cmd/CmdTag.java modified: src/com/massivecraft/factions/cmd/FRelationCommand.java modified: src/com/massivecraft/factions/event/FPlayerLeaveEvent.java modified: src/com/massivecraft/factions/event/FactionCreateEvent.java new file: src/com/massivecraft/factions/event/FactionRelationEvent.java new file: src/com/massivecraft/factions/event/FactionRenameEvent.java modified: src/com/massivecraft/factions/event/LandClaimEvent.java
106 lines
3.3 KiB
Java
106 lines
3.3 KiB
Java
package com.massivecraft.factions.cmd;
|
|
|
|
import org.bukkit.Bukkit;
|
|
|
|
import com.massivecraft.factions.Conf;
|
|
import com.massivecraft.factions.FPlayers;
|
|
import com.massivecraft.factions.Faction;
|
|
import com.massivecraft.factions.FPlayer;
|
|
import com.massivecraft.factions.P;
|
|
import com.massivecraft.factions.event.FPlayerJoinEvent;
|
|
import com.massivecraft.factions.struct.Permission;
|
|
|
|
public class CmdJoin extends FCommand
|
|
{
|
|
public CmdJoin()
|
|
{
|
|
super();
|
|
this.aliases.add("join");
|
|
|
|
this.requiredArgs.add("faction");
|
|
this.optionalArgs.put("player", "you");
|
|
|
|
this.permission = Permission.JOIN.node;
|
|
this.disableOnLock = true;
|
|
|
|
senderMustBePlayer = true;
|
|
senderMustBeMember = false;
|
|
senderMustBeOfficer = false;
|
|
senderMustBeLeader = false;
|
|
}
|
|
|
|
@Override
|
|
public void perform()
|
|
{
|
|
Faction faction = this.argAsFaction(0);
|
|
if (faction == null) return;
|
|
|
|
FPlayer fplayer = this.argAsBestFPlayerMatch(1, fme, false);
|
|
boolean samePlayer = fplayer == fme;
|
|
|
|
if (!samePlayer && ! Permission.JOIN_OTHERS.has(sender, false))
|
|
{
|
|
msg("<b>You do not have permission to move other players into a faction.");
|
|
return;
|
|
}
|
|
|
|
if (faction == fplayer.getFaction())
|
|
{
|
|
msg("<b>%s %s already a member of %s", fplayer.describeTo(fme, true), (samePlayer ? "are" : "is"), faction.getTag(fme));
|
|
return;
|
|
}
|
|
|
|
if (Conf.factionMemberLimit > 0 && faction.getFPlayers().size() >= Conf.factionMemberLimit)
|
|
{
|
|
msg(" <b>!<white> The faction %s is at the limit of %d members, so %s cannot currently join.", faction.getTag(fme), Conf.factionMemberLimit, fplayer.describeTo(fme, false));
|
|
return;
|
|
}
|
|
|
|
if (fplayer.hasFaction())
|
|
{
|
|
msg("<b>%s must leave %s current faction first.", fplayer.describeTo(fme, true), (samePlayer ? "your" : "their"));
|
|
return;
|
|
}
|
|
|
|
if (!Conf.canLeaveWithNegativePower && fplayer.getPower() < 0)
|
|
{
|
|
msg("<b>%s cannot join a faction with a negative power level.", fplayer.describeTo(fme, true));
|
|
return;
|
|
}
|
|
|
|
if( ! (faction.getOpen() || faction.isInvited(fplayer) || fme.hasAdminMode() || Permission.JOIN_ANY.has(sender, false)))
|
|
{
|
|
msg("<i>This faction requires invitation.");
|
|
if (samePlayer)
|
|
faction.msg("%s<i> tried to join your faction.", fplayer.describeTo(faction, true));
|
|
return;
|
|
}
|
|
|
|
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
|
|
if (samePlayer && ! payForCommand(Conf.econCostJoin, "to join a faction", "for joining a faction")) return;
|
|
|
|
fme.msg("<i>%s successfully joined %s.", fplayer.describeTo(fme, true), faction.getTag(fme));
|
|
|
|
// trigger the join event (cancellable)
|
|
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.i.get(me),faction,FPlayerJoinEvent.PlayerJoinReason.COMMAND);
|
|
Bukkit.getServer().getPluginManager().callEvent(joinEvent);
|
|
if (joinEvent.isCancelled()) return;
|
|
|
|
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));
|
|
|
|
fplayer.resetFactionData();
|
|
fplayer.setFaction(faction);
|
|
faction.deinvite(fplayer);
|
|
|
|
if (Conf.logFactionJoin)
|
|
{
|
|
if (samePlayer)
|
|
P.p.log("%s joined the faction %s.", fplayer.getName(), faction.getTag());
|
|
else
|
|
P.p.log("%s moved the player %s into the faction %s.", fme.getName(), fplayer.getName(), faction.getTag());
|
|
}
|
|
}
|
|
}
|