Add tpr and added /tpa <playerName>

F-Plugins · Dec 8, 2021 · 7f39c59 · 7f39c59
1 parent ab7b9bf
commit 7f39c59
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/Feli.RocketMod.Teleporting/Commands/TpaCommand.cs b/Feli.RocketMod.Teleporting/Commands/TpaCommand.cs
@@ -13,17 +13,17 @@ public void Execute(IRocketPlayer caller, string[] command)
             var plugin = Plugin.Instance;
             var messageColor = plugin.MessageColor;
             var messageIcon = plugin.Configuration.Instance.MessageIcon;
-            
+
             if (command.Length < 1)
             {
                 Say(caller, plugin.Translate("TpaCommand:WrongUsage"), messageColor, messageIcon);
                 return;
             }
-            
+
             var player = (UnturnedPlayer) caller;
-            
+
             var type = command[0].ToLower();
-            
+
             var teleportsManager = plugin.TeleportsManager;
 
             if (type == "s" | type == "send")
@@ -38,21 +38,31 @@ public void Execute(IRocketPlayer caller, string[] command)
 
                 if (target == null)
                 {
-                    Say(caller, plugin.Translate("TpaCommand:WrongUsage:NotFound", command[1]), messageColor, messageIcon);
+                    Say(caller, plugin.Translate("TpaCommand:WrongUsage:NotFound", command[1]), messageColor,
+                        messageIcon);
                     return;
                 }
-                
+
                 teleportsManager.Send(player, target);
             }
             else if (type == "a" | type == "accept")
                 teleportsManager.Accept(player);
             else if (type == "c" | type == "cancel")
                 teleportsManager.Cancel(player);
-            else if(type == "l" | type == "list")
+            else if (type == "l" | type == "list")
                 teleportsManager.List(player);
             else
             {
-                Say(caller, plugin.Translate("TpaCommand:WrongUsage"), messageColor, messageIcon);
+                var target = UnturnedPlayer.FromName(command[0]);
+
+                if (target == null)
+                {
+                    Say(caller, plugin.Translate("TpaCommand:WrongUsage:NotFound", command[0]), messageColor,
+                        messageIcon);
+                    return;
+                }
+
+                teleportsManager.Send(player, target);
             }
         }
 
@@ -66,8 +76,11 @@ private void Say(IRocketPlayer rocketPlayer, string message, Color messageColor,
         public AllowedCaller AllowedCaller => AllowedCaller.Player;
         public string Name => "tpa";
         public string Help => "Send, accept, deny and cancel teleport requests";
-        public string Syntax => "<accept|send|cancel|list>";
-        public List<string> Aliases => new List<string>();
+        public string Syntax => "<playerName|accept|send|cancel|list>";
+        public List<string> Aliases => new List<string>()
+        {
+            "tpr"
+        };
         public List<string> Permissions => new List<string>();
     }
 }
diff --git a/Feli.RocketMod.Teleporting/Plugin.cs b/Feli.RocketMod.Teleporting/Plugin.cs
@@ -38,7 +38,7 @@ protected override void Unload()
 
         public override TranslationList DefaultTranslations => new TranslationList()
         {
-            {"TpaCommand:WrongUsage", "Correct command usage: /tpa <accept|send|cancel|list>"},
+            {"TpaCommand:WrongUsage", "Correct command usage: /tpa <playerName|accept|send|cancel|list>"},
             {"TpaCommand:WrongUsage:Send", "Correct command usage: /tpa send <playerName>"},
             {"TpaCommand:WrongUsage:NotFound", "Player with name {0} was not found"},
             {"TpaCommand:Send:Yourself", "There is no point on sending a tpa request to yourself"},