From 374d0ef8a5902b2d5142d3b10a79e3cb154efe32 Mon Sep 17 00:00:00 2001 From: Tooze Date: Sun, 24 May 2026 10:34:54 -0400 Subject: [PATCH] Waiting room time for next wave set to 30 seconds --- .../main/content/minigame/barbassault/arena/BAGroundSpawn.kt | 2 +- .../src/main/content/minigame/barbassault/arena/BASession.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/src/main/content/minigame/barbassault/arena/BAGroundSpawn.kt b/Server/src/main/content/minigame/barbassault/arena/BAGroundSpawn.kt index 31a999f28..087845973 100644 --- a/Server/src/main/content/minigame/barbassault/arena/BAGroundSpawn.kt +++ b/Server/src/main/content/minigame/barbassault/arena/BAGroundSpawn.kt @@ -7,7 +7,7 @@ import core.game.world.GameWorld import core.game.world.map.Location class BAGroundSpawn(private var session: BarbassaultSession, private var respawnRate: Int, item: Item?, location: Location?, - var flag: Boolean? = null) : GroundItem(item, location) { + var flag: Boolean? = null,lureRange: Int = 4) : GroundItem(item, location) { private var active = true private var autoSpawn = true diff --git a/Server/src/main/content/minigame/barbassault/arena/BASession.kt b/Server/src/main/content/minigame/barbassault/arena/BASession.kt index 208d00473..cb73c4b5c 100644 --- a/Server/src/main/content/minigame/barbassault/arena/BASession.kt +++ b/Server/src/main/content/minigame/barbassault/arena/BASession.kt @@ -69,7 +69,7 @@ class BarbassaultSession( val activity: BAActivity ? = null) :LogoutListener, M val scoreManager = BarbScoreManager() val eventBus = BarbAssEventBus() - private val countDoown = if(GameWorld.settings?.isDevMode == true) 10 else 60 + private val countDoown = if(GameWorld.settings?.isDevMode == true) 10 else 30 private var countdownPulse: Pulse? = null @@ -127,7 +127,7 @@ class BarbassaultSession( val activity: BAActivity ? = null) :LogoutListener, M private fun startCountdown(quickStart: Boolean) { var ticks = secondsToTicks(countDoown)//60 - if(!quickStart){ team.allPlayers().forEach { openOverlay(it, 494);setInterfaceText(it, "60", 494, 0) } } + if(!quickStart){ team.allPlayers().forEach { openOverlay(it, 494);setInterfaceText(it, "30", 494, 0) } } countdownPulse = object : Pulse(1) { override fun pulse(): Boolean { if (state != BarbassaultState.STARTING) return true