diff --git a/GameData.cs b/GameData.cs index cde608c..e14b0ea 100644 --- a/GameData.cs +++ b/GameData.cs @@ -63,7 +63,6 @@ public void eliminatePlayer(string username) { if (index < this.currentTurnIndex) { this.currentTurnIndex--; } - this.currentTurnIndex = this.currentTurnIndex % this.turnOrder.Count; } this.getPlayerByUsername(username).isSpectator = true; } diff --git a/Server.cs b/Server.cs index 84bc67e..3a8eabb 100644 --- a/Server.cs +++ b/Server.cs @@ -150,6 +150,8 @@ public async Task packetReceived(Client sender, ClientPacket packet) { case ShootPlayerPacket shootPlayerPacket: // Make sure it's the players turn if (sender.player == this.gameData.getCurrentPlayerForTurn()) { + // TODO subtract life, check for double damage, etc. + await broadcast(new PlayerShotPacket { target = shootPlayerPacket.target }); await this.nextTurn(); } break; @@ -188,7 +190,7 @@ public async Task nextTurn() { await broadcast(new TurnStartedPacket { username = playerForTurn.username }); if (playerForTurn.inGame == false) { - // await broadcast(new PlayerShot { target = playerForTurn.username }); + await broadcast(new PlayerShotPacket { target = playerForTurn.username }); await this.nextTurn(); } }