Commit 21478b0a authored by RDsatan's avatar RDsatan Committed by Melledy
Browse files

fixed

parent 34ea3089
...@@ -14,8 +14,8 @@ import java.util.HashSet; ...@@ -14,8 +14,8 @@ import java.util.HashSet;
import static emu.grasscutter.utils.Language.translate; import static emu.grasscutter.utils.Language.translate;
import static emu.grasscutter.Configuration.*; import static emu.grasscutter.Configuration.*;
@Command(label = "team", usage = "team <add|remove|set> [avatarId,...] [index|first|last|index-index,...]", permission = "player.team", @Command(label = "team", usage = "team <add|remove|set> [avatarId,...] [index|first|last|index-index,...]",
permissionTargeted = "player.team.others", description = "commands.team.description") permission = "player.team", permissionTargeted = "player.team.others", description = "commands.team.description")
public final class TeamCommand implements CommandHandler { public final class TeamCommand implements CommandHandler {
private static final int BASE_AVATARID = 10000000; private static final int BASE_AVATARID = 10000000;
...@@ -50,7 +50,8 @@ public final class TeamCommand implements CommandHandler { ...@@ -50,7 +50,8 @@ public final class TeamCommand implements CommandHandler {
return; return;
} }
targetPlayer.getTeamManager().updateTeamEntities(new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo())); targetPlayer.getTeamManager().updateTeamEntities(
new PacketChangeMpTeamAvatarRsp(targetPlayer, targetPlayer.getTeamManager().getCurrentTeamInfo()));
} }
private boolean addCommand(Player sender, Player targetPlayer, List<String> args) { private boolean addCommand(Player sender, Player targetPlayer, List<String> args) {
......
...@@ -181,10 +181,6 @@ ...@@ -181,10 +181,6 @@
"success": "All characters have been healed.", "success": "All characters have been healed.",
"description": "Heal all characters in your current team." "description": "Heal all characters in your current team."
}, },
"join": {
"usage": "Usage: join [AvatarIDs] such as\"join 10000038 10000039\"",
"description": "force join avatar into your team"
},
"kick": { "kick": {
"player_kick_player": "Player [%s:%s] has kicked player [%s:%s]", "player_kick_player": "Player [%s:%s] has kicked player [%s:%s]",
"server_kick_player": "Kicking player [%s:%s]", "server_kick_player": "Kicking player [%s:%s]",
...@@ -237,11 +233,6 @@ ...@@ -237,11 +233,6 @@
"reload_done": "Reload complete.", "reload_done": "Reload complete.",
"description": "Reload server config" "description": "Reload server config"
}, },
"remove": {
"usage": "Usage: remove [indexOfYourTeam] index start from 1",
"invalid_index": "The index number is illegal. It starts from 1 and the maximum value is the number of roles in the team",
"description": "force remove avatar into your team. Such as `remove 1 2`."
},
"resetConst": { "resetConst": {
"reset_all": "Reset all avatars' constellations.", "reset_all": "Reset all avatars' constellations.",
"success": "Constellations for %s have been reset. Please relog to see changes.", "success": "Constellations for %s have been reset. Please relog to see changes.",
...@@ -336,11 +327,11 @@ ...@@ -336,11 +327,11 @@
"invalid_usage": "invalid usage", "invalid_usage": "invalid usage",
"add_usage": "usage(add): team add <avatarId,...> [index]", "add_usage": "usage(add): team add <avatarId,...> [index]",
"invalid_index": "index is invalid", "invalid_index": "index is invalid",
"add_too_much": "server is only allow you to add %d avatar(s)", "add_too_much": "server is only allow you to have at most %d avatar(s) in your team",
"failed_to_add_avatar": "failed to add avatar by id: %s", "failed_to_add_avatar": "failed to add avatar by id: %s",
"remove_usage": "usage(remove): team remove <index|first|last|index-index,...>", "remove_usage": "usage(remove): team remove <index|first|last|index-index,...>",
"failed_parse_index": "failed to parse index: %s", "failed_parse_index": "failed to parse index: %s",
"remove_too_much": "you can't remove so much avatars", "remove_too_much": "you can't remove so many avatars, your team list will be empty for this",
"ignore_index": "ignored index(es): %s", "ignore_index": "ignored index(es): %s",
"set_usage": "usage(set): team set <index> <avatarId>", "set_usage": "usage(set): team set <index> <avatarId>",
"index_out_of_range": "index your specified is out of range", "index_out_of_range": "index your specified is out of range",
......
...@@ -180,10 +180,6 @@ ...@@ -180,10 +180,6 @@
"success": "已治疗所有角色。", "success": "已治疗所有角色。",
"description": "治疗当前队伍的角色" "description": "治疗当前队伍的角色"
}, },
"join": {
"usage": "用法:join <角色IDs> 例如\"join 10000038 10000039\"空格分开",
"description": "强制将角色加入到当前队伍中"
},
"kick": { "kick": {
"player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。", "player_kick_player": "玩家 [%s:%s] 已将 [%s:%s] 踢出。",
"server_kick_player": "正在踢出玩家 [%s:%s]...", "server_kick_player": "正在踢出玩家 [%s:%s]...",
...@@ -236,11 +232,6 @@ ...@@ -236,11 +232,6 @@
"reload_done": "重载完成。", "reload_done": "重载完成。",
"description": "重载配置文件和数据" "description": "重载配置文件和数据"
}, },
"remove": {
"usage": "用法: remove [多个角色在队伍中的序号] 序号从1开始",
"invalid_index": "序号不合法,从1开始,最大值为队内角色数量",
"description": "强制将某个角色从当前队伍中移除。例如`remove 1 2`表示将1号和2号角色从队伍中移除"
},
"resetConst": { "resetConst": {
"reset_all": "重置所有角色的命座。", "reset_all": "重置所有角色的命座。",
"success": "已重置 %s 的命座,重新登录后生效。", "success": "已重置 %s 的命座,重新登录后生效。",
...@@ -335,11 +326,11 @@ ...@@ -335,11 +326,11 @@
"invalid_usage": "无效用法", "invalid_usage": "无效用法",
"add_usage": "用法(add): team add <avatarId,...> [index]", "add_usage": "用法(add): team add <avatarId,...> [index]",
"invalid_index": "无效索引", "invalid_index": "无效索引",
"add_too_much": "服务端仅支持你添加%d角色", "add_too_much": "服务端仅允许你队伍里至多有%d角色",
"failed_to_add_avatar": "无法根据id %s 添加角色", "failed_to_add_avatar": "无法根据id %s 添加角色",
"remove_usage": "用法(remove): team remove <index|first|last|index-index,...>", "remove_usage": "用法(remove): team remove <index|first|last|index-index,...>",
"failed_parse_index": "无法解析索引: %s", "failed_parse_index": "无法解析索引: %s",
"remove_too_much": "你不能删除那么多角色", "remove_too_much": "你不能删除那么多角色,你的队伍列表将会变空",
"ignore_index": "忽略的索引列表: %s", "ignore_index": "忽略的索引列表: %s",
"set_usage": "用法(set): team set <index> <avatarId>", "set_usage": "用法(set): team set <index> <avatarId>",
"index_out_of_range": "你指定的索引超出了范围", "index_out_of_range": "你指定的索引超出了范围",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment