Clean up

src/Commands/CommandBack.cs

@@ -24,6 +24,7 @@
 using UnityEngine;
 using Essentials.I18n;
 using Essentials.Api;
+using Essentials.Core;
 using Essentials.Event.Handling;
 
 namespace Essentials.Commands {
@@ -39,11 +40,11 @@ public class CommandBack : EssCommand {
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
             var player = src.ToPlayer();
 
-            if (!player.HasMetadata("back_pos")) {
+            if (!player.HasMetadata(Consts.BACK_METADATA_KEY)) {
                 return CommandResult.Lang("NOT_DIED_YET");
             }
 
-            var backPosition = player.GetMetadata<Vector3>("back_pos");
+            var backPosition = player.GetMetadata<Vector3>(Consts.BACK_METADATA_KEY);
             src.ToPlayer().Teleport(backPosition);
             EssLang.Send(src, "RETURNED");
 

src/Commands/CommandBoom.cs

@@ -33,7 +33,9 @@ namespace Essentials.Commands {
         Name = "boom",
         Aliases = new[] { "explode" },
         Description = "Create an explosion on player's/given position",
-        Usage = "[player | * | x, y, z]"
+        Usage = "[player | * | x, y, z]",
+        MinArgs = 0,
+        MaxArgs = 3
     )]
     public class CommandBoom : EssCommand {
 

src/Commands/CommandRespawnZombies.cs

@@ -48,7 +48,7 @@ public class CommandRespawnZombies : EssCommand {
                     zombie.gear,
                     zombie.transform.position,
                     0
-                    );
+                );
                 count++;
             });
 

src/Commands/CommandTpAll.cs

@@ -38,9 +38,7 @@ namespace Essentials.Commands {
     public class CommandTpAll : EssCommand {
 
         private static readonly Action<Vector3, List<UPlayer>> TeleportAll = (pos, players) => {
-            players.ForEach(
-                player => player.UnturnedPlayer.sendTeleport(pos, 0)
-                );
+            players.ForEach(player => player.UnturnedPlayer.sendTeleport(pos, 0));
         };
 
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
@@ -49,6 +47,7 @@ public class CommandTpAll : EssCommand {
             if (players.Count == (src.IsConsole ? 0 : 1)) {
                 return CommandResult.Lang("NO_PLAYERS_FOR_TELEPORT");
             }
+
             switch (args.Length) {
                 case 0:
                     if (src.IsConsole) {

src/Commands/CommandTpa.cs

@@ -39,18 +39,15 @@ namespace Essentials.Commands {
 
     [CommandInfo(
         Name = "tpa",
-        Usage = "[player | accept | deny | cancel]",
-        AllowedSource = AllowedSource.PLAYER
+        Usage = "[player/accept/deny/cancel]",
+        AllowedSource = AllowedSource.PLAYER,
+        MinArgs = 1
     )]
     public class CommandTpa : EssCommand {
 
         public static Dictionary<ulong, ulong> Requests = new Dictionary<ulong, ulong>();
 
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
-            if (args.Length < 1) {
-                return CommandResult.ShowUsage();
-            }
-
             var player = src.ToPlayer();
             var senderId = player.CSteamId.m_SteamID;
 

src/Commands/CommandUnfreeze.cs

@@ -31,15 +31,13 @@ namespace Essentials.Commands {
     [CommandInfo(
         Name = "unfreeze",
         Usage = "[player/*]",
-        Description = "Unfreeze a player/everyone"
+        Description = "Unfreeze a player/everyone",
+        MinArgs = 1,
+        MaxArgs = 1
     )]
     public class CommandUnfreeze : EssCommand {
 
         public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
-            if (args.Length == 0) {
-                return CommandResult.ShowUsage();
-            }
-
             if (args[0].Is("*")) {
                 foreach (var player in UServer.Players.Where(player => player.HasComponent<FrozenPlayer>())) {
                     player.RemoveComponent<FrozenPlayer>();
@@ -57,12 +55,11 @@ public class CommandUnfreeze : EssCommand {
 
                 if (!target.HasComponent<FrozenPlayer>()) {
                     return CommandResult.Lang("NOT_FROZEN", target.DisplayName);
-                } else {
-                    target.RemoveComponent<FrozenPlayer>();
-
-                    EssLang.Send(src, "UNFROZEN_SENDER", target.DisplayName);
-                    EssLang.Send(target, "UNFROZEN_PLAYER", src.DisplayName);
                 }
+                target.RemoveComponent<FrozenPlayer>();
+
+                EssLang.Send(src, "UNFROZEN_SENDER", target.DisplayName);
+                EssLang.Send(target, "UNFROZEN_PLAYER", src.DisplayName);
             }
 
             return CommandResult.Success();

src/Commands/MiscCommands.cs

@@ -670,16 +670,12 @@ public class MiscCommands {
             Description = "Show tps."
         )]
         private CommandResult TpsCommand(ICommandSource src, ICommandArgs args) {
-            Color color;
             var tps = Provider.debugTPS;
-
-            if (tps > 40)
-                color = Color.green;
-            else if (tps < 40 && tps > 25)
-                color = Color.yellow;
-            else
-                color = Color.red;
-
+            var color = 
+                tps > 40 ? Color.green : 
+                tps > 25 ? Color.yellow : 
+                Color.red;
+
             src.SendMessage($"Ticks per second: {tps}", color);
             return CommandResult.Success();
         }
@@ -776,7 +772,7 @@ public class MiscCommands {
 
         [CommandInfo(
             Name = "pvp",
-            Description = "Enable or disable pvp",
+            Description = "Enable or disable server pvp.",
             Usage = "[on|off]"
         )]
         private CommandResult PvpCommand(ICommandSource src, ICommandArgs args) {

src/Event/Handling/EssentialsEventHandler.cs

@@ -80,19 +80,18 @@ internal class EssentialsEventHandler {
 
         [SubscribeEvent(EventType.PLAYER_DISCONNECTED)]
         private void GenericPlayerDisconnected(UnturnedPlayer player) {
-            var displayName = player.CharacterName;
+            var playerId = player.CSteamID.m_SteamID;
 
-            MiscCommands.Spies.Remove(player.CSteamID.m_SteamID);
-            CommandTell.Conversations.Remove(player.CSteamID.m_SteamID);
-            CachedSkills.Remove(player.CSteamID.m_SteamID);
+            MiscCommands.Spies.Remove(playerId);
+            CommandTell.Conversations.Remove(playerId);
+            CachedSkills.Remove(playerId);
             CommandHome.Cooldown.RemoveEntry(player.CSteamID);
 
             /* Kit Stuffs */
             UEssentials.ModuleManager.GetModule<KitModule>().IfPresent(m => {
                 if (CommandKit.Cooldowns.Count == 0) return;
-                if (!CommandKit.Cooldowns.ContainsKey(player.CSteamID.m_SteamID)) return;
+                if (!CommandKit.Cooldowns.ContainsKey(playerId)) return;
 
-                var playerId = player.CSteamID.m_SteamID;
                 var playerCooldowns = CommandKit.Cooldowns[playerId];
                 var keys = new List<string>(playerCooldowns.Keys);
 
@@ -474,7 +473,7 @@ internal class EssentialsEventHandler {
                 return;
             }
 
-            UPlayer.TryGet(player, p => p.SetMetadata("back_pos", player.Position));
+            UPlayer.TryGet(player, p => p.SetMetadata(Consts.BACK_METADATA_KEY, player.Position));
         }
 
 

uEssentials.csproj

@@ -118,6 +118,7 @@
     <Compile Include="src\Common\Util\DebugUtil.cs" />
     <Compile Include="src\Compatibility\Hook.cs" />
     <Compile Include="src\Compatibility\HookManager.cs" />
+    <Compile Include="src\Core\Consts.cs" />
     <Compile Include="src\Json\Converters\Vector3Converter.cs" />
     <Compile Include="src\Misc\InstancePool.cs" />
     <Compile Include="src\Economy\IEconomyProvider.cs" />