Skip to content

Commit 6226504

Browse files
authored
Merge pull request #3580 from ikemen-engine/fix2
fix: delay netplay sync error during Turns swaps
2 parents eb4f8b2 + e18afe9 commit 6226504

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/system.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3623,7 +3623,13 @@ func (s *System) runMatch() (reload bool) {
36233623
s.esc = true
36243624
}
36253625
if s.netConnection != nil {
3626-
defer s.netConnection.Stop()
3626+
defer func() {
3627+
// Keep delay-netplay alive across Turns character swaps;
3628+
// stopping here can desync nc.time before the next Synchronize().
3629+
if s.matchOver() || s.esc || s.endMatch || s.gameEnd || s.fightLoopEnd {
3630+
s.netConnection.Stop()
3631+
}
3632+
}()
36273633
}
36283634

36293635
// Setup characters

0 commit comments

Comments
 (0)