Skip to content

Commit 1f84774

Browse files
committed
Fixed standard issues
1 parent 5eb2c72 commit 1f84774

File tree

20 files changed

+173
-180
lines changed

20 files changed

+173
-180
lines changed

com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -754,11 +754,8 @@ static AnimationParamEnumWrapper()
754754
/// </summary>
755755
private void SpawnCleanup()
756756
{
757-
if (m_NetworkAnimatorStateChangeHandler != null)
758-
{
759-
m_NetworkAnimatorStateChangeHandler.DeregisterUpdate();
760-
m_NetworkAnimatorStateChangeHandler = null;
761-
}
757+
m_NetworkAnimatorStateChangeHandler?.DeregisterUpdate();
758+
m_NetworkAnimatorStateChangeHandler = null;
762759
}
763760

764761
public override void OnDestroy()

com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface IContactEventHandler
3838
/// <summary>
3939
/// Should return a <see cref="Rigidbody"/>.
4040
/// </summary>
41-
Rigidbody GetRigidbody();
41+
public Rigidbody GetRigidbody();
4242

4343
/// <summary>
4444
/// Invoked by the <see cref="RigidbodyContactEventManager"/> instance.
@@ -49,7 +49,7 @@ public interface IContactEventHandler
4949
/// <param name="contactPoint">The world space location of the contact event.</param>
5050
/// <param name="hasCollisionStay">Will be set if this is a collision stay contact event (i.e. it is not the first contact event and continually has contact)</param>
5151
/// <param name="averagedCollisionStayNormal">The average normal of the collision stay contact over time.</param>
52-
void ContactEvent(ulong eventId, Vector3 averagedCollisionNormal, Rigidbody collidingBody, Vector3 contactPoint, bool hasCollisionStay = false, Vector3 averagedCollisionStayNormal = default);
52+
public void ContactEvent(ulong eventId, Vector3 averagedCollisionNormal, Rigidbody collidingBody, Vector3 contactPoint, bool hasCollisionStay = false, Vector3 averagedCollisionStayNormal = default);
5353
}
5454

5555
/// <summary>
@@ -62,7 +62,7 @@ public interface IContactEventHandlerWithInfo : IContactEventHandler
6262
/// Invoked by <see cref="RigidbodyContactEventManager"/> for each set of contact events it is processing (prior to processing).
6363
/// </summary>
6464
/// <returns><see cref="ContactEventHandlerInfo"/></returns>
65-
ContactEventHandlerInfo GetContactEventHandlerInfo();
65+
public ContactEventHandlerInfo GetContactEventHandlerInfo();
6666
}
6767

6868
/// <summary>

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,12 +1623,8 @@ internal void ShutdownInternal()
16231623

16241624
// Shutdown connection manager last which shuts down transport
16251625
ConnectionManager.Shutdown();
1626-
1627-
if (MessageManager != null)
1628-
{
1629-
MessageManager.Dispose();
1630-
MessageManager = null;
1631-
}
1626+
MessageManager?.Dispose();
1627+
MessageManager = null;
16321628

16331629
// Let the NetworkSceneManager clean up its two SceneEvenData instances
16341630
SceneManager?.Dispose();
@@ -1745,9 +1741,9 @@ private void OnDestroy()
17451741
/// </summary>
17461742
internal interface INetworkManagerHelper
17471743
{
1748-
bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
1744+
public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
17491745

1750-
void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
1746+
public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
17511747

17521748
internal NetcodeAnalytics Analytics();
17531749
}

com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public interface INetworkUpdateSystem
1515
/// The update method that is being executed in the context of related <see cref="NetworkUpdateStage"/>.
1616
/// </summary>
1717
/// <param name="updateStage">The <see cref="NetworkUpdateStage"/> that is being executed.</param>
18-
void NetworkUpdate(NetworkUpdateStage updateStage);
18+
public void NetworkUpdate(NetworkUpdateStage updateStage);
1919
}
2020

2121
/// <summary>

com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ internal enum TriggerType
1818
/// There is a one second maximum lifetime of triggers to avoid memory leaks. After one second has passed
1919
/// without the requested object ID being spawned, the triggers for it are automatically deleted.
2020
/// </summary>
21-
void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context, string messageType = null);
21+
public void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context, string messageType = null);
2222

2323
/// <summary>
2424
/// Cleans up any trigger that's existed for more than a second.
2525
/// These triggers were probably for situations where a request was received after a despawn rather than before a spawn.
2626
/// </summary>
27-
void CleanupStaleTriggers();
27+
public void CleanupStaleTriggers();
2828

29-
void ProcessTriggers(TriggerType trigger, ulong key);
29+
public void ProcessTriggers(TriggerType trigger, ulong key);
3030

3131
/// <summary>
3232
/// Cleans up any trigger that's existed for more than a second.
3333
/// These triggers were probably for situations where a request was received after a despawn rather than before a spawn.
3434
/// </summary>
35-
void CleanupAllTriggers();
35+
public void CleanupAllTriggers();
3636
}
3737
}

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkHooks.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ internal interface INetworkHooks
1515
/// <param name="clientId">The destination clientId</param>
1616
/// <param name="message">The message being sent</param>
1717
/// <param name="delivery"></param>
18-
void OnBeforeSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage;
18+
public void OnBeforeSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage;
1919

