From 85da0cc03d4a7d885fba5741fce47f92d4a854bf Mon Sep 17 00:00:00 2001
From: Moritz Ruth <dev@moritzruth.de>
Date: Sat, 13 Jun 2020 18:07:04 +0200
Subject: [PATCH] Fix role assignment

---
 settings.gradle.kts                                |  1 -
 .../spigot_ttt/game/corpses/TTTCorpse.kt           | 14 +++++++-------
 .../spigot_ttt/game/players/PlayerManager.kt       |  4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 614e0e3..11ff312 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1 @@
 rootProject.name = "spigot-ttt"
-
diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt
index 6e11a23..1d6601f 100644
--- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt
+++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/corpses/TTTCorpse.kt
@@ -3,10 +3,10 @@ package de.moritzruth.spigot_ttt.game.corpses
 import com.connorlinfoot.actionbarapi.ActionBarAPI
 import de.moritzruth.spigot_ttt.Resourcepack
 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.Role
 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.utils.applyMeta
 import de.moritzruth.spigot_ttt.utils.secondsToTicks
@@ -89,10 +89,10 @@ class TTTCorpse private constructor(
         setReasonItem()
     }
 
-    fun identify(tttPlayer: TTTPlayer, inspect: Boolean) {
+    fun identify(by: TTTPlayer, inspect: Boolean) {
         ensureNotDestroyed()
         if (status == Status.UNIDENTIFIED) {
-            GameMessenger.corpseIdentified(tttPlayer.player.displayName, tttPlayer.player.displayName, role)
+            GameMessenger.corpseIdentified(by.player.displayName, tttPlayer.player.displayName, role)
 
             if (!inspect) {
                 status = Status.IDENTIFIED
@@ -104,15 +104,15 @@ class TTTCorpse private constructor(
             setItems()
         }
 
-        if (credits != 0 && tttPlayer.role.canOwnCredits) {
+        if (credits != 0 && by.role.canOwnCredits) {
             val c = credits
             credits = 0
-            tttPlayer.credits += c
+            by.credits += c
 
             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  {
-                ActionBarAPI.sendActionBar(tttPlayer.player, "${ChatColor.GREEN}Du hast 1 Credit aufgesammelt")
+                ActionBarAPI.sendActionBar(by.player, "${ChatColor.GREEN}Du hast 1 Credit aufgesammelt")
             }
         }
     }
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 5897fd6..a12def9 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
@@ -104,14 +104,14 @@ object PlayerManager {
             playersWithoutRoleCount--
         }
 
-        if (playersWithoutRoleCount < 1 && Settings.detectiveEnabled) {
+        if (playersWithoutRoleCount > 1 && Settings.detectiveEnabled) {
             val player = playersWithoutRole.random()
             tttPlayers.add(TTTPlayer(player, Role.DETECTIVE))
             playersWithoutRole.remove(player)
             playersWithoutRoleCount--
         }
 
-        if (playersWithoutRoleCount < 1 &&  when (Settings.jackalMode) {
+        if (playersWithoutRoleCount > 1 && when (Settings.jackalMode) {
                 JackalMode.ALWAYS -> true
                 JackalMode.HALF_TIME -> Random.Default.nextBoolean()
                 JackalMode.NEVER -> false