DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
DBotThePony 2024-04-04 01:00:48 +07:00
parent db09de857b
commit 55253f78d1
Signed by: DBot
GPG Key ID: DCC23B5715498507
5 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/kotlin/ru/dbotthepony/kstarbound/server/ServerConnection.kt
View File

@ -40,7 +40,6 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
var tracker: ServerWorldTracker? = null
var worldStartAcknowledged = false
var returnWarp: WarpAction? = null
var systemWorld: ServerSystemWorld? = null
val world: ServerWorld?
get() = tracker?.world
@ -193,7 +192,7 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
val params = GlobalDefaults.universeServer.findStarterWorldParameters
// visit all since sparsingly trying to find specific world is not healthy performance wise
var found = server.universe.findRandomWorld(params.tries, params.range, visitAll = true, predicate = {
val found = server.universe.findRandomWorld(params.tries, params.range, visitAll = true, predicate = {
if (++visited % 600 == 0) {
LOGGER.info("Still finding starter world for ${alias()}...")
}
@ -232,7 +231,7 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
LOGGER.info("Found appropriate starter world at $found for ${alias()}")
var world = server.loadSystemWorld(found.location).await()
var ship = world.addClient(this).await()
var ship = world.addClient(this, location = SystemWorldLocation.Celestial(found)).await()
shipWorld.sky.stopFlyingAt(ship.location.skyParameters(world))
shipCoordinate = found
@ -241,12 +240,10 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
while (true) {
val (system, location) = flyShipQueue.receive()
val currentSystem = systemWorld
if (system == currentSystem?.location) {
if (system == world.location) {
// fly ship in current system
currentFlightJob?.cancel()
val flight = currentSystem.flyShip(this, location)
val flight = world.flyShip(this, location)
shipWorld.mailbox.execute {
shipWorld.sky.startFlying(false)
@ -254,7 +251,7 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
currentFlightJob = scope.launch {
val coords = flight.await()
val action = coords.orbitalAction(currentSystem)
val action = coords.orbitalAction(world)
orbitalWarpAction = action
for (client in shipWorld.clients) {
@ -281,6 +278,7 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
continue
currentFlightJob?.cancel()
world.removeClient(this)
shipWorld.mailbox.execute {
shipWorld.sky.startFlying(true)
@ -290,15 +288,12 @@ class ServerConnection(val server: StarboundServer, type: ConnectionType) : Conn
val newSystem = server.loadSystemWorld(system)
shipCoordinate = UniversePos(system)
orbitalWarpAction = KOptional()
for (client in shipWorld.clients) {
client.client.orbitalWarpAction = KOptional()
}
delay((GlobalDefaults.universeServer.queuedFlightWaitTime * 1000L).toLong())
world = newSystem.await()
ship = world.addClient(this).await()

3
src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerSystemWorld.kt
View File

@ -91,9 +91,6 @@ class ServerSystemWorld : SystemWorld {
if (location == SystemWorldLocation.Transit)
location = SystemWorldLocation.Position(randomArrivalPosition())
client.systemWorld?.removeClient(client)
client.systemWorld = this
val objects = entities.values.map { it.writeNetwork(client.isLegacy) }
val ships = ships.values.map { it.writeNetwork(client.isLegacy) }

2
src/main/kotlin/ru/dbotthepony/kstarbound/server/world/ServerWorldTracker.kt
View File

@ -146,7 +146,7 @@ class ServerWorldTracker(val world: ServerWorld, val client: ServerConnection, p
}
run {
if (skyUpdateWaitTicks++ >= 4) {
if (skyUpdateWaitTicks++ >= 20) {
val (data, version) = world.sky.networkedGroup.write(skyVersion, isLegacy = client.isLegacy)
skyVersion = version
send(EnvironmentUpdatePacket(data, ByteArrayList()))

4
src/main/kotlin/ru/dbotthepony/kstarbound/world/Sky.kt
View File

@ -112,7 +112,9 @@ class Sky() {
fun stopFlyingAt(destination: SkyParameters) {
this.destination = destination
skyType = SkyType.ORBITAL
if (skyType != SkyType.WARP)
skyType = SkyType.ORBITAL
}
private var lastFlyingType = FlyingType.NONE

2
src/main/kotlin/ru/dbotthepony/kstarbound/world/SystemWorld.kt
View File

@ -218,7 +218,7 @@ abstract class SystemWorld(val location: Vector3i, val clock: Clock, val univers
// systemLocation should not be interpolated
// if it's stale it can point to a removed system object
var location by networkedData(location, SystemWorldLocation.CODEC, SystemWorldLocation.LEGACY_CODEC).also { networkGroup.upstream.add(it, false) }
var destination by networkedData(location, SystemWorldLocation.CODEC, SystemWorldLocation.LEGACY_CODEC).also { networkGroup.upstream.add(it, false) }
var destination by networkedData(SystemWorldLocation.Transit, SystemWorldLocation.CODEC, SystemWorldLocation.LEGACY_CODEC).also { networkGroup.upstream.add(it, false) }
var xPosition by networkedFloat().also { networkGroup.upstream.add(it); it.interpolator = Interpolator.Linear }
var yPosition by networkedFloat().also { networkGroup.upstream.add(it); it.interpolator = Interpolator.Linear }