diff --git a/Plugins/Welcome/Plugin.cs b/Plugins/Welcome/Plugin.cs index 14a499a1..5fac3088 100644 --- a/Plugins/Welcome/Plugin.cs +++ b/Plugins/Welcome/Plugin.cs @@ -124,7 +124,7 @@ namespace Welcome_Plugin if (newPlayer.Level >= Player.Permission.Trusted && !E.Origin.Masked) await E.Owner.Broadcast(Utilities.ConvertLevelToColor(newPlayer.Level) + " ^5" + newPlayer.Name + " ^7has joined the server."); - await newPlayer.Tell($"Welcome ^5{newPlayer.Name}^7, this your ^5{TimesConnected(newPlayer)} ^7time connecting!"); + await newPlayer.Tell($"Welcome ^5{newPlayer.Name}^7, this is your ^5{TimesConnected(newPlayer)} ^7time connecting!"); if (newPlayer.Level == Player.Permission.Flagged) await E.Owner.ToAdmins($"^1NOTICE: ^7Flagged player ^5{newPlayer.Name}^7 has joined!"); diff --git a/SharedLibrary/Commands/NativeCommands.cs b/SharedLibrary/Commands/NativeCommands.cs index 88a3785c..cd2e9bfa 100644 --- a/SharedLibrary/Commands/NativeCommands.cs +++ b/SharedLibrary/Commands/NativeCommands.cs @@ -284,11 +284,14 @@ namespace SharedLibrary.Commands if (newPerm > Player.Permission.Banned) { - var ActiveClient = E.Owner.Manager.GetActiveClients().First(p => p.NetworkID == E.Target.NetworkID); + var ActiveClient = E.Owner.Manager.GetActiveClients().FirstOrDefault(p => p.NetworkID == E.Target.NetworkID); ActiveClient?.SetLevel(newPerm); - await ActiveClient?.Tell("Congratulations! You have been promoted to ^3" + newPerm); - await E.Origin.Tell($"{E.Target.Name} was successfully promoted!"); + if (ActiveClient != null) + { + await ActiveClient?.Tell("Congratulations! You have been promoted to ^3" + newPerm); + await E.Origin.Tell($"{E.Target.Name} was successfully promoted!"); + } E.Target.SetLevel(newPerm); E.Owner.Manager.GetClientDatabase().UpdatePlayer(E.Target);