diff --git a/Assets/LIN/DailyRoutine/InteractionController.cs b/Assets/LIN/DailyRoutine/InteractionController.cs index 1d40025b..beb1dc86 100644 --- a/Assets/LIN/DailyRoutine/InteractionController.cs +++ b/Assets/LIN/DailyRoutine/InteractionController.cs @@ -19,7 +19,10 @@ public class InteractionController : MonoBehaviour if (interactionLayerMask == (interactionLayerMask | (1 << other.gameObject.layer))) { ActionType interactionType = other.gameObject.GetComponent().RoutineEnter(); - PopActionOnScreen(interactionType); + if( interactionType != null ) + { + PopActionOnScreen(interactionType); + } } } @@ -91,6 +94,8 @@ public class InteractionController : MonoBehaviour } }); break; + default: + break; } } }