Compare commits
4 Commits
v1.0.18-rc
...
v1.0.20-rc
| Author | SHA1 | Date | |
|---|---|---|---|
| 783d2ce922 | |||
| 5771ec738b | |||
| 85081e1da7 | |||
| dbaa5d9d92 |
@@ -2,8 +2,8 @@ namespace Ragon.Common
|
|||||||
{
|
{
|
||||||
public enum RagonAuthority: byte
|
public enum RagonAuthority: byte
|
||||||
{
|
{
|
||||||
NONE,
|
None,
|
||||||
OWNER_ONLY,
|
OwnerOnly,
|
||||||
ALL,
|
All,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,9 +2,9 @@ namespace Ragon.Common
|
|||||||
{
|
{
|
||||||
public enum RagonReplicationMode: byte
|
public enum RagonReplicationMode: byte
|
||||||
{
|
{
|
||||||
LOCAL,
|
Local,
|
||||||
SERVER,
|
Server,
|
||||||
LOCAL_AND_SERVER,
|
LocalAndServer,
|
||||||
BUFFERED,
|
Buffered,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,8 +2,8 @@ namespace Ragon.Common
|
|||||||
{
|
{
|
||||||
public enum RagonTarget: byte
|
public enum RagonTarget: byte
|
||||||
{
|
{
|
||||||
OWNER,
|
Owner,
|
||||||
EXCEPT_OWNER,
|
ExceptOwner,
|
||||||
ALL,
|
All,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@ namespace Ragon.Core
|
|||||||
public static class ConfigurationLoader
|
public static class ConfigurationLoader
|
||||||
{
|
{
|
||||||
private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
|
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()
|
private static void CopyrightInfo()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ public class Entity
|
|||||||
Authority = eventAuthority;
|
Authority = eventAuthority;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void UpdateOwner(ushort ownerId) => OwnerId = ownerId;
|
||||||
|
|
||||||
public void ReplicateProperties(RagonSerializer serializer)
|
public void ReplicateProperties(RagonSerializer serializer)
|
||||||
{
|
{
|
||||||
serializer.WriteUShort(EntityId);
|
serializer.WriteUShort(EntityId);
|
||||||
|
|||||||
@@ -116,9 +116,17 @@ namespace Ragon.Core
|
|||||||
_owner = nextOwnerId;
|
_owner = nextOwnerId;
|
||||||
var nextOwner = _players[nextOwnerId];
|
var nextOwner = _players[nextOwnerId];
|
||||||
|
|
||||||
|
var entitiesToUpdate = player.Entities.Where(e => e.StaticId > 0).ToArray();
|
||||||
|
|
||||||
_serializer.Clear();
|
_serializer.Clear();
|
||||||
_serializer.WriteOperation(RagonOperation.OWNERSHIP_CHANGED);
|
_serializer.WriteOperation(RagonOperation.OWNERSHIP_CHANGED);
|
||||||
_serializer.WriteString(nextOwner.Id);
|
_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();
|
var sendData = _serializer.ToArray();
|
||||||
Broadcast(_readyPlayers, sendData);
|
Broadcast(_readyPlayers, sendData);
|
||||||
@@ -239,7 +247,7 @@ namespace Ragon.Core
|
|||||||
_serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
|
_serializer.WriteOperation(RagonOperation.REPLICATE_ENTITY_EVENT);
|
||||||
_serializer.WriteUShort(bufferedEvent.EventId);
|
_serializer.WriteUShort(bufferedEvent.EventId);
|
||||||
_serializer.WriteUShort(peerId);
|
_serializer.WriteUShort(peerId);
|
||||||
_serializer.WriteByte((byte) RagonReplicationMode.SERVER);
|
_serializer.WriteByte((byte) RagonReplicationMode.Server);
|
||||||
_serializer.WriteUShort(value.EntityId);
|
_serializer.WriteUShort(value.EntityId);
|
||||||
|
|
||||||
ReadOnlySpan<byte> data = bufferedEvent.EventData.AsSpan();
|
ReadOnlySpan<byte> data = bufferedEvent.EventData.AsSpan();
|
||||||
@@ -318,7 +326,7 @@ namespace Ragon.Core
|
|||||||
return;
|
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}");
|
_logger.Warn($"Player have not enought authority for event with Id {eventId}");
|
||||||
return;
|
return;
|
||||||
@@ -332,7 +340,7 @@ namespace Ragon.Core
|
|||||||
if (_plugin.InternalHandle(peerId, entityId, eventId, ref payload))
|
if (_plugin.InternalHandle(peerId, entityId, eventId, ref payload))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (eventMode == RagonReplicationMode.BUFFERED && targetMode != RagonTarget.OWNER)
|
if (eventMode == RagonReplicationMode.Buffered && targetMode != RagonTarget.Owner)
|
||||||
{
|
{
|
||||||
var bufferedEvent = new EntityEvent()
|
var bufferedEvent = new EntityEvent()
|
||||||
{
|
{
|
||||||
@@ -352,7 +360,7 @@ namespace Ragon.Core
|
|||||||
_serializer.WriteData(ref payload);
|
_serializer.WriteData(ref payload);
|
||||||
|
|
||||||
var sendData = _serializer.ToArray();
|
var sendData = _serializer.ToArray();
|
||||||
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
SendEvent(ent, targetMode, sendData);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case RagonOperation.CREATE_ENTITY:
|
case RagonOperation.CREATE_ENTITY:
|
||||||
@@ -408,7 +416,7 @@ namespace Ragon.Core
|
|||||||
var entityId = _serializer.ReadInt();
|
var entityId = _serializer.ReadInt();
|
||||||
if (_entities.TryGetValue(entityId, out var entity))
|
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;
|
return;
|
||||||
|
|
||||||
var player = _players[peerId];
|
var player = _players[peerId];
|
||||||
@@ -431,6 +439,7 @@ namespace Ragon.Core
|
|||||||
var sendData = _serializer.ToArray();
|
var sendData = _serializer.ToArray();
|
||||||
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -543,12 +552,12 @@ namespace Ragon.Core
|
|||||||
{
|
{
|
||||||
switch (targetMode)
|
switch (targetMode)
|
||||||
{
|
{
|
||||||
case RagonTarget.OWNER:
|
case RagonTarget.Owner:
|
||||||
{
|
{
|
||||||
Send(ent.OwnerId, sendData, DeliveryType.Reliable);
|
Send(ent.OwnerId, sendData, DeliveryType.Reliable);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case RagonTarget.EXCEPT_OWNER:
|
case RagonTarget.ExceptOwner:
|
||||||
{
|
{
|
||||||
_peersCache.Clear();
|
_peersCache.Clear();
|
||||||
foreach (var playerPeerId in _readyPlayers)
|
foreach (var playerPeerId in _readyPlayers)
|
||||||
@@ -558,7 +567,7 @@ namespace Ragon.Core
|
|||||||
Broadcast(_peersCache.ToArray(), sendData, DeliveryType.Reliable);
|
Broadcast(_peersCache.ToArray(), sendData, DeliveryType.Reliable);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case RagonTarget.ALL:
|
case RagonTarget.All:
|
||||||
{
|
{
|
||||||
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
Broadcast(_readyPlayers, sendData, DeliveryType.Reliable);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user