Skip to content

Commit 1bb7a8f

Browse files
TwoTenPvPTwoTenPvP
committed
Merge branch 'master' of https://github.com/MidLevel/MLAPI 
2 parents 29fe501 + 92a029a commit 1bb7a8f

File tree

119 files changed

+23684
-23473
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+23684
-23473
lines changed

‎Libraries/Internal/ApiParser/ApiParser.exe

0 Bytes
Binary file not shown.

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.RpcOverloads.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1733,6 +1733,16 @@ public void InvokeClientRpcOnEveryoneExcept<T1, T2, T3, T4, T5, T6, T7, T8, T9,
17331733
#endregion
17341734

17351735
#region BOXED SERVER RPC
1736+
public void InvokeServerRpc(Action method, string channel = null, SecuritySendFlags security = SecuritySendFlags.None)
1737+
{
1738+
SendServerRPCBoxed(HashMethodName(method.Method.Name), channel, security);
1739+
}
1740+
1741+
public void InvokeServerRpc(string methodName, string channel = null, SecuritySendFlags security = SecuritySendFlags.None)
1742+
{
1743+
SendServerRPCBoxed(HashMethodName(methodName), channel, security);
1744+
}
1745+
17361746
public void InvokeServerRpc<T1>(Action<T1> method, T1 t1, string channel = null, SecuritySendFlags security = SecuritySendFlags.None)
17371747
{
17381748
SendServerRPCBoxed(HashMethodName(method.Method.Name), channel, security, t1);

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,12 +661,14 @@ private void InvokeServerRPCLocal(ulong hash, uint senderClientId, Stream stream
661661
{
662662
userStream.CopyUnreadFrom(stream);
663663
userStream.Position = 0;
664+
Debug.LogError("Sender: " + senderClientId);
665+
ExecutingRpcSender = senderClientId;
664666

665667
if (rpc.reflectionMethod != null)
666668
{
667669
ExecutingRpcSender = senderClientId;
668670
rpc.reflectionMethod.Invoke(this, userStream);
669-
ExecutingRpcSender = 0;
671+
//ExecutingRpcSender = 0;
670672
}
671673

672674
if (rpc.rpcDelegate != null)
@@ -677,11 +679,15 @@ private void InvokeServerRPCLocal(ulong hash, uint senderClientId, Stream stream
677679
}
678680
else
679681
{
682+
Debug.LogError("Sender: " + senderClientId);
683+
684+
ExecutingRpcSender = senderClientId;
685+
680686
if (rpc.reflectionMethod != null)
681687
{
682688
ExecutingRpcSender = senderClientId;
683689
rpc.reflectionMethod.Invoke(this, stream);
684-
ExecutingRpcSender = 0;
690+
//ExecutingRpcSender = 0;
685691
}
686692

687693
if (rpc.rpcDelegate != null)

‎docs/_api/Action.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ permalink: /api/action/
8585
</div>
8686
<br>
8787
<div style="line-height: 1;">
88-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
88+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
8989
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
9090
</div>
9191
<br>
9292
<div style="line-height: 1;">
93-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
93+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
9494
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
9595
</div>
9696
<br>
@@ -109,12 +109,12 @@ permalink: /api/action/
109109
</div>
110110
<br>
111111
<div style="line-height: 1;">
112-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
112+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
113113
<h5 markdown="1">Inherited from: ``object``</h5>
114114
</div>
115115
<br>
116116
<div style="line-height: 1;">
117-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
117+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
118118
<h5 markdown="1">Inherited from: ``object``</h5>
119119
</div>
120120
</div>

‎docs/_api/Action_T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30, T31, T32_.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
278278
</div>
279279
<br>
280280
<div style="line-height: 1;">
281-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
281+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
282282
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
283283
</div>
284284
<br>
285285
<div style="line-height: 1;">
286-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
286+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
287287
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
288288
</div>
289289
<br>
@@ -302,12 +302,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
302302
</div>
303303
<br>
304304
<div style="line-height: 1;">
305-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
305+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
306306
<h5 markdown="1">Inherited from: ``object``</h5>
307307
</div>
308308
<br>
309309
<div style="line-height: 1;">
310-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
310+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
311311
<h5 markdown="1">Inherited from: ``object``</h5>
312312
</div>
313313
</div>

‎docs/_api/Action_T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30, T31_.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
272272
</div>
273273
<br>
274274
<div style="line-height: 1;">
275-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
275+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
276276
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
277277
</div>
278278
<br>
279279
<div style="line-height: 1;">
280-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
280+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
281281
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
282282
</div>
283283
<br>
@@ -296,12 +296,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
296296
</div>
297297
<br>
298298
<div style="line-height: 1;">
299-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
299+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
300300
<h5 markdown="1">Inherited from: ``object``</h5>
301301
</div>
302302
<br>
303303
<div style="line-height: 1;">
304-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
304+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
305305
<h5 markdown="1">Inherited from: ``object``</h5>
306306
</div>
307307
</div>

‎docs/_api/Action_T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29, T30_.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
266266
</div>
267267
<br>
268268
<div style="line-height: 1;">
269-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
269+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
270270
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
271271
</div>
272272
<br>
273273
<div style="line-height: 1;">
274-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
274+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
275275
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
276276
</div>
277277
<br>
@@ -290,12 +290,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
290290
</div>
291291
<br>
292292
<div style="line-height: 1;">
293-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
293+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
294294
<h5 markdown="1">Inherited from: ``object``</h5>
295295
</div>
296296
<br>
297297
<div style="line-height: 1;">
298-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
298+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
299299
<h5 markdown="1">Inherited from: ``object``</h5>
300300
</div>
301301
</div>

‎docs/_api/Action_T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29_.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
260260
</div>
261261
<br>
262262
<div style="line-height: 1;">
263-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
263+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
264264
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
265265
</div>
266266
<br>
267267
<div style="line-height: 1;">
268-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
268+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
269269
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
270270
</div>
271271
<br>
@@ -284,12 +284,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
284284
</div>
285285
<br>
286286
<div style="line-height: 1;">
287-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
287+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
288288
<h5 markdown="1">Inherited from: ``object``</h5>
289289
</div>
290290
<br>
291291
<div style="line-height: 1;">
292-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
292+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
293293
<h5 markdown="1">Inherited from: ``object``</h5>
294294
</div>
295295
</div>

‎docs/_api/Action_T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28_.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,12 +254,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
254254
</div>
255255
<br>
256256
<div style="line-height: 1;">
257-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
257+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
258258
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
259259
</div>
260260
<br>
261261
<div style="line-height: 1;">
262-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
262+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
263263
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
264264
</div>
265265
<br>
@@ -278,12 +278,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
278278
</div>
279279
<br>
280280
<div style="line-height: 1;">
281-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
281+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
282282
<h5 markdown="1">Inherited from: ``object``</h5>
283283
</div>
284284
<br>
285285
<div style="line-height: 1;">
286-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
286+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
287287
<h5 markdown="1">Inherited from: ``object``</h5>
288288
</div>
289289
</div>

‎docs/_api/Action_T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27_.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
248248
</div>
249249
<br>
250250
<div style="line-height: 1;">
251-
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
251+
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
252252
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
253253
</div>
254254
<br>
255255
<div style="line-height: 1;">
256-
<h4 markdown="1"><b>public ``int`` GetHashCode();</b></h4>
256+
<h4 markdown="1"><b>public ``Delegate[]`` GetInvocationList();</b></h4>
257257
<h5 markdown="1">Inherited from: ``MulticastDelegate``</h5>
258258
</div>
259259
<br>
@@ -272,12 +272,12 @@ permalink: /api/action_-t1, -t2, -t3, -t4, -t5, -t6, -t7, -t8, -t9, -t10, -t11,
272272
</div>
273273
<br>
274274
<div style="line-height: 1;">
275-
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
275+
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
276276
<h5 markdown="1">Inherited from: ``object``</h5>
277277
</div>
278278
<br>
279279
<div style="line-height: 1;">
280-
<h4 markdown="1"><b>public ``Type`` GetType();</b></h4>
280+
<h4 markdown="1"><b>public ``string`` ToString();</b></h4>
281281
<h5 markdown="1">Inherited from: ``object``</h5>
282282
</div>
283283
</div>

0 commit comments

Comments
 (0)