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.

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

new command join and remove to force join or remove avatars into your current team #549

Merged
5 commits merged into from
May 14, 2022

Conversation

lsCoding666
Copy link
Contributor

new command join and remove to force join or remove avatars into your current team
@command(label = "join", usage = "join ...",
description = "force join avatar into your team", permission = "player.join")

@command(label = "remove", usage = "remove ...",
description = "force remove avatar into your team", permission = "player.remove")

@@ -74,7 +74,7 @@ public static class GameServerOptions {
public int InventoryLimitMaterial = 2000;
public int InventoryLimitFurniture = 2000;
public int InventoryLimitAll = 30000;
public int MaxAvatarsInTeam = 4;
public int MaxAvatarsInTeam = 9;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably shouldn't be included

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Maybe we shoud not limit MaxAvatarsInTeam on server. Client has some limit like 5. If you force add avatar into your team, the maxium is 5. When your team has 5, force join can not has response.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

video: click

src/main/java/emu/grasscutter/Config.java Outdated Show resolved Hide resolved
@ghost
Copy link

ghost commented May 10, 2022

Please fix your merge conflicts so I can merge this PR.

@KingRainbow44 KingRainbow44 added enhancement New feature or request feature A game-related addition commands Related to the commands system labels May 11, 2022
…tter into development

� Conflicts:
�	src/main/java/emu/grasscutter/languages/CNLanguage.java
�	src/main/java/emu/grasscutter/languages/Language.java
@lsCoding666
Copy link
Contributor Author

Please fix your merge conflicts so I can merge this PR.

Sorry to see it so late. I'll change it right away

1 similar comment
@lsCoding666
Copy link
Contributor Author

Please fix your merge conflicts so I can merge this PR.

Sorry to see it so late. I'll change it right away

@lsCoding666
Copy link
Contributor Author

lsCoding666 commented May 14, 2022

Please fix your merge conflicts so I can merge this PR.

merged.@Melledy

@ghost ghost merged commit afc2c8b into Grasscutters:development May 14, 2022
Birdulon pushed a commit to Birdulon/Grasscutter that referenced this pull request Aug 21, 2022
… current team (Grasscutters#549)

* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
commands Related to the commands system enhancement New feature or request feature A game-related addition
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants