From b64007a5f2b4332e6df36e5266ec4029853086d2 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 31 Dec 2023 17:39:11 -0500 Subject: [PATCH] Fix minor issues with session data handling --- .gitignore | 1 + api/generic.go | 10 ++++++++-- api/savedata-defs.go | 1 - 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 38c5925..bd33cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ pokerogue-server.exe +userdata/* diff --git a/api/generic.go b/api/generic.go index 2ce158b..c8f4c9f 100644 --- a/api/generic.go +++ b/api/generic.go @@ -1,6 +1,9 @@ package api -import "net/http" +import ( + "encoding/gob" + "net/http" +) type Server struct { Debug bool @@ -11,13 +14,16 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.Header().Set("Access-Control-Allow-Headers", "*") w.Header().Set("Access-Control-Allow-Methods", "*") w.Header().Set("Access-Control-Allow-Origin", "*") - + if r.Method == "OPTIONS" { w.WriteHeader(http.StatusOK) return } } + gob.Register([]interface{}{}) + gob.Register(map[string]interface{}{}) + switch r.URL.Path { case "/account/info": s.HandleAccountInfo(w, r) diff --git a/api/savedata-defs.go b/api/savedata-defs.go index 41d61ee..84435ce 100644 --- a/api/savedata-defs.go +++ b/api/savedata-defs.go @@ -46,7 +46,6 @@ type SessionSaveData struct { GameMode GameMode `json:"gameMode"` Party []PokemonData `json:"party"` EnemyParty []PokemonData `json:"enemyParty"` - EnemyField []PokemonData `json:"enemyField"` Modifiers []PersistentModifierData `json:"modifiers"` EnemyModifiers []PersistentModifierData `json:"enemyModifiers"` Arena ArenaData `json:"arena"`