fixed: second migration

This commit is contained in:
2022-12-01 22:24:03 +04:00
parent c92b5a5bc4
commit 06ff76fe0b
4 changed files with 13 additions and 11 deletions
+2 -2
View File
@@ -99,12 +99,12 @@ namespace Ragon.Core
public void OnConnected(ushort peerId) public void OnConnected(ushort peerId)
{ {
_logger.Trace("Connected " + peerId); // _logger.Trace("Connected " + peerId);
} }
public void OnDisconnected(ushort peerId) public void OnDisconnected(ushort peerId)
{ {
_logger.Trace("Disconnected " + peerId); // _logger.Trace("Disconnected " + peerId);
var player = _lobby.AuthorizationManager.GetPlayer(peerId); var player = _lobby.AuthorizationManager.GetPlayer(peerId);
if (player != null) if (player != null)
+1 -1
View File
@@ -21,7 +21,7 @@ namespace Ragon.Core
public int MaxRooms; public int MaxRooms;
private static readonly Logger _logger = LogManager.GetCurrentClassLogger(); private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
private static readonly string _serverVersion = "1.0.25-rc"; private static readonly string _serverVersion = "1.0.26-rc";
private static void CopyrightInfo() private static void CopyrightInfo()
{ {
+6 -4
View File
@@ -128,7 +128,6 @@ namespace Ragon.Core
var propertySize = reader.ReadUShort(); var propertySize = reader.ReadUShort();
entity.AddProperty(new EntityProperty(propertySize, propertyType)); entity.AddProperty(new EntityProperty(propertySize, propertyType));
} }
player.AttachEntity(entity); player.AttachEntity(entity);
AttachEntity(player, entity); AttachEntity(player, entity);
} }
@@ -218,8 +217,6 @@ namespace Ragon.Core
var eventAuthority = (RagonAuthority) reader.ReadByte(); var eventAuthority = (RagonAuthority) reader.ReadByte();
var propertiesCount = reader.ReadUShort(); var propertiesCount = reader.ReadUShort();
_logger.Trace($"[{peerId}] Create Entity {entityType}");
var player = _players[peerId]; var player = _players[peerId];
var entity = new Entity(this, player.PeerId, entityType, 0, eventAuthority); var entity = new Entity(this, player.PeerId, entityType, 0, eventAuthority);
for (var i = 0; i < propertiesCount; i++) for (var i = 0; i < propertiesCount; i++)
@@ -309,9 +306,13 @@ namespace Ragon.Core
foreach (var entity in entitiesToUpdate) foreach (var entity in entitiesToUpdate)
{ {
_writer.WriteUShort(entity.EntityId); _writer.WriteUShort(entity.EntityId);
entity.SetOwner((ushort) next.PeerId); entity.SetOwner(next.PeerId);
next.Entities.Add(entity);
} }
next.EntitiesIds = next.Entities.Select(e => e.EntityId).ToList();
BroadcastToReady(_writer, DeliveryType.Reliable); BroadcastToReady(_writer, DeliveryType.Reliable);
} }
@@ -345,6 +346,7 @@ namespace Ragon.Core
void BroadcastSnapshot(ushort[] peersIds) void BroadcastSnapshot(ushort[] peersIds)
{ {
_logger.Trace("Snapshot");
_writer.Clear(); _writer.Clear();
_writer.WriteOperation(RagonOperation.SNAPSHOT); _writer.WriteOperation(RagonOperation.SNAPSHOT);
_writer.WriteUShort((ushort) _readyPlayers.Length); _writer.WriteUShort((ushort) _readyPlayers.Length);
+1 -1
View File
@@ -74,7 +74,7 @@ public class RoomManager
{ {
if (existRoom.Map == map && existRoom.PlayersCount < existRoom.PlayersMax) if (existRoom.Map == map && existRoom.PlayersCount < existRoom.PlayersMax)
{ {
_logger.Trace($"Player ({player.PlayerName}|{player.Id}) joined to room with Id {roomId}"); _logger.Trace($"Player ({player.PlayerName}|{player.Id}) joined to room with Id {existRoom.Id}");
existRoom.AddPlayer(player, payload); existRoom.AddPlayer(player, payload);
_roomsBySocket.Add(player.PeerId, existRoom); _roomsBySocket.Add(player.PeerId, existRoom);