diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs index 294e17ad..91fd1a8c 100644 --- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs @@ -26,6 +26,8 @@ namespace Impostor.Server.Net.Inner.Objects.Components private ushort _lastSequenceId; private AirshipSpawnState _spawnState; + private bool _spawnSnapAllowed; + private bool _initialSpawn; public InnerCustomNetworkTransform(ICustomMessageManager customMessageManager, Game game, ILogger logger, InnerPlayerControl playerControl, IEventManager eventManager, ObjectPool pool) : base(customMessageManager, game) { @@ -33,6 +35,8 @@ namespace Impostor.Server.Net.Inner.Objects.Components _playerControl = playerControl; _eventManager = eventManager; _pool = pool; + _spawnSnapAllowed = false; + _initialSpawn = true; } private enum AirshipSpawnState : byte @@ -103,6 +107,26 @@ namespace Impostor.Server.Net.Inner.Objects.Components Rpc21SnapTo.Deserialize(reader, out var position, out var minSid); + _logger.LogInformation("SnapTo for {0}", NetId); + if (_spawnSnapAllowed) + { + _logger.LogInformation("SnapTo allowed for {0} {1}", NetId, _spawnSnapAllowed); + _spawnSnapAllowed = false; + + // Check if the snap position is the expected spawn point + var expectedPosition = Game.GameNet.ShipStatus?.GetSpawnLocation(_playerControl, Game.PlayerCount, _initialSpawn); + _logger.LogTrace("{0} / {1}", position, expectedPosition); + if (!Approximately(position, expectedPosition ?? Vector2.Zero)) + { + if (await sender.Client.ReportCheatAsync(call, "Failed to snap to the correct spawn point")) + { + return false; + } + } + + return true; + } + if (Game.GameNet.ShipStatus is InnerAirshipStatus airshipStatus) { // As part of airship spawning, clients are sending snap to -25 40 to move themself out of view @@ -169,8 +193,11 @@ namespace Impostor.Server.Net.Inner.Objects.Components _pool.Return(playerMovementEvent); } - internal void OnPlayerSpawn() + internal void OnPlayerSpawn(bool initialSpawn) { + _logger.LogInformation("Allowing spawn snap for {0}", NetId); + _spawnSnapAllowed = true; + _initialSpawn = initialSpawn; _spawnState = AirshipSpawnState.PreSpawn; } diff --git a/src/Impostor.Server/Net/State/Game.Data.cs b/src/Impostor.Server/Net/State/Game.Data.cs index 000ffd15..54b49876 100644 --- a/src/Impostor.Server/Net/State/Game.Data.cs +++ b/src/Impostor.Server/Net/State/Game.Data.cs @@ -249,6 +249,10 @@ namespace Impostor.Server.Net.State { var clientId = reader.ReadPackedInt32(); _logger.LogTrace("> IsReady {0}", clientId); + // Allow the host to snap immediately because the host tends to transmit a SnapTo to spawn immediately when starting the game + if (clientId == HostId) { + Host?.Character?.NetworkTransform.OnPlayerSpawn(true); + } break; } @@ -355,7 +359,7 @@ namespace Impostor.Server.Net.State { foreach (var player in _players.Values) { - player.Character?.NetworkTransform.OnPlayerSpawn(); + player.Character?.NetworkTransform.OnPlayerSpawn(false); } await _eventManager.CallAsync(new MeetingStartedEvent(this, meetingHud)); diff --git a/src/Impostor.Server/Net/State/Game.cs b/src/Impostor.Server/Net/State/Game.cs index dc75cc86..b2d6dc9c 100644 --- a/src/Impostor.Server/Net/State/Game.cs +++ b/src/Impostor.Server/Net/State/Game.cs @@ -119,12 +119,7 @@ namespace Impostor.Server.Net.State { foreach (var player in _players.Values) { - player.Character?.NetworkTransform.OnPlayerSpawn(); - - if (GameNet.ShipStatus != null) - { - await player.Character!.NetworkTransform.SetPositionAsync(player, GameNet.ShipStatus.GetSpawnLocation(player.Character, PlayerCount, true)); - } + player.Character?.NetworkTransform.OnPlayerSpawn(true); } GameState = GameStates.Started;