Skip to content

OnStart Trigger Fix #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jimmacle merged 7 commits into from
Apr 2, 2019
Merged

OnStart Trigger Fix #101

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6fe0697
OnStart Trigger Fix
N1Ran Mar 31, 2019
f1821d7
OnStart Trigger Fix
N1Ran Mar 31, 2019
12c213d
Revert "OnStart Trigger Fix"
N1Ran Mar 31, 2019
a7fb649
OnStart to wait one minute in attempt to catch session load. Only wo…
N1Ran Mar 31, 2019
16a3bb3
OnStart fix updated
N1Ran Mar 31, 2019
0b7a0f7
Added Null check to GpssField to keep from throwing exception. Likel…
N1Ran Mar 31, 2019
2d3df8e
Actually fix GPS cleaning
Jimmacle Apr 2, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added Null check to GpssField to keep from throwing exception. Likely… 
… needs to be redone to make fully funtional.
  • Loading branch information
@N1Ran
N1Ran committed Mar 31, 2019
commit 0b7a0f74eea91607d03b47234a7eb2096a82b661
25 changes: 15 additions & 10 deletions Essentials/Commands/WorldModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,7 @@ private static int FixBlockOwnership()
return count;
}

private static readonly FieldInfo GpssField = typeof(MySession).GetField("Gpss", BindingFlags.NonPublic | BindingFlags.Instance);
private static readonly FieldInfo GpsDicField = GpssField.FieldType.GetField("m_playerGpss", BindingFlags.NonPublic | BindingFlags.Instance);
private static FieldInfo GpssField = typeof(MySession).GetField("Gpss", BindingFlags.NonPublic | BindingFlags.Instance);
private static readonly FieldInfo SeedParamField = typeof(MyProceduralWorldGenerator).GetField("m_existingObjectsSeeds", BindingFlags.NonPublic | BindingFlags.Instance);

private static readonly FieldInfo CamerasField = typeof(MySession).GetField("Cameras", BindingFlags.NonPublic | BindingFlags.Instance);
Expand Down Expand Up @@ -321,16 +320,22 @@ public void CleanSandbox()
count += CleanFaction_Internal();

//Keen, for the love of god why is everything about GPS internal.
var playerGpss = GpsDicField.GetValue(GpssField.GetValue(MySession.Static)) as Dictionary<long, Dictionary<int, MyGps>>;

foreach (var id in playerGpss.Keys)
if (GpssField != null)
{
if (!validIdentities.Contains(id))
idCache.Add(id);
}
var GpsDicField = GpssField.FieldType.GetField("m_playerGpss", BindingFlags.NonPublic | BindingFlags.Instance);

foreach (var id in idCache)
playerGpss.Remove(id);
var playerGpss =
GpsDicField?.GetValue(GpssField?.GetValue(MySession.Static)) as
Dictionary<long, Dictionary<int, MyGps>>;
foreach (var id in playerGpss.Keys)
{
if (!validIdentities.Contains(id))
idCache.Add(id);
}

foreach (var id in idCache)
playerGpss.Remove(id);
}

count += idCache.Count;
idCache.Clear();
Expand Down