From 7d884da93823efbdc130927a66a74fecfd95ae12 Mon Sep 17 00:00:00 2001 From: wish Date: Fri, 31 Mar 2023 00:04:51 +1100 Subject: [PATCH] replace deprecated code --- server/channelserver/handlers_data.go | 3 +-- server/channelserver/handlers_mercenary.go | 3 +-- server/channelserver/handlers_rengoku.go | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/channelserver/handlers_data.go b/server/channelserver/handlers_data.go index 36dd2e596..64b14072c 100644 --- a/server/channelserver/handlers_data.go +++ b/server/channelserver/handlers_data.go @@ -5,7 +5,6 @@ import ( "erupe-ce/common/stringsupport" "fmt" "io" - "io/ioutil" "os" "path/filepath" @@ -260,7 +259,7 @@ func dumpSaveData(s *Session, data []byte, suffix string) { func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfLoaddata) if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin")); err == nil { - data, _ := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin")) + data, _ := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "save_override.bin")) doAckBufSucceed(s, pkt.AckHandle, data) return } diff --git a/server/channelserver/handlers_mercenary.go b/server/channelserver/handlers_mercenary.go index e44d9f1f2..251bc107b 100644 --- a/server/channelserver/handlers_mercenary.go +++ b/server/channelserver/handlers_mercenary.go @@ -8,7 +8,6 @@ import ( "erupe-ce/server/channelserver/compression/nullcomp" "go.uber.org/zap" "io" - "io/ioutil" "os" "path/filepath" "time" @@ -292,7 +291,7 @@ func handleMsgMhfEnumerateAiroulist(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfEnumerateAiroulist) resp := byteframe.NewByteFrame() if _, err := os.Stat(filepath.Join(s.server.erupeConfig.BinPath, "airoulist.bin")); err == nil { - data, _ := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "airoulist.bin")) + data, _ := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "airoulist.bin")) resp.WriteBytes(data) doAckBufSucceed(s, pkt.AckHandle, resp.Data()) return diff --git a/server/channelserver/handlers_rengoku.go b/server/channelserver/handlers_rengoku.go index 732cb77ef..63a591fd2 100644 --- a/server/channelserver/handlers_rengoku.go +++ b/server/channelserver/handlers_rengoku.go @@ -4,7 +4,7 @@ import ( ps "erupe-ce/common/pascalstring" "fmt" "github.com/jmoiron/sqlx" - "io/ioutil" + "os" "path/filepath" "erupe-ce/common/byteframe" @@ -92,7 +92,7 @@ func handleMsgMhfLoadRengokuData(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGetRengokuBinary(s *Session, p mhfpacket.MHFPacket) { pkt := p.(*mhfpacket.MsgMhfGetRengokuBinary) // a (massively out of date) version resides in the game's /dat/ folder or up to date can be pulled from packets - data, err := ioutil.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "rengoku_data.bin")) + data, err := os.ReadFile(filepath.Join(s.server.erupeConfig.BinPath, "rengoku_data.bin")) if err != nil { panic(err) }