Skip to content

Commit 9d555bb

Browse files
TwoTenPvPTwoTenPvP
committed
Fixed casing on NetworkId
1 parent b4ea4bf commit 9d555bb

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎MLAPI-Editor/NetworkedObjectEditor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public override void OnInspectorGUI()
3838
}
3939
else if(networkedObject.isSpawned)
4040
{
41-
EditorGUILayout.LabelField("NetworkId: ", networkedObject.NetworKId.ToString(), EditorStyles.label);
41+
EditorGUILayout.LabelField("NetworkId: ", networkedObject.NetworkId.ToString(), EditorStyles.label);
4242
EditorGUILayout.LabelField("OwnerId: ", networkedObject.OwnerClientId.ToString(), EditorStyles.label);
4343
EditorGUILayout.LabelField("isSpawned: ", networkedObject.isSpawned.ToString(), EditorStyles.label);
4444
EditorGUILayout.LabelField("isLocalPlayer: ", networkedObject.isLocalPlayer.ToString(), EditorStyles.label);

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public NetworkedObject networkedObject
5858
/// <summary>
5959
/// Gets the NetworkId of the NetworkedObject that owns the NetworkedBehaviour instance
6060
/// </summary>
61-
public uint networkId => networkedObject.NetworKId;
61+
public uint networkId => networkedObject.NetworkId;
6262
/// <summary>
6363
/// Gets the clientId that owns the NetworkedObject
6464
/// </summary>

‎MLAPI/MonoBehaviours/Core/NetworkedObject.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private void OnValidate()
2525
/// <summary>
2626
/// Gets the unique ID of this object that is synced across the network
2727
/// </summary>
28-
public uint NetworKId { get; internal set; }
28+
public uint NetworkId { get; internal set; }
2929
/// <summary>
3030
/// Gets the clientId of the owner of this NetworkedObject
3131
/// </summary>
@@ -132,7 +132,7 @@ internal void RebuildObservers(uint? clientId = null)
132132
//Something changed for this client.
133133
using (BitWriter writer = BitWriter.Get())
134134
{
135-
writer.WriteUInt(NetworKId);
135+
writer.WriteUInt(NetworkId);
136136
writer.WriteBool(observers.Contains(pair.Key));
137137

138138
if (observers.Contains(pair.Key))
@@ -163,7 +163,7 @@ internal void SetLocalVisibility(bool visibility)
163163
private void OnDestroy()
164164
{
165165
if (NetworkingManager.singleton != null)
166-
SpawnManager.OnDestroyObject(NetworKId, false);
166+
SpawnManager.OnDestroyObject(NetworkId, false);
167167
}
168168

169169
/// <summary>
@@ -207,15 +207,15 @@ public void SpawnAsPlayerObject(uint clientId, BitWriter spawnPayload = null)
207207
/// </summary>
208208
public void RemoveOwnership()
209209
{
210-
SpawnManager.RemoveOwnership(NetworKId);
210+
SpawnManager.RemoveOwnership(NetworkId);
211211
}
212212
/// <summary>
213213
/// Changes the owner of the object. Can only be called from server
214214
/// </summary>
215215
/// <param name="newOwnerClientId">The new owner clientId</param>
216216
public void ChangeOwnership(uint newOwnerClientId)
217217
{
218-
SpawnManager.ChangeOwnership(NetworKId, newOwnerClientId);
218+
SpawnManager.ChangeOwnership(NetworkId, newOwnerClientId);
219219
}
220220

221221
internal void InvokeBehaviourOnLostOwnership()

‎MLAPI/MonoBehaviours/Core/NetworkingManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3
11621162
pair.Value.RebuildObservers(clientId); //Rebuilds observers for the new client
11631163

11641164
writer.WriteBool(pair.Value.isPlayerObject);
1165-
writer.WriteUInt(pair.Value.NetworKId);
1165+
writer.WriteUInt(pair.Value.NetworkId);
11661166
writer.WriteUInt(pair.Value.OwnerClientId);
11671167
writer.WriteInt(NetworkConfig.NetworkPrefabIds[pair.Value.NetworkedPrefabName]);
11681168
writer.WriteBool(pair.Value.gameObject.activeInHierarchy);
@@ -1199,7 +1199,7 @@ internal void HandleApproval(uint clientId, int prefabId, bool approved, Vector3
11991199
if (NetworkConfig.HandleObjectSpawning)
12001200
{
12011201
writer.WriteBool(true);
1202-
writer.WriteUInt(ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().NetworKId);
1202+
writer.WriteUInt(ConnectedClients[clientId].PlayerObject.GetComponent<NetworkedObject>().NetworkId);
12031203
writer.WriteUInt(clientId);
12041204
writer.WriteInt(prefabId);
12051205
writer.WriteBool(false);

‎MLAPI/NetworkingManagerComponents/Core/NetworkPoolManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static NetworkedObject SpawnPoolObject(string poolName, Vector3 position,
6868
NetworkedObject netObject = Pools[PoolNamesToIndexes[poolName]].SpawnObject(position, rotation);
6969
using (BitWriter writer = BitWriter.Get())
7070
{
71-
writer.WriteUInt(netObject.NetworKId);
71+
writer.WriteUInt(netObject.NetworkId);
7272

7373
writer.WriteFloat(position.x);
7474
writer.WriteFloat(position.y);
@@ -97,7 +97,7 @@ public static void DestroyPoolObject(NetworkedObject netObject)
9797
netObject.gameObject.SetActive(false);
9898
using (BitWriter writer = BitWriter.Get())
9999
{
100-
writer.WriteUInt(netObject.NetworKId);
100+
writer.WriteUInt(netObject.NetworkId);
101101

102102
InternalMessageHandler.Send("MLAPI_DESTROY_POOL_OBJECT", "MLAPI_INTERNAL", writer, null);
103103
}

‎MLAPI/NetworkingManagerComponents/Core/SpawnManager.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal static void RemoveOwnership(uint netId)
3434
return;
3535
}
3636
NetworkedObject netObject = SpawnManager.spawnedObjects[netId];
37-
NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworKId == netId);
37+
NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == netId);
3838
netObject.OwnerClientId = NetworkingManager.singleton.NetworkConfig.NetworkTransport.InvalidDummyId;
3939

4040
using (BitWriter writer = BitWriter.Get())
@@ -54,7 +54,7 @@ internal static void ChangeOwnership(uint netId, uint clientId)
5454
return;
5555
}
5656
NetworkedObject netObject = SpawnManager.spawnedObjects[netId];
57-
NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworKId == netId);
57+
NetworkingManager.singleton.ConnectedClients[netObject.OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == netId);
5858
NetworkingManager.singleton.ConnectedClients[clientId].OwnedObjects.Add(netObject);
5959
netObject.OwnerClientId = clientId;
6060

@@ -169,15 +169,15 @@ internal static NetworkedObject CreateSpawnedObject(int networkedPrefabId, uint
169169
netObject.isSpawned = true;
170170
netObject.isPooledObject = false;
171171

172-
if (netManager.isServer) netObject.NetworKId = GetNetworkObjectId();
173-
else netObject.NetworKId = networkId;
172+
if (netManager.isServer) netObject.NetworkId = GetNetworkObjectId();
173+
else netObject.NetworkId = networkId;
174174

175175
netObject.sceneObject = false;
176176
netObject.OwnerClientId = owner;
177177
netObject.isPlayerObject = playerObject;
178178
netObject.transform.position = position;
179179
netObject.transform.rotation = rotation;
180-
spawnedObjects.Add(netObject.NetworKId, netObject);
180+
spawnedObjects.Add(netObject.NetworkId, netObject);
181181
if (playerObject) NetworkingManager.singleton.ConnectedClients[owner].PlayerObject = netObject;
182182
netObject.InvokeBehaviourNetworkSpawn(reader);
183183
return netObject;
@@ -201,7 +201,7 @@ internal static void UnSpawnObject(NetworkedObject netObject)
201201
return;
202202
}
203203

204-
OnDestroyObject(netObject.NetworKId, false);
204+
OnDestroyObject(netObject.NetworkId, false);
205205
}
206206

