change passability to a more dynamic model AscensionGameDev#2660 (AscensionGameDev#2662)

* change passability to a more dynamic model AscensionGameDev#2660

* return the right value in Player.CanPassPlayer

---------

Co-authored-by: WeylonSantana <[email protected]>

Author: pandinocoder

Framework/Intersect.Framework.Core/Config/PassabilityOptions.cs

@@ -1,60 +1,17 @@
-using Newtonsoft.Json;
+using Intersect.Framework.Core.GameObjects.Maps;
 
 namespace Intersect.Config;
 
-public partial class PassabilityOptions
+public partial class PassabilityOptions : Dictionary<MapZone, bool>
 {
-    private bool[]? _cache;
-    private bool _arena;
-    private bool _normal;
-    private bool _safe = true;
+    public bool Default { get; set; } = false;
 
-    public bool Arena
+    public PassabilityOptions()
     {
-        get => _arena;
-        set
-        {
-            if (value == _arena)
-            {
-                return;
-            }
-
-            _arena = value;
-            _cache = null;
-        }
-    }
-
-    //Can players move through each other on the following map types/moralities
-    public bool Normal
-    {
-        get => _normal;
-        set
-        {
-            if (value == _arena)
-            {
-                return;
-            }
-
-            _normal = value;
-            _cache = null;
-        }
-    }
-
-    public bool Safe
-    {
-        get => _safe;
-        set
-        {
-            if (value == _arena)
-            {
-                return;
-            }
-
-            _safe = value;
-            _cache = null;
-        }
+        this[MapZone.Arena] = false;
+        this[MapZone.Normal] = false;
+        this[MapZone.Safe] = true;
     }
 
-    [JsonIgnore]
-    public bool[] Passable => _cache ??= [Normal, Safe, Arena];
+    public bool IsPassable(MapZone mapZoneType) => TryGetValue(mapZoneType, out var passable) ? passable : Default;
 }

Intersect.Client.Core/Entities/Entity.cs

@@ -2523,9 +2523,9 @@ public int IsTileBlocked(
                                     break;
 
                                 case Player player:
-                                    //Return the entity key as this should block the player.  Only exception is if the MapZone this entity is on is passable.
-                                    var entityMap = Maps.MapInstance.Get(player.MapId);
-                                    if (Options.Instance.Passability.Passable[(int)entityMap.ZoneType])
+                                    // Return the entity key as this should block the player.  Only exception is if the MapZone this entity is on is passable.
+                                    if (Maps.MapInstance.TryGet(player.MapId, out var playerMapInstance) &&
+                                        Options.Instance.Passability.IsPassable(playerMapInstance.ZoneType))
                                     {
                                         continue;
                                     }

Intersect.Server.Core/Entities/Player.cs

@@ -7298,7 +7298,7 @@ out EntityType entityType
 
     protected override bool CanPassPlayer(MapController targetMap)
     {
-        return Options.Instance.Passability.Passable[(int)targetMap.ZoneType];
+        return Options.Instance.Passability.IsPassable(Map.ZoneType);
     }
 
     protected override bool IsBlockedByEvent(