BFA Update (still lots of testing to do tho)

Source/Game/Maps/GridNotifiers.cs

@@ -663,7 +663,7 @@ namespace Game.Maps
                     //Caster may be NULL if DynObj is in removelist
                     Player caster = Global.ObjAccessor.FindPlayer(guid);
                     if (caster != null)
-                        if (caster.GetGuidValue(PlayerFields.Farsight) == obj.GetGUID())
+                        if (caster.GetGuidValue(ActivePlayerFields.Farsight) == obj.GetGUID())
                             BuildPacket(caster);
                 }
             }

Source/Game/Maps/Instances/InstanceSaveManager.cs

@@ -138,6 +138,13 @@ namespace Game.Maps
             }
         }
 
+        public void UnloadInstanceSave(uint InstanceId)
+        {
+            InstanceSave save = GetInstanceSave(InstanceId);
+            if (save != null)
+                save.UnloadIfEmpty();
+        }
+
         public void LoadInstances()
         {
             uint oldMSTime = Time.GetMSTime();
@@ -711,7 +718,7 @@ namespace Game.Maps
           Global.InstanceSaveMgr.DeleteInstanceFromDB(GetInstanceId());
         }
 
-        bool UnloadIfEmpty()
+        public bool UnloadIfEmpty()
         {
             if (m_playerList.Empty() && m_groupList.Empty())
             {

Source/Game/Maps/Instances/InstanceScript.cs

@@ -317,6 +317,11 @@ namespace Game.Maps
                                 uint resInterval = GetCombatResurrectionChargeInterval();
                                 InitializeCombatResurrections(1, resInterval);
                                 SendEncounterStart(1, 9, resInterval, resInterval);
+
+                                var playerList = instance.GetPlayers();
+                                foreach (var player in playerList)
+                                        if (player.IsAlive())
+                                            player.ProcSkillsAndAuras(null, ProcFlags.EncounterStart, ProcFlags.None, ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.None, ProcFlagsHit.None, null, null, null);
                                 break;
                             }
                         case EncounterState.Fail:

Source/Game/Maps/Map.cs

@@ -132,13 +132,20 @@ namespace Game.Maps
         {
             if (Global.VMapMgr.isMapLoadingEnabled())
             {
-                bool exists = Global.VMapMgr.existsMap(mapid, gx, gy);
-                if (!exists)
+                LoadResult result = Global.VMapMgr.existsMap(mapid, gx, gy);
+                string name = VMapManager.getMapFileName(mapid);
+                switch (result)
                 {
-                    string name = VMapManager.getMapFileName(mapid);
-                    Log.outError(LogFilter.Maps, "VMap file '{0}' is missing or points to wrong version of vmap file. Redo vmaps with latest version of vmap_assembler.exe.",
-                        Global.WorldMgr.GetDataPath() + "vmaps/" + name);
-                    return false;
+                    case LoadResult.Success:
+                        break;
+                    case LoadResult.FileNotFound:
+                        Log.outError(LogFilter.Maps, $"VMap file '{Global.WorldMgr.GetDataPath() + "vmaps/" + name}' does not exist");
+                        Log.outError(LogFilter.Maps, $"Please place VMAP files (*.vmtree and *.vmtile) in the vmap directory ({Global.WorldMgr.GetDataPath() + "vmaps/"}), or correct the DataDir setting in your worldserver.conf file.");
+                        return false;
+                    case LoadResult.VersionMismatch:
+                        Log.outError(LogFilter.Maps, $"VMap file '{Global.WorldMgr.GetDataPath() + "vmaps/" + name}e' couldn't b loaded");
+                        Log.outError(LogFilter.Maps, "This is because the version of the VMap file and the version of this module are different, please re-extract the maps with the tools compiled with this module.");
+                        return false;
                 }
             }
             return true;
@@ -2064,9 +2071,9 @@ namespace Game.Maps
             return 0;
         }
 
-        public bool isInLineOfSight(PhaseShift phaseShift, float x1, float y1, float z1, float x2, float y2, float z2)
+        public bool isInLineOfSight(PhaseShift phaseShift, float x1, float y1, float z1, float x2, float y2, float z2, ModelIgnoreFlags ignoreFlags)
         {
-            return Global.VMapMgr.isInLineOfSight(PhasingHandler.GetTerrainMapId(phaseShift, this, x1, y1), x1, y1, z1, x2, y2, z2)
+            return Global.VMapMgr.isInLineOfSight(PhasingHandler.GetTerrainMapId(phaseShift, this, x1, y1), x1, y1, z1, x2, y2, z2, ignoreFlags)
                    && _dynamicTree.isInLineOfSight(new Vector3(x1, y1, z1), new Vector3(x2, y2, z2), phaseShift);
         }
 
@@ -4597,6 +4604,7 @@ namespace Game.Maps
             base.RemovePlayerFromMap(player, remove);
             // for normal instances schedule the reset after all players have left
             SetResetSchedule(true);
+            Global.InstanceSaveMgr.UnloadInstanceSave(GetInstanceId());
         }
 
         public void CreateInstanceData(bool load)