From 29941019a56d11821ab921e368049fba47b96fe9 Mon Sep 17 00:00:00 2001 From: smoogipooo Date: Wed, 6 Sep 2017 17:44:51 +0900 Subject: [PATCH] Hacky way to make osu! and taiko work again. --- osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs | 2 +- osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs | 2 +- osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs index 6870916b5b..9faecadbf1 100644 --- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs +++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs @@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables UpdatePreemptState(); - var offset = Time.Current - ((HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime); + var offset = !AllJudged ? 0 : Time.Current - ((HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime); using (BeginDelayedSequence(TIME_PREEMPT + offset, true)) UpdateCurrentState(state); } diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs index 675fa7be33..55eaa8dbb8 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableHit.cs @@ -69,7 +69,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables var circlePiece = MainPiece as CirclePiece; circlePiece?.FlashBox.FinishTransforms(); - var offset = Time.Current - HitObject.StartTime; + var offset = !AllJudged ? 0 : Time.Current - HitObject.StartTime; using (BeginDelayedSequence(HitObject.StartTime - Time.Current + offset, true)) { switch (State) diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs index 9c6fb1ec3d..ab13478286 100644 --- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs +++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableSwell.cs @@ -172,7 +172,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables const float preempt = 100; const float out_transition_time = 300; - var offset = Time.Current - HitObject.EndTime; + var offset = !AllJudged ? 0 : Time.Current - HitObject.EndTime; double untilStartTime = HitObject.StartTime - Time.Current; double untilJudgement = untilStartTime + offset + HitObject.Duration;