From e0176ca774454a77eca9a1dde86b3f0703a0bd85 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 4 Sep 2022 16:40:06 +1000 Subject: [PATCH] indexing changes and add world description --- main.go | 7 ++----- patch-schema/servers_info.sql | 13 ++++++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main.go b/main.go index b222e0ec9..a9c796f29 100644 --- a/main.go +++ b/main.go @@ -174,9 +174,7 @@ func main() { ci := 0 count := 1 for _, ee := range erupeConfig.Entrance.Entries { - cn := 1 - - for _, ce := range ee.Channels { + for i, ce := range ee.Channels { sid := (4096 + si*256) + (16 + ci) c := *channelserver.NewServer(&channelserver.Config{ ID: uint16(sid), @@ -195,13 +193,12 @@ func main() { if err != nil { preventClose(fmt.Sprintf("Failed to start channel server: %s", err.Error())) } else { - channelQuery += fmt.Sprintf("INSERT INTO servers (server_id, season, current_players, world_name, land) VALUES (%d, %d, 0, '%s', %d);", sid, si%3, ee.Name, cn) + channelQuery += fmt.Sprintf(`INSERT INTO servers (server_id, season, current_players, world_name, world_description, land) VALUES (%d, %d, 0, '%s', '%s', %d);`, sid, si%3, ee.Name, ee.Description, i+1) channels = append(channels, &c) logger.Info(fmt.Sprintf("Started channel server %d on port %d", count, ce.Port)) ci++ count++ } - cn++ } ci = 0 si++ diff --git a/patch-schema/servers_info.sql b/patch-schema/servers_info.sql index c514b8e12..06389b6ed 100644 --- a/patch-schema/servers_info.sql +++ b/patch-schema/servers_info.sql @@ -7,14 +7,17 @@ CREATE TABLE IF NOT EXISTS public.servers season integer NOT NULL, current_players integer NOT NULL, world_name text COLLATE pg_catalog."default", + world_description text, land integer -) +); +ALTER TABLE public.servers + ADD COLUMN IF NOT EXISTS land integer; -ALTER TABLE IF EXISTS public.servers - ADD COLUMN land integer; +ALTER TABLE public.servers + ADD COLUMN IF NOT EXISTS world_name text COLLATE pg_catalog."default"; -ALTER TABLE IF EXISTS public.servers - ADD COLUMN world_name text COLLATE pg_catalog."default"; +ALTER TABLE public.servers + ADD COLUMN IF NOT EXISTS world_description text; END; \ No newline at end of file