Compare commits

...

2 Commits

Author SHA1 Message Date
edmand46 85081e1da7 fix: replication entity event 2022-09-11 15:05:32 +04:00
edmand46 dbaa5d9d92 chore: renaming enums 2022-09-10 10:25:45 +04:00
4 changed files with 18 additions and 18 deletions
+3 -3
View File
@@ -2,8 +2,8 @@ namespace Ragon.Common
{
public enum RagonAuthority: byte
{
NONE,
OWNER_ONLY,
ALL,
None,
OwnerOnly,
All,
}
}
+4 -4
View File
@@ -2,9 +2,9 @@ namespace Ragon.Common
{
public enum RagonReplicationMode: byte
{
LOCAL,
SERVER,
LOCAL_AND_SERVER,
BUFFERED,
Local,
Server,
LocalAndServer,
Buffered,
}
}
+3 -3
View File
@@ -2,8 +2,8 @@ namespace Ragon.Common
{
public enum RagonTarget: byte
{
OWNER,
EXCEPT_OWNER,
ALL,
Owner,
ExceptOwner,
All,
}
}
+8 -8
View File
@@ -239,7 +239,7 @@ namespace Ragon.Core
_serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
_serializer.WriteUShort(bufferedEvent.EventId);
_serializer.WriteUShort(peerId);
_serializer.WriteByte((byte) RagonReplicationMode.SERVER);
_serializer.WriteByte((byte) RagonReplicationMode.Server);
_serializer.WriteUShort(value.EntityId);
ReadOnlySpan<byte> data = bufferedEvent.EventData.AsSpan();
@@ -318,7 +318,7 @@ namespace Ragon.Core
return;
}
if (ent.Authority == RagonAuthority.OWNER_ONLY && ent.OwnerId != peerId)
if (ent.Authority == RagonAuthority.OwnerOnly && ent.OwnerId != peerId)
{
_logger.Warn($"Player have not enought authority for event with Id {eventId}");
return;
@@ -332,7 +332,7 @@ namespace Ragon.Core
if (_plugin.InternalHandle(peerId, entityId, eventId, ref payload))
return;
if (eventMode == RagonReplicationMode.BUFFERED && targetMode != RagonTarget.OWNER)
if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner)
{
var bufferedEvent = new EntityEvent()
{
@@ -352,7 +352,7 @@ namespace Ragon.Core
_serializer.WriteData(ref payload);
var sendData = _serializer.ToArray();
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
SendEvent(ent, targetMode, sendData);
break;
}
case RagonOperation.CREATE_ENTITY:
@@ -408,7 +408,7 @@ namespace Ragon.Core
var entityId = _serializer.ReadInt();
if (_entities.TryGetValue(entityId, out var entity))
{
if (entity.Authority == RagonAuthority.OWNER_ONLY && entity.OwnerId != peerId)
if (entity.Authority == RagonAuthority.OwnerOnly && entity.OwnerId != peerId)
return;
var player = _players[peerId];
@@ -543,12 +543,12 @@ namespace Ragon.Core
{
switch (targetMode)
{
case RagonTarget.OWNER:
case RagonTarget.Owner:
{
Send(ent.OwnerId, sendData, DeliveryType.Reliable);
break;
}
case RagonTarget.EXCEPT_OWNER:
case RagonTarget.ExceptOwner:
{
_peersCache.Clear();
foreach (var playerPeerId in _readyPlayers)
@@ -558,7 +558,7 @@ namespace Ragon.Core
Broadcast(_peersCache.ToArray(), sendData, DeliveryType.Reliable);
break;
}
case RagonTarget.ALL:
case RagonTarget.All:
{
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
break;