Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature - Add Member command (redone) #1668

Merged
merged 8 commits into from
Jan 14, 2023
Merged

Feature - Add Member command (redone) #1668

merged 8 commits into from
Jan 14, 2023

Conversation

dmccoystephenson
Copy link
Member

The changes in this PR allow operators or those with permission to forcefully add members to factions.

closes #1609

German and French translations are required for the following:

CmdFactionAddMember=addmember
CommandFactionAddMemberNoPermission=You don't have permission to forcefully add members to factions.
CommandFactionAddMemberNotAPlayer=You must be a player to use this command.
CommandFactionAddMemberUsage=Usage: /mf addmember
CommandFactionAddMemberInvalidTargetPlayer=That player hasn't played before.
CommandFactionAddMemberFailedToSavePlayer=Failed to save player.
CommandFactionAddMemberTargetPlayerAlreadyInFaction= That player is already in a faction.
CommandFactionAddMemberInvalidTargetFaction=That faction doesn't exist.
CommandFactionAddMemberFailedToSaveFaction=Failed to save faction.
CommandFactionAddMemberUnknownNewPlayerFaction=Unknown New Member
CommandFactionAddMemberSuccess=That player is now a member of the specified faction.
CommandFactionHelpAddMember=/faction addmember - Forcefully add a member to a faction.

@dmccoystephenson dmccoystephenson marked this pull request as ready for review January 5, 2023 02:24
@dmccoystephenson
Copy link
Member Author

These changes have been verified to work correctly.

@dmccoystephenson
Copy link
Member Author

This is ready for re-review.

@dmccoystephenson
Merge branch 'develop' into feature/add-member-command-redone
19ee595 
# Conflicts:
#	src/main/resources/lang/lang_de_DE.properties
#	src/main/resources/lang/lang_fr_FR.properties
@dmccoystephenson
Added translations.
bdc28b0
@dmccoystephenson
Copy link
Member Author

Resolved some conflicts and added translations.

@renbinden renbinden merged commit 9ddce20 into develop Jan 14, 2023
@renbinden renbinden deleted the feature/add-member-command-redone branch January 14, 2023 19:48
@dmccoystephenson dmccoystephenson linked an issue Jan 14, 2023 that may be closed by this pull request
Add a command for forcefully adding players to a faction #1609
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@renbinden renbinden renbinden approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add a command for forcefully adding players to a faction
2 participants
@dmccoystephenson @renbinden