207207
//Server only
@@ -233,7 +233,7 @@ internal static void SpawnPlayerObject(NetworkedObject netObject, uint clientId,
233233
return;
234234
}
235235
uint netId = GetNetworkObjectId();
236-
netObject.NetworKId = netId;
236+
netObject.NetworkId = netId;
237237
spawnedObjects.Add(netId, netObject);
238238
netObject.isSpawned = true;
239239
netObject.sceneObject = false;
@@ -249,7 +249,7 @@ internal static void SpawnPlayerObject(NetworkedObject netObject, uint clientId,
249249
using (BitWriter writer = BitWriter.Get())
250250
{
251251
writer.WriteBool(true);
252-
writer.WriteUInt(netObject.NetworKId);
252+
writer.WriteUInt(netObject.NetworkId);
253253
writer.WriteUInt(netObject.OwnerClientId);
254254
writer.WriteInt(netManager.NetworkConfig.NetworkPrefabIds[netObject.NetworkedPrefabName]);
255255
writer.WriteBool(netObject.sceneObject == null ? true : netObject.sceneObject.Value);
@@ -298,7 +298,7 @@ internal static void SpawnObject(NetworkedObject netObject, uint? clientOwnerId
298298
return;
299299
}
300300
uint netId = GetNetworkObjectId();
301-
netObject.NetworKId = netId;
301+
netObject.NetworkId = netId;
302302
spawnedObjects.Add(netId, netObject);
303303
netObject.isSpawned = true;
304304
netObject.sceneObject = false;
@@ -318,7 +318,7 @@ internal static void SpawnObject(NetworkedObject netObject, uint? clientOwnerId
318318
using (BitWriter writer = BitWriter.Get())
319319
{
320320
writer.WriteBool(false);
321-
writer.WriteUInt(netObject.NetworKId);
321+
writer.WriteUInt(netObject.NetworkId);
322322
writer.WriteUInt(netObject.OwnerClientId);
323323
writer.WriteInt(netManager.NetworkConfig.NetworkPrefabIds[netObject.NetworkedPrefabName]);
324324
writer.WriteBool(netObject.sceneObject == null ? true : netObject.sceneObject.Value);
@@ -352,7 +352,7 @@ internal static void OnDestroyObject(uint networkId, bool destroyGameObject)
352352
!spawnedObjects[networkId].isPlayerObject && netManager.ConnectedClients.ContainsKey(spawnedObjects[networkId].OwnerClientId))
353353
{
354354
//Someone owns it.
355-
netManager.ConnectedClients[spawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworKId == networkId);
355+
netManager.ConnectedClients[spawnedObjects[networkId].OwnerClientId].OwnedObjects.RemoveAll(x => x.NetworkId == networkId);
356356
}
357357
spawnedObjects[networkId].isSpawned = false;
358358

0 commit comments

Comments
 (0)