Skip to content

Commit 47122c4

Browse files
committed
Imrpoved networkedPrefab messages
1 parent b8e1e92 commit 47122c4

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

MLAPI/MonoBehaviours/Core/NetworkedObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private void OnValidate()
1616
{
1717
if(string.IsNullOrEmpty(NetworkedPrefabName))
1818
{
19-
Debug.LogWarning("MLAPI: The networked object " + gameObject.name + " has not been assigned a networkedPrefabName. Setting it to " + gameObject.name);
19+
Debug.LogWarning("MLAPI: The NetworkedObject " + gameObject.name + " does not have a NetworkedPrefabName. It has been set to the gameObject name");
2020
NetworkedPrefabName = gameObject.name;
2121
}
2222
}

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,32 @@ private void OnValidate()
168168
{
169169
if (string.IsNullOrEmpty(NetworkConfig.NetworkedPrefabs[i].name))
170170
{
171-
Debug.LogWarning("MLAPI: The prefab " + NetworkConfig.NetworkedPrefabs[i].prefab.name + " does not have a set NetworkedPrefab name. Setting it to " + NetworkConfig.NetworkedPrefabs[i].prefab.name);
171+
Debug.LogWarning("MLAPI: The NetworkedPrefab " + NetworkConfig.NetworkedPrefabs[i].prefab.name + " does not have a NetworkedPrefabName. It has been set to the gameObject name");
172172
NetworkConfig.NetworkedPrefabs[i].name = NetworkConfig.NetworkedPrefabs[i].prefab.name;
173173
}
174174
}
175175
}
176-
if (!string.IsNullOrEmpty(NetworkConfig.PlayerPrefabName))
176+
if (NetworkConfig.HandleObjectSpawning)
177177
{
178-
NetworkedObject netObject = NetworkConfig.NetworkedPrefabs.Find(x => x.name == NetworkConfig.PlayerPrefabName).prefab.GetComponentInChildren<NetworkedObject>();
179-
if (netObject == null)
178+
if(!string.IsNullOrEmpty(NetworkConfig.PlayerPrefabName))
180179
{
181-
Debug.LogWarning("MLAPI: The player object needs a NetworkedObject component.");
180+
//Handle spawning is on and a prefabName is set
181+
GameObject playerPrefab = null;
182+
for (int i = 0; i < NetworkConfig.NetworkedPrefabs.Count; i++)
183+
{
184+
if (NetworkConfig.NetworkedPrefabs[i].name == NetworkConfig.PlayerPrefabName)
185+
{
186+
playerPrefab = NetworkConfig.NetworkedPrefabs[i].prefab;
187+
break;
188+
}
189+
}
190+
if (playerPrefab == null)
191+
Debug.LogWarning("MLAPI: There is no NetworkedPrefab with the name specified in the PlayerPrefabName");
192+
}
193+
else
194+
{
195+
//Handle spawning but no prefabName is set
196+
Debug.LogWarning("MLAPI: There is no PlayerPrefabName set.");
182197
}
183198
}
184199

0 commit comments

Comments
 (0)