diff --git a/unity/Assets/Scripts/ArmAgentController.cs b/unity/Assets/Scripts/ArmAgentController.cs index 0c317ade63..f851d2caf9 100644 --- a/unity/Assets/Scripts/ArmAgentController.cs +++ b/unity/Assets/Scripts/ArmAgentController.cs @@ -275,7 +275,7 @@ public override void Teleport( ) { //non-high level agents cannot set standing if(standing != null) { - errorMessage = "Cannot set standing for stretch agent"; + errorMessage = "Cannot set standing for arm/stretch agent"; actionFinishedEmit(success:false, actionReturn:null, errorMessage:errorMessage); return; } @@ -298,7 +298,7 @@ public override void TeleportFull( ) { //non-high level agents cannot set standing if(standing != null) { - errorMessage = "Cannot set standing for stretch agent"; + errorMessage = "Cannot set standing for arm/stretch agent"; actionFinishedEmit(success:false, actionReturn:null, errorMessage:errorMessage); return; } @@ -318,11 +318,6 @@ public override void TeleportFull( // add arm value cases if (!forceAction) { - if (isHandObjectColliding(ignoreAgent: true)) { - throw new InvalidOperationException( - "Cannot teleport due to hand object collision." - ); - } if (Arm != null && Arm.IsArmColliding()) { throw new InvalidOperationException( "Mid Level Arm is actively clipping with some geometry in the environment. TeleportFull fails in this position." diff --git a/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs b/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs index 7e7aa365af..ff3a92003c 100644 --- a/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs +++ b/unity/Assets/Scripts/PhysicsRemoteFPSAgentController.cs @@ -1712,15 +1712,6 @@ public virtual void TeleportFull( "Cannot teleport due to hand object collision." ); } - if (Arm != null && Arm.IsArmColliding()) { - throw new InvalidOperationException( - "Mid Level Arm is actively clipping with some geometry in the environment. TeleportFull fails in this position." - ); - } else if (SArm != null && SArm.IsArmColliding()) { - throw new InvalidOperationException( - "Stretch Arm is actively clipping with some geometry in the environment. TeleportFull fails in this position." - ); - } base.assertTeleportedNearGround(targetPosition: position); } } catch (InvalidOperationException e) {