fixed: ownership changing

This commit is contained in:
2022-10-02 16:00:34 +04:00
parent 85081e1da7
commit 5771ec738b
2 changed files with 24 additions and 13 deletions
+2
View File
@@ -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);
+22 -13
View File
@@ -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);
@@ -127,7 +135,7 @@ namespace Ragon.Core
_entitiesAll = _entities.Values.ToArray(); _entitiesAll = _entities.Values.ToArray();
} }
} }
// TODO: Move this processing to specialized classes with structures // TODO: Move this processing to specialized classes with structures
public void ProcessEvent(ushort peerId, RagonOperation operation, ReadOnlySpan<byte> payloadRawData) public void ProcessEvent(ushort peerId, RagonOperation operation, ReadOnlySpan<byte> payloadRawData)
{ {
@@ -200,20 +208,20 @@ namespace Ragon.Core
Broadcast(readyPlayersWithExcludedPeer, sendData, DeliveryType.Reliable); Broadcast(readyPlayersWithExcludedPeer, sendData, DeliveryType.Reliable);
} }
} }
_readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray(); _readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray();
foreach (var peer in _awaitingPeers) foreach (var peer in _awaitingPeers)
{ {
ReplicateSnapshot(peer); ReplicateSnapshot(peer);
} }
_awaitingPeers.Clear(); _awaitingPeers.Clear();
} }
else if (GetOwner().IsLoaded) else if (GetOwner().IsLoaded)
{ {
_logger.Trace($"[{_owner}][{peerId}] Player {player.Id} restored instantly"); _logger.Trace($"[{_owner}][{peerId}] Player {player.Id} restored instantly");
player.IsLoaded = true; player.IsLoaded = true;
{ {
_serializer.Clear(); _serializer.Clear();
_serializer.WriteOperation(RagonOperation.PLAYER_JOINED); _serializer.WriteOperation(RagonOperation.PLAYER_JOINED);
@@ -225,12 +233,12 @@ namespace Ragon.Core
var readyPlayersWithExcludedPeer = _readyPlayers.Where(p => p != peerId).ToArray(); var readyPlayersWithExcludedPeer = _readyPlayers.Where(p => p != peerId).ToArray();
Broadcast(readyPlayersWithExcludedPeer, sendData, DeliveryType.Reliable); Broadcast(readyPlayersWithExcludedPeer, sendData, DeliveryType.Reliable);
} }
_readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray(); _readyPlayers = _players.Where(p => p.Value.IsLoaded).Select(p => p.Key).ToArray();
_plugin.OnPlayerJoined(player); _plugin.OnPlayerJoined(player);
ReplicateSnapshot(peerId); ReplicateSnapshot(peerId);
foreach (var (key, value) in _entities) foreach (var (key, value) in _entities)
{ {
foreach (var bufferedEvent in value.BufferedEvents) foreach (var bufferedEvent in value.BufferedEvents)
@@ -241,7 +249,7 @@ namespace Ragon.Core
_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();
_serializer.WriteData(ref data); _serializer.WriteData(ref data);
@@ -311,7 +319,7 @@ namespace Ragon.Core
var eventMode = (RagonReplicationMode) _serializer.ReadByte(); var eventMode = (RagonReplicationMode) _serializer.ReadByte();
var targetMode = (RagonTarget) _serializer.ReadByte(); var targetMode = (RagonTarget) _serializer.ReadByte();
var entityId = _serializer.ReadUShort(); var entityId = _serializer.ReadUShort();
if (!_entities.TryGetValue(entityId, out var ent)) if (!_entities.TryGetValue(entityId, out var ent))
{ {
_logger.Warn($"Entity not found for event with Id {eventId}"); _logger.Warn($"Entity not found for event with Id {eventId}");
@@ -360,9 +368,9 @@ namespace Ragon.Core
var entityType = _serializer.ReadUShort(); var entityType = _serializer.ReadUShort();
var eventAuthority = (RagonAuthority) _serializer.ReadByte(); var eventAuthority = (RagonAuthority) _serializer.ReadByte();
var propertiesCount = _serializer.ReadUShort(); var propertiesCount = _serializer.ReadUShort();
_logger.Trace($"[{peerId}] Create Entity {entityType}"); _logger.Trace($"[{peerId}] Create Entity {entityType}");
var entity = new Entity(peerId, entityType, 0, eventAuthority, propertiesCount); var entity = new Entity(peerId, entityType, 0, eventAuthority, propertiesCount);
for (var i = 0; i < propertiesCount; i++) for (var i = 0; i < propertiesCount; i++)
{ {
@@ -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;
} }
} }
@@ -442,7 +451,7 @@ namespace Ragon.Core
ReplicateProperties(); ReplicateProperties();
} }
// TODO: Move this to specialized class // TODO: Move this to specialized class
void ReplicateSnapshot(uint peerId) void ReplicateSnapshot(uint peerId)
{ {
@@ -537,7 +546,7 @@ namespace Ragon.Core
public IScheduler GetScheduler() => _scheduler; public IScheduler GetScheduler() => _scheduler;
// TODO: Move this to Entity Event Manager // TODO: Move this to Entity Event Manager
public void SendEvent(Entity ent, RagonTarget targetMode, byte[] sendData) public void SendEvent(Entity ent, RagonTarget targetMode, byte[] sendData)
{ {