removing client attributes argument (#454)

spatialos · Oct 8, 2018 · 0e0e51c · 0e0e51c
1 parent e342664
commit 0e0e51c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/workers/unity/Assets/Playground/Config/PlayerTemplate.cs b/workers/unity/Assets/Playground/Config/PlayerTemplate.cs
@@ -11,16 +11,9 @@ namespace Playground
 {
     public static class PlayerTemplate
     {
-        public static EntityTemplate CreatePlayerEntityTemplate(string workerId, List<string> clientAttributeSet,
-            Improbable.Vector3f position)
+        public static EntityTemplate CreatePlayerEntityTemplate(string workerId, Improbable.Vector3f position)
         {
-            var clientAttribute = clientAttributeSet.First(attribute => attribute != WorkerUtils.UnityClient);
-
-            if (clientAttribute == null)
-            {
-                throw new InvalidOperationException(
-                    $"Expected an attribute that is not \"{WorkerUtils.UnityClient}\" but none was found.");
-            }
+            var clientAttribute = $"workerId:{workerId}";
 
             var playerInput = PlayerInput.Component.CreateSchemaComponentData(0, 0, false);
             var launcher = Launcher.Component.CreateSchemaComponentData(100, 0);

diff --git a/workers/unity/Packages/com.improbable.gdk.playerlifecycle/Config/PlayerLifecycleConfig.cs b/workers/unity/Packages/com.improbable.gdk.playerlifecycle/Config/PlayerLifecycleConfig.cs
@@ -5,7 +5,6 @@ namespace Improbable.Gdk.PlayerLifecycle
 {
     public delegate EntityTemplate GetPlayerEntityTemplateDelegate(
         string clientWorkerId,
-        List<string> clientAttributeSet,
         Vector3f position);
 
     public static class PlayerLifecycleConfig

diff --git a/....improbable.gdk.playerlifecycle/Systems/PlayerCreation/HandleCreatePlayerRequestSystem.cs b/....improbable.gdk.playerlifecycle/Systems/PlayerCreation/HandleCreatePlayerRequestSystem.cs
@@ -50,7 +50,7 @@ protected override void OnUpdate()
                     }
 
                     var playerEntity = PlayerLifecycleConfig.CreatePlayerEntityTemplate(request.CallerWorkerId,
-                        request.CallerAttributeSet, request.Payload.Position);
+                        request.Payload.Position);
                     createEntitySender.RequestsToSend.Add(WorldCommands.CreateEntity.CreateRequest
                     (
                         playerEntity,