2020
/// <summary>
2121
/// Called after an individual message is sent.
@@ -24,23 +24,23 @@ internal interface INetworkHooks
2424
/// <param name="message">The message being sent</param>
2525
/// <param name="delivery"></param>
2626
/// <param name="messageSizeBytes">Number of bytes in the message, not including the message header</param>
27-
void OnAfterSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage;
27+
public void OnAfterSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage;
2828

2929
/// <summary>
3030
/// Called before an individual message is received.
3131
/// </summary>
3232
/// <param name="senderId">The source clientId</param>
3333
/// <param name="messageType">The type of the message being sent</param>
3434
/// <param name="messageSizeBytes">Number of bytes in the message, not including the message header</param>
35-
void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
35+
public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
3636

3737
/// <summary>
3838
/// Called after an individual message is received.
3939
/// </summary>
4040
/// <param name="senderId">The source clientId</param>
4141
/// <param name="messageType">The type of the message being sent</param>
4242
/// <param name="messageSizeBytes">Number of bytes in the message, not including the message header</param>
43-
void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
43+
public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes);
4444

4545
/// <summary>
4646
/// Called before a batch of messages is sent
@@ -49,7 +49,7 @@ internal interface INetworkHooks
4949
/// <param name="messageCount">Number of messages in the batch</param>
5050
/// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
5151
/// <param name="delivery"></param>
52-
void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
52+
public void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
5353

5454
/// <summary>
5555
/// Called after a batch of messages is sent
@@ -58,23 +58,23 @@ internal interface INetworkHooks
5858
/// <param name="messageCount">Number of messages in the batch</param>
5959
/// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
6060
/// <param name="delivery"></param>
61-
void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
61+
public void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery);
6262

6363
/// <summary>
6464
/// Called before a batch of messages is received
6565
/// </summary>
6666
/// <param name="senderId">The source clientId</param>
6767
/// <param name="messageCount">Number of messages in the batch</param>
6868
/// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
69-
void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
69+
public void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
7070

7171
/// <summary>
7272
/// Called after a batch of messages is received
7373
/// </summary>
7474
/// <param name="senderId">The source clientId</param>
7575
/// <param name="messageCount">Number of messages in the batch</param>
7676
/// <param name="batchSizeInBytes">Number of bytes in the batch, including the batch header</param>
77-
void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
77+
public void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes);
7878

7979

8080
/// <summary>
@@ -84,7 +84,7 @@ internal interface INetworkHooks
8484
/// <param name="messageType">The type of the message</param>
8585
/// <param name="delivery"></param>
8686
/// <returns></returns>
87-
bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery);
87+
public bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery);
8888

8989
/// <summary>
9090
/// Called before a message is received. If this returns false, the message will be discarded.
@@ -94,7 +94,7 @@ internal interface INetworkHooks
9494
/// <param name="messageContent">The FastBufferReader containing the message</param>
9595
/// <param name="context">The NetworkContext the message is being processed in</param>
9696
/// <returns></returns>
97-
bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context);
97+
public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context);
9898

9999
/// <summary>
100100
/// Called after a message is serialized, but before it's handled.
@@ -103,7 +103,7 @@ internal interface INetworkHooks
103103
/// <param name="message">The message object</param>
104104
/// <param name="context">The network context the message is being ahandled in</param>
105105
/// <typeparam name="T"></typeparam>
106-
void OnBeforeHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
106+
public void OnBeforeHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
107107

108108
/// <summary>
109109
/// Called after a message is serialized and handled.
@@ -112,6 +112,6 @@ internal interface INetworkHooks
112112
/// <param name="message">The message object</param>
113113
/// <param name="context">The network context the message is being ahandled in</param>
114114
/// <typeparam name="T"></typeparam>
115-
void OnAfterHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
115+
public void OnAfterHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage;
116116
}
117117
}

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessage.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ namespace Unity.Netcode
3939
/// </summary>
4040
internal interface INetworkMessage
4141
{
42-
void Serialize(FastBufferWriter writer, int targetVersion);
43-
bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion);
44-
void Handle(ref NetworkContext context);
45-
int Version { get; }
42+
public void Serialize(FastBufferWriter writer, int targetVersion);
43+
public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion);
44+
public void Handle(ref NetworkContext context);
45+
public int Version { get; }
4646
}
4747

4848

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ namespace Unity.Netcode
44
{
55
internal interface INetworkMessageProvider
66
{
7-
List<NetworkMessageManager.MessageWithHandler> GetMessages();
7+
public List<NetworkMessageManager.MessageWithHandler> GetMessages();
88
}
99
}

com.unity.netcode.gameobjects/Runtime/Messaging/INetworkMessageSender.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ namespace Unity.Netcode
22
{
33
internal interface INetworkMessageSender
44
{
5-
void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData);
5+
public void Send(ulong clientId, NetworkDelivery delivery, FastBufferWriter batchData);
66
}
77
}

com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/IGroupRpcTarget.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ namespace Unity.Netcode
22
{
33
internal interface IGroupRpcTarget
44
{
5-
void Add(ulong clientId);
6-
void Clear();
7-
BaseRpcTarget Target { get; }
5+
public void Add(ulong clientId);
6+
public void Clear();
7+
public BaseRpcTarget Target { get; }
88
}
99
}

0 commit comments

Comments
 (0)