From 3b5e1800aee5fbd5247d8d763de4b373418c1bed Mon Sep 17 00:00:00 2001
From: louishorlaville <louis.horlaville@gmail.com>
Date: Sun, 15 May 2022 13:08:52 -0400
Subject: [PATCH] merge conflicts resolved

---
 Assets/Scripts/DimensionController.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/DimensionController.cs b/Assets/Scripts/DimensionController.cs
index 88188b6..2c3201e 100644
--- a/Assets/Scripts/DimensionController.cs
+++ b/Assets/Scripts/DimensionController.cs
@@ -5,10 +5,9 @@ public class DimensionController : MonoBehaviour
     public const int STARTING_HP = 25;
 
     [SerializeField] private int dimensionId;
-    
     private float _hp;
     private float _maxHp;
-
+    [SerializeField] private LayerMask mask;
     private void Start()
     {
         _maxHp = STARTING_HP;
@@ -30,4 +29,9 @@ public class DimensionController : MonoBehaviour
 
         GameManager.Instance.DealDamage(dimensionId, _hp, _maxHp);
     }
+
+    public int GetDimensionMask()
+    {
+        return mask;
+    }
 }