Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5aa159ed2f | |||
| 892558ab16 |
@@ -106,7 +106,7 @@ namespace Ragon.Client
|
||||
{
|
||||
Serialize(_propertyBuffer);
|
||||
|
||||
buffer.FromBuffer(_propertyBuffer, _size);
|
||||
buffer.CopyFrom(_propertyBuffer, _size);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ namespace Ragon.Client
|
||||
|
||||
var propertySize = (ushort) _propertyBuffer.WriteOffset;
|
||||
buffer.WriteUShort(propertySize);;
|
||||
buffer.FromBuffer(_propertyBuffer, propertySize);
|
||||
buffer.CopyFrom(_propertyBuffer, propertySize);
|
||||
}
|
||||
|
||||
internal void Read(RagonBuffer buffer)
|
||||
|
||||
@@ -236,9 +236,6 @@ namespace Ragon.Protocol
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void Write(uint value, int numBits = 16)
|
||||
{
|
||||
Debug.Assert(!(numBits < 0));
|
||||
Debug.Assert(!(numBits > 32));
|
||||
|
||||
var currentBucketIndex = _write >> 5;
|
||||
var used = _write & 0x0000001F;
|
||||
var mask = (1UL << used) - 1;
|
||||
@@ -357,7 +354,7 @@ namespace Ragon.Protocol
|
||||
}
|
||||
|
||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||
public void FromBuffer(RagonBuffer buffer, int size)
|
||||
public void CopyFrom(RagonBuffer buffer, int size)
|
||||
{
|
||||
WriteArray(buffer._buckets, size);
|
||||
}
|
||||
@@ -434,7 +431,7 @@ namespace Ragon.Protocol
|
||||
|
||||
public void ToArray(byte[] outData)
|
||||
{
|
||||
Debug.Assert(outData.Length >= Length);
|
||||
Write(1, 1);
|
||||
|
||||
var bucketsCount = (_write >> 5) + 1;
|
||||
var length = Length;
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
|
||||
using Ragon.Protocol;
|
||||
|
||||
namespace Ragon.Server.Entity;
|
||||
|
||||
@@ -28,7 +28,7 @@ public class RagonPayload
|
||||
|
||||
public void Read(RagonBuffer buffer)
|
||||
{
|
||||
_size = buffer.Capacity;
|
||||
_size = buffer.Capacity - 1;
|
||||
buffer.ReadArray(_data, _size);
|
||||
}
|
||||
|
||||
|
||||
@@ -54,6 +54,13 @@ public class RagonProperty : RagonPayload
|
||||
|
||||
public void Write(RagonBuffer buffer)
|
||||
{
|
||||
if (IsFixed)
|
||||
{
|
||||
buffer.WriteArray(_data, Size);
|
||||
return;
|
||||
}
|
||||
|
||||
buffer.Write((ushort) Size);
|
||||
buffer.WriteArray(_data, Size);
|
||||
}
|
||||
|
||||
|
||||
@@ -99,6 +99,11 @@ public class RagonServer : IRagonServer, INetworkListener
|
||||
_timer.Start();
|
||||
while (true)
|
||||
{
|
||||
if (_timer.ElapsedMilliseconds > _tickRate * 2)
|
||||
{
|
||||
_logger.Warn($"Slow perfomance: {_timer.ElapsedMilliseconds}");
|
||||
}
|
||||
|
||||
if (_timer.ElapsedMilliseconds > _tickRate)
|
||||
{
|
||||
_timer.Restart();
|
||||
@@ -197,7 +202,7 @@ public class RagonServer : IRagonServer, INetworkListener
|
||||
_reader.FromArray(data);
|
||||
|
||||
var operation = _reader.ReadByte();
|
||||
_handlers[operation].Handle(context, channel);
|
||||
_handlers[operation]?.Handle(context, channel);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
@@ -42,7 +42,7 @@ public struct RagonServerConfiguration
|
||||
public Dictionary<string, string> WebHooks;
|
||||
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
private static readonly string ServerVersion = "1.3.1";
|
||||
private static readonly string ServerVersion = "1.3.2";
|
||||
private static Dictionary<string, ServerType> _serverTypes = new Dictionary<string, ServerType>()
|
||||
{
|
||||
{"enet", Server.ServerType.ENET},
|
||||
|
||||
Reference in New Issue
Block a user