From 03ed9bc2be418282b6e0433d6749fb68e7f3e3ac Mon Sep 17 00:00:00 2001
From: MtH <mth@mth.moe>
Date: Mon, 29 Mar 2021 17:01:49 +0200
Subject: [PATCH] resync by BOTH voices and inst also remove unnecessary
 includes in chartingstate

---
 source/ChartingState.hx | 2 --
 source/PlayState.hx     | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/ChartingState.hx b/source/ChartingState.hx
index 1b6fedbf4..49ab32380 100644
--- a/source/ChartingState.hx
+++ b/source/ChartingState.hx
@@ -28,8 +28,6 @@ import haxe.Json;
 import lime.utils.Assets;
 import openfl.events.Event;
 import openfl.events.IOErrorEvent;
-import openfl.events.IOErrorEvent;
-import openfl.events.IOErrorEvent;
 import openfl.media.Sound;
 import openfl.net.FileReference;
 import openfl.utils.ByteArray;
diff --git a/source/PlayState.hx b/source/PlayState.hx
index a31998508..1b6063625 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -2320,7 +2320,7 @@ class PlayState extends MusicBeatState
 	override function stepHit()
 	{
 		super.stepHit();
-		if (FlxG.sound.music.time > Conductor.songPosition + 20 || FlxG.sound.music.time < Conductor.songPosition - 20)
+		if (Math.abs(FlxG.sound.music.time - Conductor.songPosition) > 20 || (SONG.needsVoices && Math.abs(vocals.time - Conductor.songPosition) > 20))
 		{
 			resyncVocals();
 		}