Merge pull request #1 from ngoedde/add-to-core

Add to core

Application/RSBot/Views/SplashScreen.cs

@@ -186,28 +186,6 @@ private void InitializeBot()
                 MessageBoxButtons.OK, MessageBoxIcon.Error);
 
         CommandManager.Initialize();
-
-        InitializeMap();
-    }
-
-    /// <summary>
-    ///     Initializes the map.
-    /// </summary>
-    private void InitializeMap()
-    {
-        //---- Load Map ----
-        var mapFile = Path.Combine(Kernel.BasePath, "Data", "Game", "map.rsc");
-
-        if (!CollisionManager.Enabled) Log.Warn("[Collision] Collision detection has been deactivated by the user!");
-
-        if (!File.Exists(mapFile))
-        {
-            Log.Error($"[Collisions] Directory {mapFile} not found!");
-
-            return;
-        }
-
-        CollisionManager.Initialize();
     }
 
     /// <summary>

Botbases/RSBot.Default/Bot/Botbase.cs

@@ -47,6 +47,9 @@ public void Reload()
     /// </summary>
     public void Tick()
     {
+        if (!Kernel.Bot.Running)
+            return;
+
         if (Game.Player.HasActiveVehicle)
         {
             Game.Player.Vehicle.Dismount();

Botbases/RSBot.Default/Bundle/Target/TargetBundle.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Diagnostics.SymbolStore;
 using System.Linq;
 using RSBot.Core;
 using RSBot.Core.Components;
@@ -144,14 +145,14 @@ private SpawnedMonster GetNearestEnemy()
         var ignorePillar = PlayerConfig.Get<bool>("RSBot.Training.checkBoxDimensionPillar");
 
         if (!SpawnManager.TryGetEntities<SpawnedMonster>(m =>
-                m.State.LifeState == LifeState.Alive &&
-                !(warlockModeEnabled && m.State.HasTwoDots()) &&
-                m.IsBehindObstacle == false &&
-                _blacklist?.ContainsKey(m.UniqueId) == false &&
-                Container.Bot.Area.IsInSight(m) &&
-                !m.Record.IsPandora &&
-                //m.DistanceToPlayer <= 40 &&
-                !(m.Record.IsDimensionPillar && ignorePillar) &&
+                m.State.LifeState == LifeState.Alive && //Only alive
+                !(warlockModeEnabled && m.State.HasTwoDots()) && //Has two Dots?
+                m.IsBehindObstacle == false && //Is not behind obstacle
+                (_blacklist == null || !_blacklist.ContainsKey(m.UniqueId)) && //Is not blacklisted
+                (m.AttackingPlayer || !Bundles.Avoidance.AvoidMonster(m.Rarity)) && //Is attacking player or shouldn't be avoided
+                Container.Bot.Area.IsInSight(m) && //Is in training area
+                !m.Record.IsPandora && //Isn't pandora box
+                !(m.Record.IsDimensionPillar && ignorePillar) && //Isn't dimension pillar
                 !m.Record.IsSummonFlower, out var entities))
             return default;