Merge pull request #105 from mbiddle/origin/master

Add tpto shortcut command and move the return up for destEntity

Author: Jimmacle

Essentials/Commands/PlayerModule.cs

@@ -31,6 +31,12 @@ public void Teleport(string entityToMove, string destination)
         {
             Utilities.TryGetEntityByNameOrId(destination, out IMyEntity destEntity);
 
+            if (destEntity == null)
+            {
+                Context.Respond("Destination entity not found");
+                return;
+            }
+
             IMyEntity targetEntity;
             if (string.IsNullOrEmpty(entityToMove))
                 targetEntity = Context.Player?.Controller.ControlledEntity.Entity;
@@ -43,12 +49,6 @@ public void Teleport(string entityToMove, string destination)
                 return;
             }
 
-            if (destEntity == null)
-            {
-                Context.Respond("Destination entity not found");
-                return;
-            }
-
             var targetPos = MyEntities.FindFreePlace(destEntity.GetPosition(), (float)targetEntity.WorldAABB.Extents.Max());
             if (targetPos == null)
             {
@@ -59,6 +59,13 @@ public void Teleport(string entityToMove, string destination)
             targetEntity.SetPosition(targetPos.Value);
         }
 
+        [Command("tpto", "Teleport directly to an another entity.")]
+        [Permission(MyPromoteLevel.SpaceMaster)]
+        public void TeleportTo(string destination, string entityToMove = null)
+        {
+            Teleport(entityToMove, destination);
+        }
+
         [Command("w", "Send a private message to another player.")]
         [Permission(MyPromoteLevel.None)]
         public void Whisper(string playerName)