From 6fd95e0c5286ff4a1f6ac8321b43ba088bcd975c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 May 2017 17:16:01 +0900
Subject: [PATCH] Fix post-merge breakage

---
 osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 07be689446..c5dbc27fd3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -34,11 +34,6 @@ public abstract class DrawableHitObject<TObject, TJudgement> : Container
 
         public TJudgement Judgement;
 
-        /// <summary>
-        /// Whether this hit object has been judged.
-        /// </summary>
-        public virtual bool Judged => (Judgement?.Result ?? HitResult.None) != HitResult.None;
-
         protected abstract TJudgement CreateJudgement();
 
         protected abstract void UpdateState(ArmedState state);
@@ -82,7 +77,7 @@ protected override void LoadComplete()
         /// <summary>
         /// Whether this hit object and all of its nested hit objects have been judged.
         /// </summary>
-        public sealed override bool Judged => base.Judged && (NestedHitObjects?.All(h => h.Judged) ?? true);
+        public bool Judged => (Judgement?.Result ?? HitResult.None) != HitResult.None && (NestedHitObjects?.All(h => h.Judged) ?? true);
 
         protected DrawableHitObject(TObject hitObject)
         {