From eea0660d2140c1e84f63b484f2e89e87a9ec4930 Mon Sep 17 00:00:00 2001
From: karlberg <karlberg@amazon.com>
Date: Wed, 12 May 2021 20:26:08 -0700
Subject: [PATCH] A couple more fixes

---
 .../Code/Include/Multiplayer/RewindableObject.inl           | 4 ++--
 .../Code/Source/AutoGen/AutoComponent_Source.jinja          | 4 ++--
 Gems/Multiplayer/Code/multiplayer_files.cmake               | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gems/Multiplayer/Code/Include/Multiplayer/RewindableObject.inl b/Gems/Multiplayer/Code/Include/Multiplayer/RewindableObject.inl
index 2e67d42ede..20f52ffcb0 100644
--- a/Gems/Multiplayer/Code/Include/Multiplayer/RewindableObject.inl
+++ b/Gems/Multiplayer/Code/Include/Multiplayer/RewindableObject.inl
@@ -47,7 +47,7 @@ namespace Multiplayer
     template <typename BASE_TYPE, AZStd::size_t REWIND_SIZE>
     inline RewindableObject<BASE_TYPE, REWIND_SIZE> &RewindableObject<BASE_TYPE, REWIND_SIZE>::operator =(const RewindableObject<BASE_TYPE, REWIND_SIZE>& rhs)
     {
-        INetworkTime* networkTime = GetNetworkTime();
+        INetworkTime* networkTime = Multiplayer::GetNetworkTime();
         SetValueForTime(rhs.GetValueForTime(networkTime->GetHostFrameId()), GetCurrentTimeForProperty());
         return *this;
     }
@@ -115,7 +115,7 @@ namespace Multiplayer
     template <typename BASE_TYPE, AZStd::size_t REWIND_SIZE>
     inline HostFrameId RewindableObject<BASE_TYPE, REWIND_SIZE>::GetCurrentTimeForProperty() const
     {
-        INetworkTime* networkTime = GetNetworkTime();
+        INetworkTime* networkTime = Multiplayer::GetNetworkTime();
         return networkTime->GetHostFrameIdForRewindingConnection(m_owningConnectionId);
     }
 
diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
index 1bc6dc3994..200d38910b 100644
--- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
+++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja
@@ -1143,7 +1143,7 @@ namespace {{ Component.attrib['Namespace'] }}
             {
                 editContext->Class<{{ ComponentBaseName }}>("{{ ComponentBaseName }}", "{{ Component.attrib['Description'] }}")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Category, "Multiplayer")
+                    ->Attribute(AZ::Edit::Attributes::Category, "{{ Component.attrib['Namespace'] }}")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     {{ DefineNetworkPropertyEditReflection(Component, 'Authority', 'Authority', ComponentBaseName)|indent(20) -}}
 {{ DefineNetworkPropertyEditReflection(Component, 'Authority', 'Server', ComponentBaseName)|indent(20) -}}
@@ -1155,7 +1155,7 @@ namespace {{ Component.attrib['Namespace'] }}
 
                 editContext->Class<{{ ComponentName }}>("{{ ComponentName }}", "{{ Component.attrib['Description'] }}")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::Category, "Multiplayer")
+                    ->Attribute(AZ::Edit::Attributes::Category, "{{ Component.attrib['Namespace'] }}")
                     ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
 {% endif %}
             }
diff --git a/Gems/Multiplayer/Code/multiplayer_files.cmake b/Gems/Multiplayer/Code/multiplayer_files.cmake
index bea88af10c..5eba7dd144 100644
--- a/Gems/Multiplayer/Code/multiplayer_files.cmake
+++ b/Gems/Multiplayer/Code/multiplayer_files.cmake
@@ -24,12 +24,12 @@ set(FILES
     Include/Multiplayer/MultiplayerStats.h
     Include/Multiplayer/MultiplayerTypes.h
     Include/Multiplayer/NetBindComponent.h
-	Include/Multiplayer/NetworkEntityRpcMessage.h
+    Include/Multiplayer/NetworkEntityRpcMessage.h
     Include/Multiplayer/NetworkEntityUpdateMessage.h
     Include/Multiplayer/NetworkEntityHandle.h
     Include/Multiplayer/NetworkEntityHandle.inl
     Include/Multiplayer/NetworkInput.h
-	Include/Multiplayer/ReplicationRecord.h
+    Include/Multiplayer/ReplicationRecord.h
     Include/Multiplayer/RewindableObject.h
     Include/Multiplayer/RewindableObject.inl
     Source/Multiplayer_precompiled.cpp
@@ -48,7 +48,7 @@ set(FILES
     Source/Components/LocalPredictionPlayerInputComponent.h
     Source/Components/MultiplayerComponent.cpp
     Source/Components/MultiplayerController.cpp
-	Source/Components/MultiplayerComponentRegistry.cpp
+    Source/Components/MultiplayerComponentRegistry.cpp
     Source/Components/NetBindComponent.cpp
     Source/Components/NetworkTransformComponent.cpp
     Source/Components/NetworkTransformComponent.h