Added a public static method to DaggerfallMissile allowing external classes to use the appropriate layer mask (and initialize it if it isn't). Applied this new method to the player Touch targeting check in EntityEffectsManager.CastReadySpell to completely prevent self-targeting with Touch spells.

Author: RedRoryOTheGlen

Assets/Scripts/Game/DaggerfallMissile.cs

@@ -430,6 +430,19 @@ public static DaggerfallEntityBehaviour GetEntityTargetInTouchRange(Vector3 aimP
             return null;
         }
 
+        //allow other classes to use the layer masks
+        public static int GetLayerMask(bool player)
+        {
+            //Initialize the layer masks if they're still not
+            if (layerMaskDefault == -1)
+                InitializeLayerMasks();
+
+            if (player)
+                return layerMaskPlayer;
+
+            return layerMaskDefault;
+        }
+
         #endregion
 
         #region Private Methods

Assets/Scripts/Game/MagicAndEffects/EntityEffectManager.cs

@@ -414,7 +414,7 @@ public void CastReadySpell()
             {
                 Vector3 aimPosition = GameManager.Instance.MainCamera.transform.position;
                 Vector3 aimDirection = GameManager.Instance.MainCamera.transform.forward;
-                if (DaggerfallMissile.GetEntityTargetInTouchRange(aimPosition, aimDirection) == null)
+                if (DaggerfallMissile.GetEntityTargetInTouchRange(aimPosition, aimDirection, DaggerfallMissile.GetLayerMask(true)) == null)
                 {
                     //Debug.Log("Target entity not in range for touch spell.");
                     return;