From 9a77005d2e443aff2b5c3edf2b94841f6bc713b6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 12 Jan 2018 14:26:23 +0900
Subject: [PATCH] Make sure unimplemented auto mods aren't consumable

---
 osu.Game.Rulesets.Catch/CatchRuleset.cs |  3 ++-
 osu.Game/Rulesets/Mods/ModAutoplay.cs   | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/CatchRuleset.cs b/osu.Game.Rulesets.Catch/CatchRuleset.cs
index 37525470c2..0d52046485 100644
--- a/osu.Game.Rulesets.Catch/CatchRuleset.cs
+++ b/osu.Game.Rulesets.Catch/CatchRuleset.cs
@@ -10,6 +10,7 @@ using osu.Game.Rulesets.UI;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
+using osu.Game.Rulesets.Catch.Objects;
 
 namespace osu.Game.Rulesets.Catch
 {
@@ -80,7 +81,7 @@ namespace osu.Game.Rulesets.Catch
                         {
                             Mods = new Mod[]
                             {
-                                new ModAutoplay(),
+                                new ModAutoplay<CatchHitObject>(),
                                 new ModCinema(),
                             },
                         },
diff --git a/osu.Game/Rulesets/Mods/ModAutoplay.cs b/osu.Game/Rulesets/Mods/ModAutoplay.cs
index e8f5bb4740..a0752acb1a 100644
--- a/osu.Game/Rulesets/Mods/ModAutoplay.cs
+++ b/osu.Game/Rulesets/Mods/ModAutoplay.cs
@@ -5,23 +5,25 @@ using System;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Replays;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Mods
 {
-    public abstract class ModAutoplay<T> : ModAutoplay, IApplicableToRulesetContainer<T>
+    public class ModAutoplay<T> : ModAutoplay, IApplicableToRulesetContainer<T>, IApplicableFailOverride
         where T : HitObject
     {
-        protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
+        protected virtual Score CreateReplayScore(Beatmap<T> beatmap) => new Score { Replay = new Replay() };
 
-        public virtual void ApplyToRulesetContainer(RulesetContainer<T> rulesetContainer)
-        {
-            rulesetContainer.SetReplay(CreateReplayScore(rulesetContainer.Beatmap)?.Replay);
-        }
+        public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
+
+        public bool AllowFail => false;
+
+        public virtual void ApplyToRulesetContainer(RulesetContainer<T> rulesetContainer) => rulesetContainer.SetReplay(CreateReplayScore(rulesetContainer.Beatmap)?.Replay);
     }
 
-    public class ModAutoplay : Mod, IApplicableFailOverride
+    public abstract class ModAutoplay : Mod
     {
         public override string Name => "Autoplay";
         public override string ShortenedName => "AT";
@@ -29,6 +31,5 @@ namespace osu.Game.Rulesets.Mods
         public override string Description => "Watch a perfect automated play through the song";
         public override double ScoreMultiplier => 0;
         public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
-        public bool AllowFail => false;
     }
 }