Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

because all wrecks / cans that open now do so initially in the same w…

…indow we should not 'proceed to the next wreck' until the secondary window is open and ready.
  • Loading branch information...
commit 66f4d20d21471ba61614b604ae60fb003bf28be8 1 parent 95c9fce
@ISeeDEDPpl authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 Questor.Modules/BackgroundTasks/Salvage.cs
View
14 Questor.Modules/BackgroundTasks/Salvage.cs
@@ -329,7 +329,7 @@ private void LootWrecks()
{
// The window is not ready, then continue
if (!window.IsReady || window.currInvIdItem == 0)
- continue;
+ return;
// Get the container entity
EntityCache containerEntity = Cache.Instance.EntityById(window.currInvIdItem);
@@ -369,7 +369,7 @@ private void LootWrecks()
Logging.Log("Salvage", "Closing loot window [" + window.ItemId + "]", Logging.white);
}
window.Close();
- continue;
+ return;
}
//if (freeCargoCapacity < 1000) //this should allow BSs to dump scrapmetal but haulers and noctus' to hold onto it
@@ -531,7 +531,7 @@ private void LootWrecks()
if (window != null)
{
if (Settings.Instance.DebugLootWrecks) Logging.Log("Salvage.LootWrecks", "We have already looted [" + containerEntity.Id + "]", Logging.white);
- continue;
+ return;
}
// Ignore open request within 10 seconds
@@ -561,13 +561,13 @@ private void LootWrecks()
{
containerEntity.OpenCargo();
Cache.Instance.NextLootAction = DateTime.Now.AddMilliseconds((int)Time.LootingDelay_milliseconds);
- continue;
+ return;
}
if (!Cache.Instance.ContainerInSpace.Window.IsReady)
{
if (Settings.Instance.DebugLootWrecks) Logging.Log("Salvage", "LootWrecks: Cache.Instance.ContainerInSpace.Window is not ready", Logging.white);
- continue;
+ return;
}
if (Cache.Instance.ContainerInSpace.Window.IsReady)
@@ -577,11 +577,11 @@ private void LootWrecks()
{
if (Settings.Instance.DebugLootWrecks) Logging.Log("Salvage", "LootWrecks: Cache.Instance.ContainerInSpace.Window is not yet a secondarywindow", Logging.white);
Cache.Instance.ContainerInSpace.Window.OpenAsSecondary();
- continue;
+ return;
}
OpenedContainers[containerEntity.Id] = DateTime.Now;
Cache.Instance.NextLootAction = DateTime.Now.AddMilliseconds((int)Time.LootingDelay_milliseconds);
- continue;
+ return;
}
return;
}
Please sign in to comment.
Something went wrong with that request. Please try again.