From 457531910294897c15cdfbc5337672d138c0ef1d Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Sun, 17 Jun 2018 17:56:46 +0900
Subject: [PATCH] Privatise the proxied content

---
 .../Objects/Drawables/DrawableTaikoHitObject.cs | 17 +++++++++++------
 osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs    |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
index c07ee3a0fd..e712d62a26 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/DrawableTaikoHitObject.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
     public abstract class DrawableTaikoHitObject : DrawableHitObject<TaikoHitObject>, IKeyBindingHandler<TaikoAction>
     {
         protected readonly Container Content;
-        public readonly Container ProxiedContent;
+        private readonly Container proxiedContent;
 
         private readonly Container nonProxiedContent;
 
@@ -31,12 +31,12 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
                     RelativeSizeAxes = Axes.Both,
                     Child = Content = new Container { RelativeSizeAxes = Axes.Both }
                 },
-                ProxiedContent = new Container { RelativeSizeAxes = Axes.Both }
+                proxiedContent = new Container { RelativeSizeAxes = Axes.Both }
             };
         }
 
         /// <summary>
-        /// <see cref="ProxiedContent"/> is proxied into an upper layer. We don't want to get masked away otherwise <see cref="ProxiedContent"/> would too.
+        /// <see cref="proxiedContent"/> is proxied into an upper layer. We don't want to get masked away otherwise <see cref="proxiedContent"/> would too.
         /// </summary>
         protected override bool ComputeIsMaskedAway(RectangleF maskingBounds) => false;
 
@@ -46,8 +46,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         protected void ProxyContent()
         {
             nonProxiedContent.Remove(Content);
-            ProxiedContent.Remove(Content);
-            ProxiedContent.Add(Content);
+            proxiedContent.Remove(Content);
+            proxiedContent.Add(Content);
         }
 
         /// <summary>
@@ -55,11 +55,16 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables
         /// </summary>
         protected void UnproxyContent()
         {
-            ProxiedContent.Remove(Content);
+            proxiedContent.Remove(Content);
             nonProxiedContent.Remove(Content);
             nonProxiedContent.Add(Content);
         }
 
+        /// <summary>
+        /// Creates a proxy for the content of this <see cref="DrawableTaikoHitObject"/>.
+        /// </summary>
+        public Drawable CreateProxiedContent() => proxiedContent.CreateProxy();
+
         public abstract bool OnPressed(TaikoAction action);
         public virtual bool OnReleased(TaikoAction action) => false;
     }
diff --git a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
index c638f807fe..7fdd3cd1e2 100644
--- a/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
+++ b/osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
@@ -218,7 +218,7 @@ namespace osu.Game.Rulesets.Taiko.UI
 
             var taikoObject = h as DrawableTaikoHitObject;
             if (taikoObject != null)
-                topLevelHitContainer.Add(taikoObject.ProxiedContent.CreateProxy());
+                topLevelHitContainer.Add(taikoObject.CreateProxiedContent());
         }
 
         internal void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)