From 5dac7ef6b01572ae3df18ef7154e395988f78db6 Mon Sep 17 00:00:00 2001 From: Terminator_97 <50580453+francesco132@users.noreply.github.com> Date: Wed, 26 Aug 2020 21:46:02 +0200 Subject: [PATCH] 2.3.2 --- SCPUtils/Commands/SetColor.cs | 4 ++-- SCPUtils/Configs.cs | 2 +- SCPUtils/Functions/EventHandlers.cs | 12 +++++------- SCPUtils/Functions/Functions.cs | 2 +- SCPUtils/Plugin.cs | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/SCPUtils/Commands/SetColor.cs b/SCPUtils/Commands/SetColor.cs index edc7870..a9d9a68 100644 --- a/SCPUtils/Commands/SetColor.cs +++ b/SCPUtils/Commands/SetColor.cs @@ -30,7 +30,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s else { target = arguments.Array[1].ToString(); - color = arguments.Array[2].ToString().ToLower(); + color = arguments.Array[2].ToString().ToLower(); if (!validColors.Contains(color) && !color.Equals("none")) { response = "Invalid color, type color in console to see valid SCP colors"; @@ -48,7 +48,7 @@ public bool Execute(ArraySegment arguments, ICommandSender sender, out s else { target = Exiled.API.Features.Player.Get(((CommandSender)sender).SenderId).ToString().Split(new string[] { " " }, StringSplitOptions.None)[2]; - color = arguments.Array[1].ToString().ToLower(); + color = arguments.Array[1].ToString().ToLower(); if (!validColors.Contains(color) && !color.Equals("none")) { response = "Invalid color, type color in console to see valid SCP colors"; diff --git a/SCPUtils/Configs.cs b/SCPUtils/Configs.cs index 0005ef0..e69975a 100644 --- a/SCPUtils/Configs.cs +++ b/SCPUtils/Configs.cs @@ -9,7 +9,7 @@ namespace SCPUtils { public class Configs : IConfig { - public bool IsEnabled { get; set; } = true; + public bool IsEnabled { get; set; } = true; [Description("Should SCPs be warned for quitting or suicide?")] public bool EnableSCPSuicideAutoWarn { get; private set; } = true; diff --git a/SCPUtils/Functions/EventHandlers.cs b/SCPUtils/Functions/EventHandlers.cs index 956b3e1..57ac861 100644 --- a/SCPUtils/Functions/EventHandlers.cs +++ b/SCPUtils/Functions/EventHandlers.cs @@ -13,9 +13,7 @@ public class EventHandlers { private readonly ScpUtils pluginInstance; - public DateTime lastTeslaEvent; - - public Dictionary roleManager = new Dictionary(); + public DateTime lastTeslaEvent; public static bool TemporarilyDisabledWarns; @@ -27,9 +25,9 @@ internal void OnPlayerDeath(DyingEventArgs ev) { if ((DateTime.Now - lastTeslaEvent).Seconds >= pluginInstance.Config.Scp079TeslaEventWait) { - if (ev.HitInformation.GetDamageType() == DamageTypes.Tesla || ( ev.HitInformation.GetDamageType() == DamageTypes.Wall && pluginInstance.Config.QuitEqualsSuicide ) ) pluginInstance.Functions.OnQuitOrSuicide(ev.Target); + if (ev.HitInformation.GetDamageType() == DamageTypes.Tesla || (ev.HitInformation.GetDamageType() == DamageTypes.Wall && pluginInstance.Config.QuitEqualsSuicide)) pluginInstance.Functions.OnQuitOrSuicide(ev.Target); } - } + } } internal void OnRoundEnded(RoundEndedEventArgs ev) => TemporarilyDisabledWarns = true; @@ -65,14 +63,14 @@ internal void OnPlayerJoin(JoinedEventArgs ev) if (pluginInstance.Config.WelcomeEnabled) ev.Player.Broadcast(pluginInstance.Config.WelcomeMessageDuration, pluginInstance.Config.WelcomeMessage, Broadcast.BroadcastFlags.Normal); if (!string.IsNullOrEmpty(databasePlayer.CustomNickName) && databasePlayer.CustomNickName != "None") ev.Player.DisplayNickname = databasePlayer.CustomNickName; if (pluginInstance.Config.ASNBlacklist.Contains(ev.Player.ReferenceHub.characterClassManager.Asn) && !databasePlayer.ASNWhitelisted) ev.Player.Kick($"Auto-Kick: {pluginInstance.Config.AsnKickMessage}", "SCPUtils"); - else pluginInstance.Functions.PostLoadPlayer(ev.Player); + else pluginInstance.Functions.PostLoadPlayer(ev.Player); } internal void OnPlayerSpawn(SpawningEventArgs ev) { - if (ev.Player.Team == Team.SCP || (pluginInstance.Config.AreTutorialsSCP && ev.Player.Team == Team.TUT)) ev.Player.GetDatabasePlayer().TotalScpGamesPlayed++; + if (ev.Player.Team == Team.SCP || (pluginInstance.Config.AreTutorialsSCP && ev.Player.Team == Team.TUT)) ev.Player.GetDatabasePlayer().TotalScpGamesPlayed++; } internal void OnPlayerLeave(LeftEventArgs ev) diff --git a/SCPUtils/Functions/Functions.cs b/SCPUtils/Functions/Functions.cs index 17a0390..0083915 100644 --- a/SCPUtils/Functions/Functions.cs +++ b/SCPUtils/Functions/Functions.cs @@ -24,7 +24,7 @@ public void AutoBanPlayer(Exiled.API.Features.Player player) if (pluginInstance.Config.MultiplyBanDurationEachBan == true) duration = player.GetDatabasePlayer().TotalScpSuicideBans * pluginInstance.Config.AutoBanDuration * 60; else duration = pluginInstance.Config.AutoBanDuration * 60; if (pluginInstance.Config.BroadcastSanctions) BroadcastSuicideQuitAction($" {player.Nickname} ( {player.Role} ) has been BANNED from the server for exceeding Quits / Suicides (as SCP) limit. Duration: {duration} mitutes"); - player.Ban(duration, $"Auto-Ban: {string.Format(pluginInstance.Config.AutoBanMessage, duration )}", "SCPUtils"); + player.Ban(duration, $"Auto-Ban: {string.Format(pluginInstance.Config.AutoBanMessage, duration)}", "SCPUtils"); } public void AutoKickPlayer(Exiled.API.Features.Player player) diff --git a/SCPUtils/Plugin.cs b/SCPUtils/Plugin.cs index dc5642f..c4eafb9 100644 --- a/SCPUtils/Plugin.cs +++ b/SCPUtils/Plugin.cs @@ -38,7 +38,7 @@ public void LoadEvents() PlayerEvents.Joined += EventHandlers.OnPlayerJoin; PlayerEvents.Left += EventHandlers.OnPlayerLeave; PlayerEvents.Spawning += EventHandlers.OnPlayerSpawn; - PlayerEvents.Dying += EventHandlers.OnPlayerDeath; + PlayerEvents.Dying += EventHandlers.OnPlayerDeath; PlayerEvents.Hurting += EventHandlers.OnPlayerHurt; Exiled.Events.Handlers.Scp079.InteractingTesla += EventHandlers.On079TeslaEvent; ServerEvents.WaitingForPlayers += EventHandlers.OnWaitingForPlayers; @@ -74,7 +74,7 @@ public override void OnDisabled() PlayerEvents.Joined -= EventHandlers.OnPlayerJoin; PlayerEvents.Left -= EventHandlers.OnPlayerLeave; PlayerEvents.Spawning -= EventHandlers.OnPlayerSpawn; - PlayerEvents.Dying -= EventHandlers.OnPlayerDeath; + PlayerEvents.Dying -= EventHandlers.OnPlayerDeath; PlayerEvents.Hurting -= EventHandlers.OnPlayerHurt; Exiled.Events.Handlers.Scp079.InteractingTesla -= EventHandlers.On079TeslaEvent; ServerEvents.WaitingForPlayers -= EventHandlers.OnWaitingForPlayers;