Skip to content

Fix VTR viewed-map flush after reload #956

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

Open
MhaWay wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix VTR viewed-map flush after reload #956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a6aaa5
Fix VTR viewed-map flush after reload
MhaWay Jun 28, 2026
9a576d1
Set prev and current map id if invalid
MhaWay Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions Source/Client/Patches/VTRSyncPatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ static bool Prefix(Thing thing, ref int __result)
if (Multiplayer.Client == null)
return true;

VTRSync.FlushPendingViewedMapUpdate();

// Keep the synchronized update rate until animation timing can be
// brought back in line with the vanilla value.
__result = VTRSync.GetSynchronizedUpdateRate(thing);
Expand Down Expand Up @@ -55,18 +57,48 @@ static class VTRSync
public const int InvalidMapId = -1;
public static int lastMovedToMapId = InvalidMapId;
public static int lastSentAtTick = -1;
private static int pendingPreviousMapId = InvalidMapId;
private static int pendingCurrentMapId = InvalidMapId;

// Vtr rates
public const int MaximumVtr = 15;
public const int MinimumVtr = 1;

public static int GetSynchronizedUpdateRate(Thing thing) => thing?.MapHeld?.AsyncTime()?.VTR ?? MaximumVtr;

public static void FlushPendingViewedMapUpdate()
{
if (Multiplayer.reloading)
return;

if (pendingPreviousMapId == InvalidMapId && pendingCurrentMapId == InvalidMapId)
return;

int previous = pendingPreviousMapId;
int current = pendingCurrentMapId;
pendingPreviousMapId = InvalidMapId;
pendingCurrentMapId = InvalidMapId;

SendViewedMapUpdateCore(previous, current);
}

public static void SendViewedMapUpdate(int previous, int current)
{
if (Multiplayer.reloading)
{
if (pendingPreviousMapId == InvalidMapId && pendingCurrentMapId == InvalidMapId)
pendingPreviousMapId = previous;
pendingCurrentMapId = current;
return;
}

FlushPendingViewedMapUpdate();

SendViewedMapUpdateCore(previous, current);
}

private static void SendViewedMapUpdateCore(int previous, int current)
{
string warn = string.Empty;
if (previous != lastMovedToMapId)
warn = $" mismatch between expected previous map {previous} and last moved to map {lastMovedToMapId}";
Expand All @@ -81,6 +113,8 @@ public static void Reset()
{
lastMovedToMapId = InvalidMapId;
lastSentAtTick = -1;
pendingPreviousMapId = InvalidMapId;
pendingCurrentMapId = InvalidMapId;
}
}

Expand All @@ -91,6 +125,8 @@ static void Prefix(Map value)
{
if (Multiplayer.Client == null) return;

VTRSync.FlushPendingViewedMapUpdate();

try
{
// WorldRenderModePatch will handle it
Expand Down Expand Up @@ -133,6 +169,8 @@ static void Postfix(WorldRenderMode __result)
{
if (Multiplayer.Client == null) return;

VTRSync.FlushPendingViewedMapUpdate();

try
{
// Detect transition to world map (Planet mode)
Expand Down
Loading