From 626b16dbaeeb40594303fa49ad473d37684eb9b1 Mon Sep 17 00:00:00 2001
From: Gene Walters <genewalt@amazon.com>
Date: Tue, 18 Jan 2022 10:27:10 -0800
Subject: [PATCH] Updating NetworkingSpawnableLibrary to only store network
 spawnables, instead of all spawnables

Signed-off-by: Gene Walters <genewalt@amazon.com>
---
 .../Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp  | 4 ++--
 .../Code/Source/NetworkEntity/NetworkSpawnableLibrary.h    | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
index f60778dbb4..7fb7bfdc39 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.cpp
@@ -10,7 +10,6 @@
 #include <AzCore/Asset/AssetManagerBus.h>
 #include <AzCore/Component/ComponentApplicationLifecycle.h>
 #include <AzFramework/Spawnable/Spawnable.h>
-#include <AzCore/StringFunc/StringFunc.h>
 #include <AzCore/Interface/Interface.h>
 
 namespace Multiplayer
@@ -42,7 +41,8 @@ namespace Multiplayer
 
         auto enumerateCallback = [this](const AZ::Data::AssetId id, const AZ::Data::AssetInfo& info)
         {
-            if (info.m_assetType == AZ::AzTypeInfo<AzFramework::Spawnable>::Uuid())
+            if (info.m_assetType == AZ::AzTypeInfo<AzFramework::Spawnable>::Uuid() &&
+                info.m_relativePath.ends_with(".network.spawnable"))
             {
                 ProcessSpawnableAsset(info.m_relativePath, id);
             }
diff --git a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h
index 0fc3ae07cc..469086f4cb 100644
--- a/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h
+++ b/Gems/Multiplayer/Code/Source/NetworkEntity/NetworkSpawnableLibrary.h
@@ -23,12 +23,15 @@ namespace Multiplayer
         NetworkSpawnableLibrary();
         ~NetworkSpawnableLibrary();
 
-        /// INetworkSpawnableLibrary overrides.
+        //! INetworkSpawnableLibrary overrides.
+        //! @{
+        // Iterates over all assets (on-disk and in-memory) and stores any spawnables that are "network.spawnables"
+        // This allows us to look up network spawnable assets by name or id for later use
         void BuildSpawnablesList() override;
         void ProcessSpawnableAsset(const AZStd::string& relativePath, AZ::Data::AssetId id) override;
         AZ::Name GetSpawnableNameFromAssetId(AZ::Data::AssetId assetId) override;
         AZ::Data::AssetId GetAssetIdByName(AZ::Name name) override;
-
+        //! @}
 
     private:
         AZStd::unordered_map<AZ::Name, AZ::Data::AssetId> m_spawnables;