diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/GameState.kt b/src/main/kotlin/club/mcscrims/speedhg/game/GameState.kt index 04c2ea4..cba20c0 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/GameState.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/GameState.kt @@ -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( diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/impl/BattleState.kt b/src/main/kotlin/club/mcscrims/speedhg/game/impl/BattleState.kt index 6a4b21b..41c092b 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/impl/BattleState.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/impl/BattleState.kt @@ -28,7 +28,7 @@ class BattleState( { val win = checkForWinners() - when( remainingSeconds ) + when( getRemainingSeconds() ) { 300 -> { diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/impl/DeathmatchState.kt b/src/main/kotlin/club/mcscrims/speedhg/game/impl/DeathmatchState.kt index d856202..dafba99 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/impl/DeathmatchState.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/impl/DeathmatchState.kt @@ -27,7 +27,7 @@ class DeathmatchState( { checkForWinners() - when( remainingSeconds ) + when( getRemainingSeconds() ) { 0 -> { diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/impl/FeastState.kt b/src/main/kotlin/club/mcscrims/speedhg/game/impl/FeastState.kt index 1f53273..ba5aa93 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/impl/FeastState.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/impl/FeastState.kt @@ -49,7 +49,7 @@ class FeastState( override fun onTick() { - when( remainingSeconds ) + when( getRemainingSeconds() ) { 300 -> announce( AnnouncementType.MINUTES, 5 ) 240 -> announce( AnnouncementType.MINUTES, 4 ) diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/impl/ImmunityState.kt b/src/main/kotlin/club/mcscrims/speedhg/game/impl/ImmunityState.kt index 6e4d98b..e96dc4c 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/impl/ImmunityState.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/impl/ImmunityState.kt @@ -48,7 +48,7 @@ class ImmunityState( override fun onTick() { - when( remainingSeconds ) + when( getRemainingSeconds() ) { 180 -> announce( AnnouncementType.MINUTES, 3 ) 120 -> announce( AnnouncementType.MINUTES, 2 ) diff --git a/src/main/kotlin/club/mcscrims/speedhg/game/impl/PreStartState.kt b/src/main/kotlin/club/mcscrims/speedhg/game/impl/PreStartState.kt index 7aeb5fb..1d706f4 100644 --- a/src/main/kotlin/club/mcscrims/speedhg/game/impl/PreStartState.kt +++ b/src/main/kotlin/club/mcscrims/speedhg/game/impl/PreStartState.kt @@ -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 )