From 4a4c01f2215f59be580e112c01919a412589f0a2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 11 Oct 2017 20:51:16 +0900
Subject: [PATCH] Fix CI problems

---
 .../Objects/Drawable/DrawableDroplet.cs                    | 1 -
 .../Objects/Drawable/DrawableJuiceStream.cs                | 1 -
 osu.Game.Rulesets.Catch/Objects/JuiceStream.cs             | 7 ++-----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index fd48f11a3f..2b2a8e7f8d 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -5,7 +5,6 @@
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Catch.Objects.Drawable.Pieces;
 using OpenTK;
-using OpenTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
 {
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
index 19abf243b3..afda91d0b4 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableJuiceStream.cs
@@ -4,7 +4,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using OpenTK;
-using OpenTK.Graphics;
 using osu.Game.Rulesets.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Objects.Drawable
diff --git a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
index 957a6e69ea..f49799970d 100644
--- a/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
+++ b/osu.Game.Rulesets.Catch/Objects/JuiceStream.cs
@@ -12,7 +12,6 @@
 using osu.Game.Rulesets.Objects.Types;
 using OpenTK;
 using osu.Framework.Lists;
-using OpenTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Objects
 {
@@ -66,8 +65,6 @@ public IEnumerable<CatchBaseHit> Ticks
                     X = X
                 });
 
-                double lastTickTime = StartTime;
-
                 for (var repeat = 0; repeat < RepeatCount; repeat++)
                 {
                     var repeatStartTime = StartTime + repeat * repeatDuration;
@@ -81,7 +78,7 @@ public IEnumerable<CatchBaseHit> Ticks
                         var timeProgress = d / length;
                         var distanceProgress = reversed ? 1 - timeProgress : timeProgress;
 
-                        lastTickTime = repeatStartTime + timeProgress * repeatDuration;
+                        var lastTickTime = repeatStartTime + timeProgress * repeatDuration;
                         ticks.Add(new Droplet
                         {
                             StartTime = lastTickTime,
@@ -96,7 +93,7 @@ public IEnumerable<CatchBaseHit> Ticks
                         });
                     }
 
-                    double tinyTickInterval = (tickDistance / length) * repeatDuration;
+                    double tinyTickInterval = tickDistance / length * repeatDuration;
                     while (tinyTickInterval > 100)
                         tinyTickInterval /= 2;