From f18b5a3c02ff44dd78db54fc9eae2f2c4979fac0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Aug 2019 13:27:44 +0900
Subject: [PATCH] Remove "AllowCreate" function by instead handling nulls

---
 .../Sections/Beatmaps/PaginatedBeatmapContainer.cs | 14 +++++++-------
 .../Profile/Sections/PaginatedContainer.cs         |  9 +--------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
index 0b424057ae..fe6822440f 100644
--- a/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/Beatmaps/PaginatedBeatmapContainer.cs
@@ -31,12 +31,12 @@ namespace osu.Game.Overlays.Profile.Sections.Beatmaps
         protected override APIRequest<List<APIBeatmapSet>> CreateRequest() =>
             new GetUserBeatmapsRequest(User.Value.Id, type, VisiblePages++, ItemsPerPage);
 
-        protected override bool AllowCreate(APIBeatmapSet item) => item.OnlineBeatmapSetID.HasValue;
-
-        protected override Drawable CreateDrawableItem(APIBeatmapSet item) => new DirectGridPanel(item.ToBeatmapSet(Rulesets))
-        {
-            Anchor = Anchor.TopCentre,
-            Origin = Anchor.TopCentre,
-        };
+        protected override Drawable CreateDrawableItem(APIBeatmapSet item) => !item.OnlineBeatmapSetID.HasValue
+            ? null
+            : new DirectGridPanel(item.ToBeatmapSet(Rulesets))
+            {
+                Anchor = Anchor.TopCentre,
+                Origin = Anchor.TopCentre,
+            };
     }
 }
diff --git a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
index a3a22d6248..4a10946ec2 100644
--- a/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
+++ b/osu.Game/Overlays/Profile/Sections/PaginatedContainer.cs
@@ -116,7 +116,7 @@ namespace osu.Game.Overlays.Profile.Sections
                     return;
                 }
 
-                LoadComponentsAsync(items.Where(AllowCreate).Select(CreateDrawableItem), drawables =>
+                LoadComponentsAsync(items.Select(CreateDrawableItem).Where(d => d != null), drawables =>
                 {
                     missingText.Hide();
                     moreButton.FadeTo(items.Count == ItemsPerPage ? 1 : 0);
@@ -127,13 +127,6 @@ namespace osu.Game.Overlays.Profile.Sections
             });
         }
 
-        /// <summary>
-        /// Used to check whether the item is suitable for drawable creation.
-        /// </summary>
-        /// <param name="item">An item to check</param>
-        /// <returns></returns>
-        protected virtual bool AllowCreate(T item) => true;
-
         protected abstract APIRequest<List<T>> CreateRequest();
 
         protected abstract Drawable CreateDrawableItem(T item);