EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76f3f044ca
Factions3/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java

111 lines
3.6 KiB
Java
Raw Normal View History

glerp
2011-10-09 21:57:43 +02:00
package com.massivecraft.factions.cmd;
More refactoring
2011-03-19 13:00:03 +01:00
Added Event System
2012-03-02 02:16:45 +01:00
import org.bukkit.Bukkit;
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
import com.massivecraft.factions.ConfServer;
Add recruit role for factions The recruit role's goal is to enable factions to invite new members without being afraid of getting griefed instantly. Adds a configuration option "factionRankDefault" for default rank of newly joined faction members. By default this is RECRUIT, but it can be set to any supported rank. Adds the /f promote and /f demote commands, which leaders and officers can use to increase or decrease the rank of a faction member by one level, up to officer, or down to recruit. This version of the recruit feature preserves the /f officer command for backward compatibility.
2013-01-06 21:44:29 +01:00
import com.massivecraft.factions.FPlayer;
Rename FPlayers --> FPlayerColl
2013-04-09 13:22:23 +02:00
import com.massivecraft.factions.FPlayerColl;
changed namespace to com.massivecraft
2011-07-18 22:06:02 +02:00
import com.massivecraft.factions.Faction;
Rename P --> Factions.
2013-04-09 13:00:09 +02:00
import com.massivecraft.factions.Factions;
Renaming Permission --> Perm and moving to main package.
2013-04-09 12:56:29 +02:00
import com.massivecraft.factions.Perm;
Added Event System
2012-03-02 02:16:45 +01:00
import com.massivecraft.factions.event.FPlayerJoinEvent;
More refactoring
2011-03-19 13:00:03 +01:00
Rename command files
2013-04-10 13:12:22 +02:00
public class CmdFactionsJoin extends FCommand
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
Rename command files
2013-04-10 13:12:22 +02:00
public CmdFactionsJoin()
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
super();
this.aliases.add("join");
Streamlined the faction arg descriptores
2011-10-24 11:11:53 +02:00
this.requiredArgs.add("faction");
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
this.optionalArgs.put("player", "you");
Now it compiles. Time to fix runtime errors...
2011-03-22 18:48:09 +01:00
Renaming Permission --> Perm and moving to main package.
2013-04-09 12:56:29 +02:00
this.permission = Perm.JOIN.node;
More refactoring
2011-03-19 13:00:03 +01:00
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
senderMustBePlayer = true;
senderMustBeMember = false;
Merged Relation and Role into one enum
2011-10-23 17:55:53 +02:00
senderMustBeOfficer = false;
senderMustBeLeader = false;
More refactoring
2011-03-19 13:00:03 +01:00
}
A bit of cleanup and odds and ends, adding missing @Override annotations and such
2011-06-21 07:38:31 +02:00
@Override
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
public void perform()
{
Faction faction = this.argAsFaction(0);
if (faction == null) return;
More refactoring
2011-03-19 13:00:03 +01:00
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
FPlayer fplayer = this.argAsBestFPlayerMatch(1, fme, false);
boolean samePlayer = fplayer == fme;
Renaming Permission --> Perm and moving to main package.
2013-04-09 12:56:29 +02:00
if (!samePlayer && ! Perm.JOIN_OTHERS.has(sender, false))
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
msg("<b>You do not have permission to move other players into a faction.");
Safe zones and faction homes :D :D
2011-03-23 17:39:56 +01:00
return;
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
}
New setting factionMemberLimit (default 0, no limit), which will prevent players from joining any faction that has reached this membership limit.
2012-02-24 13:30:28 +01:00
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
if (faction == fplayer.getFaction())
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
msg("<b>%s %s already a member of %s", fplayer.describeTo(fme, true), (samePlayer ? "are" : "is"), faction.getTag(fme));
More refactoring
2011-03-19 13:00:03 +01:00
return;
}
New setting factionMemberLimit (default 0, no limit), which will prevent players from joining any faction that has reached this membership limit.
2012-02-24 13:30:28 +01:00
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
if (ConfServer.factionMemberLimit > 0 && faction.getFPlayers().size() >= ConfServer.factionMemberLimit)
New setting factionMemberLimit (default 0, no limit), which will prevent players from joining any faction that has reached this membership limit.
2012-02-24 13:30:28 +01:00
{
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
msg(" <b>!<white> The faction %s is at the limit of %d members, so %s cannot currently join.", faction.getTag(fme), ConfServer.factionMemberLimit, fplayer.describeTo(fme, false));
New setting factionMemberLimit (default 0, no limit), which will prevent players from joining any faction that has reached this membership limit.
2012-02-24 13:30:28 +01:00
return;
}
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
if (fplayer.hasFaction())
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
msg("<b>%s must leave %s current faction first.", fplayer.describeTo(fme, true), (samePlayer ? "your" : "their"));
More refactoring
2011-03-19 13:00:03 +01:00
return;
}
New setting factionMemberLimit (default 0, no limit), which will prevent players from joining any faction that has reached this membership limit.
2012-02-24 13:30:28 +01:00
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
if (!ConfServer.canLeaveWithNegativePower && fplayer.getPower() < 0)
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
msg("<b>%s cannot join a faction with a negative power level.", fplayer.describeTo(fme, true));
New option to disallow players from leaving, joining, or being kicked from a faction while they have a negative power level - code by sp1ky, adapted from a pull request
2011-05-29 23:41:50 +02:00
return;
}
New setting factionMemberLimit (default 0, no limit), which will prevent players from joining any faction that has reached this membership limit.
2012-02-24 13:30:28 +01:00
rename getOpen --> isOpen and remove old money migration code.
2013-04-11 11:44:55 +02:00
if( ! (faction.isOpen() || faction.isInvited(fplayer) || fme.hasAdminMode() || Perm.JOIN_ANY.has(sender, false)))
Halfway through refactoring of commands and permissions
2011-10-09 14:53:38 +02:00
{
Renamed sendMessageParsed to msg
2011-10-10 13:40:24 +02:00
msg("<i>This faction requires invitation.");
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
if (samePlayer)
faction.msg("%s<i> tried to join your faction.", fplayer.describeTo(faction, true));
More refactoring
2011-03-19 13:00:03 +01:00
return;
}
Ability to pay for commands (through economy) is now checked before firing events which can be canceled, and actual payment made after making sure the event isn't canceled. Added Econ.hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) method to check if an account has at least a specified amount of money in it. Also added related FCommand.canAffordCommand(double cost, String toDoThis).
2012-03-13 15:48:34 +01:00
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
if (samePlayer && ! canAffordCommand(ConfServer.econCostJoin, "to join a faction")) return;
Added basic support for iConomy, where most Factions commands can be made to cost (or give) money. For claiming land, there are some extra features. Each additional land claimed by default costs more than the last, with the multiplier being configurable. For example, the first claim might cost $30, the 2nd $45, the third $60, and so forth. When land is claimed from a weakened faction, there is a configurable bonus amount of money deducted from the cost of claiming the land, as an incentive; this number can be changed to a negative value to instead make it cost more to claim such land. When land is unclaimed, a configurable percentage of the cost of claiming the land can be refunded (defaults to 70% of the cost). The total value of a faction's claimed land is now shown in the info given by /f who [faction tag], along with the depreciated (refund) value.
2011-08-02 01:05:01 +02:00
updated patrickfreed's custom event system 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
2012-03-09 23:09:33 +01:00
// trigger the join event (cancellable)
Possible converted FPlayer
2013-04-12 08:56:26 +02:00
FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayerColl.get().get(me),faction,FPlayerJoinEvent.PlayerJoinReason.COMMAND);
Added Event System
2012-03-02 02:16:45 +01:00
Bukkit.getServer().getPluginManager().callEvent(joinEvent);
if (joinEvent.isCancelled()) return;
a bit of cleanup
2012-03-13 13:47:54 +01:00
Ability to pay for commands (through economy) is now checked before firing events which can be canceled, and actual payment made after making sure the event isn't canceled. Added Econ.hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) method to check if an account has at least a specified amount of money in it. Also added related FCommand.canAffordCommand(double cost, String toDoThis).
2012-03-13 15:48:34 +01:00
// then make 'em pay (if applicable)
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
if (samePlayer && ! payForCommand(ConfServer.econCostJoin, "to join a faction", "for joining a faction")) return;
Ability to pay for commands (through economy) is now checked before firing events which can be canceled, and actual payment made after making sure the event isn't canceled. Added Econ.hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) method to check if an account has at least a specified amount of money in it. Also added related FCommand.canAffordCommand(double cost, String toDoThis).
2012-03-13 15:48:34 +01:00
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
fme.setRole(ConfServer.factionRankDefault); // They have just joined a faction, start them out on the lowest rank (default config).
a bit of cleanup
2012-03-13 13:47:54 +01:00
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
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));
Add recruit role for factions The recruit role's goal is to enable factions to invite new members without being afraid of getting griefed instantly. Adds a configuration option "factionRankDefault" for default rank of newly joined faction members. By default this is RECRUIT, but it can be set to any supported rank. Adds the /f promote and /f demote commands, which leaders and officers can use to increase or decrease the rank of a faction member by one level, up to officer, or down to recruit. This version of the recruit feature preserves the /f officer command for backward compatibility.
2013-01-06 21:44:29 +01:00
fme.msg("<i>%s successfully joined %s.", fplayer.describeTo(fme, true), faction.getTag(fme));
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
fplayer.resetFactionData();
fplayer.setFaction(faction);
Add recruit role for factions The recruit role's goal is to enable factions to invite new members without being afraid of getting griefed instantly. Adds a configuration option "factionRankDefault" for default rank of newly joined faction members. By default this is RECRUIT, but it can be set to any supported rank. Adds the /f promote and /f demote commands, which leaders and officers can use to increase or decrease the rank of a faction member by one level, up to officer, or down to recruit. This version of the recruit feature preserves the /f officer command for backward compatibility.
2013-01-06 21:44:29 +01:00
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
faction.deinvite(fplayer);
Add recruit role for factions The recruit role's goal is to enable factions to invite new members without being afraid of getting griefed instantly. Adds a configuration option "factionRankDefault" for default rank of newly joined faction members. By default this is RECRUIT, but it can be set to any supported rank. Adds the /f promote and /f demote commands, which leaders and officers can use to increase or decrease the rank of a faction member by one level, up to officer, or down to recruit. This version of the recruit feature preserves the /f officer command for backward compatibility.
2013-01-06 21:44:29 +01:00
Additional logging, with new conf.json settings to enable/disable logging of specific events: "logFactionCreate": true, - log faction creation "logFactionDisband": true, - log factions being disbanded, by command or by circumstance "logFactionJoin": true, - log player joining a faction "logFactionKick": true, - log player being kicked from a faction "logFactionLeave": true, - log player leaving a faction "logLandClaims": true, - log land being claimed (including safe zone and war zone) "logLandUnclaims": true, - log land being unclaimed (including safe zone and war zone) "logMoneyTransactions": true, - log money being deposited, withdrawn, and otherwise transferred in relation to faction banks Also a fix for a potential NPE from players logging out and Spout appearance handler referencing them afterwards
2011-10-23 19:50:02 +02:00
Rename Conf --> ConfServer.
2013-04-09 13:15:25 +02:00
if (ConfServer.logFactionJoin)
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
{
if (samePlayer)
MCorify the MPlugin class Factions slightly.
2013-04-09 13:12:13 +02:00
Factions.get().log("%s joined the faction %s.", fplayer.getName(), faction.getTag());
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
else
MCorify the MPlugin class Factions slightly.
2013-04-09 13:12:13 +02:00
Factions.get().log("%s moved the player %s into the faction %s.", fme.getName(), fplayer.getName(), faction.getTag());
Added possibility to specify a player in the /f join command (/f join <faction> [player=you]), to make a player other than yourself join the specified faction. The new permission factions.join.others (added to factions.kit.mod and above) is required to be able to specify a different player. Note that the player cannot currently already be in another faction; if they are, you'll need to /f kick them first. Also note that if the faction isn't open (with no invitation required), the player isn't invited, and you don't have the factions.join.any permission or have admin bypass mode on, the attempt will also fail. Also, added new log method which accepts arguments (like the msg method).
2012-02-26 19:29:44 +01:00
}
More refactoring
2011-03-19 13:00:03 +01:00
}
}
Reference in New Issue Copy Permalink