From f6aa4e97d827afa5068c88eac66e2841d8a4d00d Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Fri, 19 Jun 2020 17:53:04 +0200 Subject: [PATCH] Let the Innocents always win when the round ends because of time --- .../kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt | 8 ++------ .../moritzruth/spigot_ttt/game/players/PlayerManager.kt | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt index 263c0dd..7439fa9 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt @@ -46,7 +46,7 @@ object GameManager { packetListeners.forEach { ProtocolLibrary.getProtocolManager().addPacketListener(it) } } - fun letRoleWin(role: Role?) { + fun letRoleWin(role: Role) { ensurePhase(GamePhase.COMBAT) GameMessenger.win(role) phase = GamePhase.OVER @@ -165,11 +165,7 @@ object GameManager { GameMessenger.combatPhaseStarted() Timers.startCombatPhaseTimer { - if (PlayerManager.getStillLivingRoles().contains(Role.INNOCENT)) { - letRoleWin(Role.INNOCENT) - } else { - letRoleWin(null) - } + letRoleWin(Role.INNOCENT) } } diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/PlayerManager.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/PlayerManager.kt index abc89cb..65c2a77 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/PlayerManager.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/players/PlayerManager.kt @@ -22,7 +22,7 @@ object PlayerManager { private fun getAvailablePlayers() = plugin.server.onlinePlayers.filter { it.gameMode === GameMode.SURVIVAL } private fun getStillLivingRoleGroups() = getStillLivingRoles().map { it.group }.toSet() - fun getStillLivingRoles() = tttPlayers.filter { + private fun getStillLivingRoles() = tttPlayers.filter { it.alive || SecondChance.getInstance(it)?.preventRoundEnd == true }.map { it.role }.toSet()