Changeset 253 for binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs

Timestamp:

Dec 12, 2015, 4:08:53 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_10

File:

• binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs (modified) (5 diffs)

binary-improvements/AllocsCommands/Commands/TeleportPlayer.cs

@@ -16 +16 @@
                                 "  3. teleportplayer <inc x> <inc y> <inc z>\n" +
                                 "1. Teleports the player given by his SteamID, player name or entity id (as given by e.g. \"lpi\")\n" +
-                                "   to the specified location\n" +
+                                "   to the specified location. Use y = -1 to spawn on ground.\n" +
                                 "2. As 1, but destination given by another player which has to be online\n" +
                                 "3. Teleport the local player to the position calculated by his current position and the given offsets";
@@ -33 +33 @@
                                         ClientInfo ci1 = null;
                                         EntityPlayer ep1 = null;
+                                        UnityEngine.Vector3 destPos;
  
                                         if (_params.Count == 2 || _params.Count == 4) {
@@ -56 +57 @@
                                                         }
 
-                                                        ep1.position.x = x;
-                                                        ep1.position.y = y;
-                                                        ep1.position.z = z;
+                                                        destPos.x = x;
+                                                        destPos.y = y;
+                                                        destPos.z = z;
                                                 } else if (_params.Count == 2) {
                                                         ClientInfo ci2 = ConsoleHelper.ParseParamIdOrName (_params [1]);
@@ -67 +68 @@
                                                         EntityPlayer ep2 = GameManager.Instance.World.Players.dict [ci2.entityId];
 
-                                                        ep1.position = ep2.GetPosition ();
-                                                        ep1.position.y += 1;
-                                                        ep1.position.z += 1;
+                                                        destPos = ep2.GetPosition ();
+                                                        destPos.y += 1;
+                                                        destPos.z += 1;
                                                 }
                                         } else if (_params.Count == 3) {
                                                 if (_senderInfo.RemoteClientInfo == null) {
-                                                        SdtdConsole.Instance.Output ("This command can only be executed on the in-game console.");
+                                                        SdtdConsole.Instance.Output ("This command can only be executed in variant 3 on the in-game console.");
                                                         return;
                                                 }
@@ -93 +94 @@
                                                 }
 
-                                                ep1.position.x = ep1.position.x + x;
-                                                ep1.position.y = ep1.position.y + y;
-                                                ep1.position.z = ep1.position.z + z;
+                                                destPos.x = ep1.position.x + x;
+                                                destPos.y = ep1.position.y + y;
+                                                destPos.z = ep1.position.z + z;
                                         }
 
-                                        NetPackageEntityTeleport pkg = new NetPackageEntityTeleport (ep1);
+                                        NetPackageTeleportPlayer pkg = new NetPackageTeleportPlayer (destPos);
 
                                         ci1.SendPackage (pkg);