diff --git a/Server/src/main/content/minigame/barbassault/arena/BASession.kt b/Server/src/main/content/minigame/barbassault/arena/BASession.kt
index c0d32f39d..545554e83 100644
--- a/Server/src/main/content/minigame/barbassault/arena/BASession.kt
+++ b/Server/src/main/content/minigame/barbassault/arena/BASession.kt
@@ -5,18 +5,11 @@ import content.minigame.barbassault.BA_SESSION_KEY
 import content.minigame.barbassault.BarbRole
 import content.minigame.barbassault.BAActivity
 import content.minigame.barbassault.LureItems
-import content.minigame.barbassault.arena.BarbassaultSession.EggColor.BLUE
-import content.minigame.barbassault.arena.BarbassaultSession.EggColor.GREEN
-import content.minigame.barbassault.arena.BarbassaultSession.EggColor.RED
-import content.minigame.barbassault.arena.BarbassaultSession.LureFood.CRACKERS
-import content.minigame.barbassault.arena.BarbassaultSession.LureFood.TOFU
-import content.minigame.barbassault.arena.BarbassaultSession.LureFood.WORMS
 import content.minigame.barbassault.arena.scenery.EggCannon
 import content.minigame.barbassault.arena.scenery.GloryHorn
 import content.minigame.barbassault.getBALevels
 import content.minigame.barbassault.getBASession
 import content.minigame.barbassault.getBAWave
-
 import content.minigame.barbassault.lobby.*
 import content.minigame.barbassault.lobby.BALobby.Companion.waveLobbies
 import core.api.*
@@ -59,10 +52,10 @@ class BarbassaultSession(  val activity: BAActivity ? = null) :LogoutListener, M
     val sessionNpcs = mutableListOf<NPC>()
     var currentNPCCount = SpawnCaps(0,0,0,0)
     var npcTunnel: List<PenanceNpcTunnel> = listOf(
-        PenanceNpcTunnel(PenanceType.RUNNER,location(0,0,0),location(42,46,0),Direction.SOUTH),
-        PenanceNpcTunnel(PenanceType.HEALER,location(0,0,0),location(36,47,0),Direction.SOUTH),
-        PenanceNpcTunnel(PenanceType.FIGHTER,location(0,0,0),location(24,47,0),Direction.SOUTH),
-        PenanceNpcTunnel(PenanceType.RANGER,location(0,0,0),location(18,46,0),Direction.SOUTH) )
+        PenanceNpcTunnel(PenanceType.RANGER,location(17,47,0),location(18,46,0),Direction.SOUTH),
+        PenanceNpcTunnel(PenanceType.FIGHTER,location(23,48,0),location(24,47,0),Direction.SOUTH),
+        PenanceNpcTunnel(PenanceType.HEALER,location(35,48,0),location(36,47,0),Direction.SOUTH),
+        PenanceNpcTunnel(PenanceType.RUNNER,location(41,47,0),location(42,46,0),Direction.SOUTH))
     private val caveBlocked = mutableMapOf<PenanceType, Boolean>()
 
     val BAgroundItems = mutableListOf<BAGroundSpawn>()