Fix RegionTimestampsPacket issue

Let this be a warning against using "any"! :P
CivPlatform · Aug 15, 2023 · 6d32783 · 6d32783
1 parent 17c5cd2
commit 6d32783
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/server/src/database.ts b/server/src/database.ts
@@ -75,13 +75,15 @@ export function getRegionTimestamps(dimension: string) {
 	return get()
 		.selectFrom('player_chunk')
 		.select([
-			(eb) => kysely.sql<number>`floor(${eb.ref('chunk_x')} / 32.0)`.as('x'),
-			(eb) => kysely.sql<number>`floor(${eb.ref('chunk_z')} / 32.0)`.as('z'),
+			(eb) =>
+				kysely.sql<number>`floor(${eb.ref('chunk_x')} / 32.0)`.as('regionX'),
+			(eb) =>
+				kysely.sql<number>`floor(${eb.ref('chunk_z')} / 32.0)`.as('regionZ'),
 			(eb) => eb.fn.max('ts').as('timestamp'),
 		])
 		.where('world', '=', dimension)
-		.groupBy(['x', 'z'])
-		.orderBy('x', 'desc')
+		.groupBy(['regionX', 'regionZ'])
+		.orderBy('regionX', 'desc')
 		.execute()
 }
 

diff --git a/server/src/model.ts b/server/src/model.ts
@@ -1,3 +1,9 @@
+export interface CatchupRegion {
+	readonly regionX: number
+	readonly regionZ: number
+	readonly timestamp: number
+}
+
 export interface CatchupChunk {
 	world: string
 	chunk_x: number

diff --git a/server/src/protocol/RegionTimestampsPacket.ts b/server/src/protocol/RegionTimestampsPacket.ts
@@ -1,9 +1,10 @@
 import { BufWriter } from './BufWriter'
+import { CatchupRegion } from '../model'
 
 export interface RegionTimestampsPacket {
 	type: 'RegionTimestamps'
 	world: string
-	regions: any[]
+	regions: Array<CatchupRegion>
 }
 
 export namespace RegionTimestampsPacket {
@@ -13,10 +14,9 @@ export namespace RegionTimestampsPacket {
 		console.log('Sending regions ' + JSON.stringify(pkt.regions))
 		for (let i = 0; i < pkt.regions.length; i++) {
 			let region = pkt.regions[i]
-			writer.writeInt16(region.region_x)
-			writer.writeInt16(region.region_z)
-
-			writer.writeInt64(pkt.regions[i].ts)
+			writer.writeInt16(region.regionX)
+			writer.writeInt16(region.regionZ)
+			writer.writeInt64(region.timestamp)
 		}
 	}
 }