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

Fix role assignment

Browse source
This commit is contained in:
Moritz Ruth 2020-06-13 18:07:04 +02:00
parent 983e4b32a5
commit 85da0cc03d
No known key found for this signature in database
GPG key ID: AFD57E23E753841B
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
settings.gradle.kts
View file

@ -1,2 +1 @@
rootProject.name = "spigot-ttt" rootProject.name = "spigot-ttt"

14
src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt
View file

@ -3,10 +3,10 @@ package de.moritzruth.spigot_ttt.game.corpses
import com.connorlinfoot.actionbarapi.ActionBarAPI import com.connorlinfoot.actionbarapi.ActionBarAPI
import de.moritzruth.spigot_ttt.Resourcepack import de.moritzruth.spigot_ttt.Resourcepack
import de.moritzruth.spigot_ttt.game.GameMessenger import de.moritzruth.spigot_ttt.game.GameMessenger
import de.moritzruth.spigot_ttt.game.items.impl.weapons.guns.Pistol
import de.moritzruth.spigot_ttt.game.players.DeathReason import de.moritzruth.spigot_ttt.game.players.DeathReason
import de.moritzruth.spigot_ttt.game.players.Role import de.moritzruth.spigot_ttt.game.players.Role
import de.moritzruth.spigot_ttt.game.players.TTTPlayer import de.moritzruth.spigot_ttt.game.players.TTTPlayer
import de.moritzruth.spigot_ttt.game.items.impl.weapons.guns.Pistol
import de.moritzruth.spigot_ttt.plugin import de.moritzruth.spigot_ttt.plugin
import de.moritzruth.spigot_ttt.utils.applyMeta import de.moritzruth.spigot_ttt.utils.applyMeta
import de.moritzruth.spigot_ttt.utils.secondsToTicks import de.moritzruth.spigot_ttt.utils.secondsToTicks
@ -89,10 +89,10 @@ class TTTCorpse private constructor(
setReasonItem() setReasonItem()
} }
fun identify(tttPlayer: TTTPlayer, inspect: Boolean) { fun identify(by: TTTPlayer, inspect: Boolean) {
ensureNotDestroyed() ensureNotDestroyed()
if (status == Status.UNIDENTIFIED) { if (status == Status.UNIDENTIFIED) {
GameMessenger.corpseIdentified(tttPlayer.player.displayName, tttPlayer.player.displayName, role) GameMessenger.corpseIdentified(by.player.displayName, tttPlayer.player.displayName, role)
if (!inspect) { if (!inspect) {
status = Status.IDENTIFIED status = Status.IDENTIFIED
@ -104,15 +104,15 @@ class TTTCorpse private constructor(
setItems() setItems()
} }
if (credits != 0 && tttPlayer.role.canOwnCredits) { if (credits != 0 && by.role.canOwnCredits) {
val c = credits val c = credits
credits = 0 credits = 0
tttPlayer.credits += c by.credits += c
if (c > 1) { if (c > 1) {
ActionBarAPI.sendActionBar(tttPlayer.player, "${ChatColor.GREEN}Du hast $c Credits aufgesammelt") ActionBarAPI.sendActionBar(by.player, "${ChatColor.GREEN}Du hast $c Credits aufgesammelt")
} else { } else {
ActionBarAPI.sendActionBar(tttPlayer.player, "${ChatColor.GREEN}Du hast 1 Credit aufgesammelt") ActionBarAPI.sendActionBar(by.player, "${ChatColor.GREEN}Du hast 1 Credit aufgesammelt")
} }
} }
} }

4
src/main/kotlin/de/moritzruth/spigot_ttt/game/players/PlayerManager.kt
View file

@ -104,14 +104,14 @@ object PlayerManager {
playersWithoutRoleCount-- playersWithoutRoleCount--
} }
if (playersWithoutRoleCount < 1 && Settings.detectiveEnabled) { if (playersWithoutRoleCount > 1 && Settings.detectiveEnabled) {
val player = playersWithoutRole.random() val player = playersWithoutRole.random()
tttPlayers.add(TTTPlayer(player, Role.DETECTIVE)) tttPlayers.add(TTTPlayer(player, Role.DETECTIVE))
playersWithoutRole.remove(player) playersWithoutRole.remove(player)
playersWithoutRoleCount-- playersWithoutRoleCount--
} }
if (playersWithoutRoleCount < 1 && when (Settings.jackalMode) { if (playersWithoutRoleCount > 1 && when (Settings.jackalMode) {
JackalMode.ALWAYS -> true JackalMode.ALWAYS -> true
JackalMode.HALF_TIME -> Random.Default.nextBoolean() JackalMode.HALF_TIME -> Random.Default.nextBoolean()
JackalMode.NEVER -> false JackalMode.NEVER -> false