Fix game states
This commit is contained in:
@@ -16,7 +16,7 @@ abstract class GameState(
|
||||
) {
|
||||
|
||||
private var tickTask: TaskRegistration? = null
|
||||
var remainingSeconds: Int = durationSeconds ?: 0
|
||||
private var remainingSeconds: Int = durationSeconds ?: 0
|
||||
private var isActive: Boolean = false
|
||||
|
||||
open fun onEnter(
|
||||
|
||||
@@ -28,7 +28,7 @@ class BattleState(
|
||||
{
|
||||
val win = checkForWinners()
|
||||
|
||||
when( remainingSeconds )
|
||||
when( getRemainingSeconds() )
|
||||
{
|
||||
300 ->
|
||||
{
|
||||
|
||||
@@ -27,7 +27,7 @@ class DeathmatchState(
|
||||
{
|
||||
checkForWinners()
|
||||
|
||||
when( remainingSeconds )
|
||||
when( getRemainingSeconds() )
|
||||
{
|
||||
0 ->
|
||||
{
|
||||
|
||||
@@ -49,7 +49,7 @@ class FeastState(
|
||||
|
||||
override fun onTick()
|
||||
{
|
||||
when( remainingSeconds )
|
||||
when( getRemainingSeconds() )
|
||||
{
|
||||
300 -> announce( AnnouncementType.MINUTES, 5 )
|
||||
240 -> announce( AnnouncementType.MINUTES, 4 )
|
||||
|
||||
@@ -48,7 +48,7 @@ class ImmunityState(
|
||||
|
||||
override fun onTick()
|
||||
{
|
||||
when( remainingSeconds )
|
||||
when( getRemainingSeconds() )
|
||||
{
|
||||
180 -> announce( AnnouncementType.MINUTES, 3 )
|
||||
120 -> announce( AnnouncementType.MINUTES, 2 )
|
||||
|
||||
@@ -42,10 +42,10 @@ class PreStartState(
|
||||
if ( !isStarting )
|
||||
return
|
||||
|
||||
if ( remainingSeconds == 15 )
|
||||
if ( getRemainingSeconds() == 15 )
|
||||
teleport()
|
||||
|
||||
when( remainingSeconds )
|
||||
when( getRemainingSeconds() )
|
||||
{
|
||||
300 -> announce( AnnouncementType.MINUTES, 5 )
|
||||
240 -> announce( AnnouncementType.MINUTES, 4 )
|
||||
|
||||
Reference in New Issue
Block a user