moritzruth/spigot-ttt
Archived
1
0
Fork 0
Code Activity

Heal all players after the preparing phase

Browse source
This commit is contained in:
Moritz Ruth 2020-06-22 16:58:03 +02:00
parent ab2b1ea3b8
commit a6ca587655
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/kotlin/de/moritzruth/spigot_ttt/game/GameManager.kt
View file

@ -15,7 +15,6 @@ import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.worlds.TTTWorld import de.moritzruth.spigot_ttt.game.worlds.TTTWorld
import de.moritzruth.spigot_ttt.plugin import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.call import de.moritzruth.spigot_ttt.utils.call
import de.moritzruth.spigot_ttt.utils.heartsToHealth
import org.bukkit.* import org.bukkit.*
import org.bukkit.block.Block import org.bukkit.block.Block
import kotlin.random.Random import kotlin.random.Random
@ -130,10 +129,7 @@ object GameManager {
setGameRule(GameRule.DO_WEATHER_CYCLE, true) setGameRule(GameRule.DO_WEATHER_CYCLE, true)
} }
PlayerManager.tttPlayers.forEach { PlayerManager.tttPlayers.forEach { it.addDefaultClassItems() }
it.addDefaultClassItems()
it.player.health = heartsToHealth(10.0)
}
GameMessenger.preparingPhaseStarted() GameMessenger.preparingPhaseStarted()
Timers.playTimerSound() Timers.playTimerSound()
@ -148,17 +144,15 @@ object GameManager {
ensurePhase(GamePhase.PREPARING) ensurePhase(GamePhase.PREPARING)
phase = GamePhase.COMBAT phase = GamePhase.COMBAT
PlayerManager.tttPlayers.forEach { for (tttPlayer in PlayerManager.tttPlayers) {
Shop.setItems(it) Shop.setItems(tttPlayer)
if (!it.alive) { if (tttPlayer.alive) tttPlayer.player.health = 20.0
it.revive(world.spawnLocation, Settings.initialCredits) else tttPlayer.revive(world.spawnLocation, Settings.initialCredits)
}
if (it.role.group.canUseTeamChat) { if (tttPlayer.role.group.canUseTeamChat) {
it.player.sendMessage( tttPlayer.player.sendMessage("${TTTPlugin.prefix}${ChatColor.GOLD}Schreibe einen Punkt vor deine " +
"${TTTPlugin.prefix}${ChatColor.GOLD}Schreibe einen Punkt vor deine Nachrichten, um den " + "Nachrichten, um den Team-Chat zu verwenden.")
"Team-Chat zu verwenden.")
} }
} }