Skip to content

Fix p #22 #65

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

Merged
sunnamed434 merged 1 commit into from
May 20, 2024
Merged

Fix p #22 #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions Rocket.Unturned/Commands/CommandP.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,27 @@ public List<string> Permissions

public void Execute(IRocketPlayer caller, string[] command)
{
if(command.Length == 1 && command[0].ToLower() == "reload" && caller.HasPermission("p.reload"))
if (command.Length == 1 && command[0].ToLower() == "reload" && caller.HasPermission("p.reload"))
{
R.Permissions.Reload();
UnturnedChat.Say(caller, U.Translate("command_p_permissions_reload"));
return;
}




if (command.Length == 0 && !(caller is ConsolePlayer))
if (command.Length == 0 && caller is not ConsolePlayer)
{
UnturnedChat.Say(caller, U.Translate("command_p_groups_private", "Your", string.Join(", ", R.Permissions.GetGroups(caller, true).Select(g => g.DisplayName).ToArray())));
UnturnedChat.Say(caller, U.Translate("command_p_permissions_private", "Your", string.Join(", ", Core.R.Permissions.GetPermissions(caller).Select(p => p.Name + (p.Cooldown != 0 ? "(" + p.Cooldown + ")" : "")).ToArray())));
}
else if(command.Length == 1) {
else if (command.Length == 1)
{

IRocketPlayer player = command.GetUnturnedPlayerParameter(0);
if (player == null) player = command.GetRocketPlayerParameter(0);
if (player != null) {
UnturnedChat.Say(caller, U.Translate("command_p_groups_private", player.DisplayName+"s", string.Join(", ", R.Permissions.GetGroups(player, true).Select(g => g.DisplayName).ToArray())));
UnturnedChat.Say(caller, U.Translate("command_p_permissions_private", player.DisplayName + "s", string.Join(", ", Core.R.Permissions.GetPermissions(player).Select(p => p.Name +(p.Cooldown != 0? "(" + p.Cooldown + ")" : "")).ToArray())));
if (player != null)
{
UnturnedChat.Say(caller, U.Translate("command_p_groups_private", player.DisplayName + "s", string.Join(", ", R.Permissions.GetGroups(player, true).Select(g => g.DisplayName).ToArray())));
UnturnedChat.Say(caller, U.Translate("command_p_permissions_private", player.DisplayName + "s", string.Join(", ", Core.R.Permissions.GetPermissions(player).Select(p => p.Name + (p.Cooldown != 0 ? "(" + p.Cooldown + ")" : "")).ToArray())));
}
else
{
Expand All @@ -83,12 +82,13 @@ public void Execute(IRocketPlayer caller, string[] command)
if (player == null) player = command.GetRocketPlayerParameter(1);

string groupName = command.GetStringParameter(2);

switch (c)
{
case "add":
if (caller.HasPermission("p.add")&& player != null && groupName != null) {
switch (Core.R.Permissions.AddPlayerToGroup(groupName, player))
if (caller.HasPermission("p.add") && player != null && groupName != null)
{
switch (R.Permissions.AddPlayerToGroup(groupName, player))
{
case RocketPermissionsProviderResult.Success:
UnturnedChat.Say(caller, U.Translate("command_p_group_player_added", player.DisplayName, groupName));
Expand All @@ -99,17 +99,19 @@ public void Execute(IRocketPlayer caller, string[] command)
case RocketPermissionsProviderResult.GroupNotFound:
UnturnedChat.Say(caller, U.Translate("command_p_group_not_found", player.DisplayName, groupName));
return;
case RocketPermissionsProviderResult.PlayerNotFound:
case RocketPermissionsProviderResult.PlayerNotFound: // - does not work
UnturnedChat.Say(caller, U.Translate("command_p_player_not_found", player.DisplayName, groupName));
return;
default:
UnturnedChat.Say(caller, U.Translate("command_p_unknown_error", player.DisplayName, groupName));
return;
}
}
UnturnedChat.Say(caller, U.Translate("command_p_player_not_found", command[1], "group_not_found")); // the solution to the problem
return;
case "remove":
if (caller.HasPermission("p.remove") && player != null && groupName != null) {
if (caller.HasPermission("p.remove") && player != null && groupName != null)
{
switch (Core.R.Permissions.RemovePlayerFromGroup(groupName, player))
{
case RocketPermissionsProviderResult.Success:
Expand All @@ -121,29 +123,26 @@ public void Execute(IRocketPlayer caller, string[] command)
case RocketPermissionsProviderResult.GroupNotFound:
UnturnedChat.Say(caller, U.Translate("command_p_group_not_found", player.DisplayName, groupName));
return;
case RocketPermissionsProviderResult.PlayerNotFound:
case RocketPermissionsProviderResult.PlayerNotFound: // - does not work
UnturnedChat.Say(caller, U.Translate("command_p_player_not_found", player.DisplayName, groupName));
return;
default:
UnturnedChat.Say(caller, U.Translate("command_p_unknown_error", player.DisplayName, groupName));
return;
}
}
UnturnedChat.Say(caller, U.Translate("command_p_player_not_found", command[1], "group_not_found")); // the solution to the problem
return;
default:
UnturnedChat.Say(caller, U.Translate("command_generic_invalid_parameter"));
throw new WrongUsageOfCommandException(caller, this);
}


}
else
{
UnturnedChat.Say(caller, U.Translate("command_generic_invalid_parameter"));
throw new WrongUsageOfCommandException(caller, this);
}


}
}
}
}