Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 783d2ce922 | |||
| 5771ec738b | |||
| 85081e1da7 | |||
| dbaa5d9d92 |
@@ -2,8 +2,8 @@ namespace Ragon.Common
|
||||
{
|
||||
public enum RagonAuthority: byte
|
||||
{
|
||||
NONE,
|
||||
OWNER_ONLY,
|
||||
ALL,
|
||||
None,
|
||||
OwnerOnly,
|
||||
All,
|
||||
}
|
||||
}
|
||||
@@ -2,9 +2,9 @@ namespace Ragon.Common
|
||||
{
|
||||
public enum RagonReplicationMode: byte
|
||||
{
|
||||
LOCAL,
|
||||
SERVER,
|
||||
LOCAL_AND_SERVER,
|
||||
BUFFERED,
|
||||
Local,
|
||||
Server,
|
||||
LocalAndServer,
|
||||
Buffered,
|
||||
}
|
||||
}
|
||||
@@ -2,8 +2,8 @@ namespace Ragon.Common
|
||||
{
|
||||
public enum RagonTarget: byte
|
||||
{
|
||||
OWNER,
|
||||
EXCEPT_OWNER,
|
||||
ALL,
|
||||
Owner,
|
||||
ExceptOwner,
|
||||
All,
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,7 @@ namespace Ragon.Core
|
||||
public static class ConfigurationLoader
|
||||
{
|
||||
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
|
||||
private static readonly string _serverVersion = "1.0.18-rc";
|
||||
private static readonly string _serverVersion = "1.0.20-rc";
|
||||
|
||||
private static void CopyrightInfo()
|
||||
{
|
||||
|
||||
@@ -28,6 +28,8 @@ public class Entity
|
||||
Authority = eventAuthority;
|
||||
}
|
||||
|
||||
public void UpdateOwner(ushort ownerId) => OwnerId = ownerId;
|
||||
|
||||
public void ReplicateProperties(RagonSerializer serializer)
|
||||
{
|
||||
serializer.WriteUShort(EntityId);
|
||||
|
||||
@@ -116,9 +116,17 @@ namespace Ragon.Core
|
||||
_owner = nextOwnerId;
|
||||
var nextOwner = _players[nextOwnerId];
|
||||
|
||||
var entitiesToUpdate = player.Entities.Where(e => e.StaticId > 0).ToArray();
|
||||
|
||||
_serializer.Clear();
|
||||
_serializer.WriteOperation(RagonOperation.OWNERSHIP_CHANGED);
|
||||
_serializer.WriteString(nextOwner.Id);
|
||||
_serializer.WriteUShort((ushort) entitiesToUpdate.Length);
|
||||
foreach (var entity in entitiesToUpdate)
|
||||
{
|
||||
_serializer.WriteUShort(entity.EntityId);
|
||||
entity.UpdateOwner((ushort) nextOwnerId);
|
||||
}
|
||||
|
||||
var sendData = _serializer.ToArray();
|
||||
Broadcast(_readyPlayers, sendData);
|
||||
@@ -127,7 +135,7 @@ namespace Ragon.Core
|
||||
_entitiesAll = _entities.Values.ToArray();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// TODO: Move this processing to specialized classes with structures
|
||||
public void ProcessEvent(ushort peerId, RagonOperation operation, ReadOnlySpan<byte> payloadRawData)
|
||||
{
|
||||
@@ -200,20 +208,20 @@ namespace Ragon.Core
|
||||
Broadcast(readyPlayersWithExcludedPeer, sendData, DeliveryType.Reliable);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
_readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray();
|
||||
foreach (var peer in _awaitingPeers)
|
||||
{
|
||||
ReplicateSnapshot(peer);
|
||||
ReplicateSnapshot(peer);
|
||||
}
|
||||
|
||||
|
||||
_awaitingPeers.Clear();
|
||||
}
|
||||
else if (GetOwner().IsLoaded)
|
||||
{
|
||||
_logger.Trace($"[{_owner}][{peerId}] Player {player.Id} restored instantly");
|
||||
player.IsLoaded = true;
|
||||
|
||||
|
||||
{
|
||||
_serializer.Clear();
|
||||
_serializer.WriteOperation(RagonOperation.PLAYER_JOINED);
|
||||
@@ -225,12 +233,12 @@ namespace Ragon.Core
|
||||
var readyPlayersWithExcludedPeer = _readyPlayers.Where(p => p != peerId).ToArray();
|
||||
Broadcast(readyPlayersWithExcludedPeer, sendData, DeliveryType.Reliable);
|
||||
}
|
||||
|
||||
|
||||
_readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray();
|
||||
_plugin.OnPlayerJoined(player);
|
||||
|
||||
ReplicateSnapshot(peerId);
|
||||
|
||||
|
||||
foreach (var (key, value) in _entities)
|
||||
{
|
||||
foreach (var bufferedEvent in value.BufferedEvents)
|
||||
@@ -239,9 +247,9 @@ 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();
|
||||
_serializer.WriteData(ref data);
|
||||
|
||||
@@ -311,14 +319,14 @@ namespace Ragon.Core
|
||||
var eventMode = (RagonReplicationMode) _serializer.ReadByte();
|
||||
var targetMode = (RagonTarget) _serializer.ReadByte();
|
||||
var entityId = _serializer.ReadUShort();
|
||||
|
||||
|
||||
if (!_entities.TryGetValue(entityId, out var ent))
|
||||
{
|
||||
_logger.Warn($"Entity not found for event with Id {eventId}");
|
||||
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 +340,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 +360,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:
|
||||
@@ -360,9 +368,9 @@ namespace Ragon.Core
|
||||
var entityType = _serializer.ReadUShort();
|
||||
var eventAuthority = (RagonAuthority) _serializer.ReadByte();
|
||||
var propertiesCount = _serializer.ReadUShort();
|
||||
|
||||
|
||||
_logger.Trace($"[{peerId}] Create Entity {entityType}");
|
||||
|
||||
|
||||
var entity = new Entity(peerId, entityType, 0, eventAuthority, propertiesCount);
|
||||
for (var i = 0; i < propertiesCount; i++)
|
||||
{
|
||||
@@ -408,7 +416,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];
|
||||
@@ -431,6 +439,7 @@ namespace Ragon.Core
|
||||
var sendData = _serializer.ToArray();
|
||||
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -442,7 +451,7 @@ namespace Ragon.Core
|
||||
|
||||
ReplicateProperties();
|
||||
}
|
||||
|
||||
|
||||
// TODO: Move this to specialized class
|
||||
void ReplicateSnapshot(uint peerId)
|
||||
{
|
||||
@@ -537,18 +546,18 @@ namespace Ragon.Core
|
||||
|
||||
public IScheduler GetScheduler() => _scheduler;
|
||||
|
||||
|
||||
|
||||
// TODO: Move this to Entity Event Manager
|
||||
public void SendEvent(Entity ent, RagonTarget targetMode, byte[] sendData)
|
||||
{
|
||||
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 +567,7 @@ namespace Ragon.Core
|
||||
Broadcast(_peersCache.ToArray(), sendData, DeliveryType.Reliable);
|
||||
break;
|
||||
}
|
||||
case RagonTarget.ALL:
|
||||
case RagonTarget.All:
|
||||
{
|
||||
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user