From 6aa075009ea80d67b081ebc5f6b344b9623d52fa Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Sun, 12 Mar 2023 23:31:39 +1100
Subject: [PATCH] timestamp fixes

---
 server/channelserver/handlers_guild_scout.go |  8 +++-----
 server/channelserver/sys_stage.go            |  4 ----
 server/signserver/dsgn_resp.go               | 11 +++++------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/server/channelserver/handlers_guild_scout.go b/server/channelserver/handlers_guild_scout.go
index 4b45cc93b..d171750d4 100644
--- a/server/channelserver/handlers_guild_scout.go
+++ b/server/channelserver/handlers_guild_scout.go
@@ -1,14 +1,12 @@
 package channelserver
 
 import (
-	"fmt"
-	"io"
-	"time"
-
 	"erupe-ce/common/byteframe"
 	"erupe-ce/common/stringsupport"
 	"erupe-ce/network/mhfpacket"
+	"fmt"
 	"go.uber.org/zap"
+	"io"
 )
 
 func handleMsgMhfPostGuildScout(s *Session, p mhfpacket.MHFPacket) {
@@ -247,7 +245,7 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
 		bf.WriteUint32(charID)
 		bf.WriteUint32(actorID)
 		bf.WriteUint32(charID)
-		bf.WriteUint32(uint32(time.Now().Unix()))
+		bf.WriteUint32(uint32(TimeAdjusted().Unix()))
 		bf.WriteUint16(0x00) // HR?
 		bf.WriteUint16(0x00) // GR?
 
diff --git a/server/channelserver/sys_stage.go b/server/channelserver/sys_stage.go
index 532ae60d4..b69995724 100644
--- a/server/channelserver/sys_stage.go
+++ b/server/channelserver/sys_stage.go
@@ -3,8 +3,6 @@ package channelserver
 import (
 	"sync"
 
-	"time"
-
 	"erupe-ce/common/byteframe"
 	"erupe-ce/network/mhfpacket"
 )
@@ -49,7 +47,6 @@ type Stage struct {
 	host       *Session
 	maxPlayers uint16
 	password   string
-	createdAt  string
 }
 
 // NewStage creates a new stage with intialized values.
@@ -62,7 +59,6 @@ func NewStage(ID string) *Stage {
 		objectIndex:         0,
 		rawBinaryData:       make(map[stageBinaryKey][]byte),
 		maxPlayers:          4,
-		createdAt:           time.Now().Format("01-02-2006 15:04:05"),
 	}
 	return s
 }
diff --git a/server/signserver/dsgn_resp.go b/server/signserver/dsgn_resp.go
index 3df3bdf71..7e9305434 100644
--- a/server/signserver/dsgn_resp.go
+++ b/server/signserver/dsgn_resp.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"go.uber.org/zap"
 	"strings"
-	"time"
 )
 
 func makeSignInFailureResp(respID RespID) []byte {
@@ -38,11 +37,11 @@ func (s *Session) makeSignInResp(uid int) []byte {
 	} else {
 		bf.WriteUint8(0)
 	}
-	bf.WriteUint8(1)                          // entrance server count
-	bf.WriteUint8(uint8(len(chars)))          // character count
-	bf.WriteUint32(0xFFFFFFFF)                // login_token_number
-	bf.WriteBytes([]byte(sessToken))          // login_token
-	bf.WriteUint32(uint32(time.Now().Unix())) // current time
+	bf.WriteUint8(1) // entrance server count
+	bf.WriteUint8(uint8(len(chars)))
+	bf.WriteUint32(0xFFFFFFFF) // login_token_number
+	bf.WriteBytes([]byte(sessToken))
+	bf.WriteUint32(uint32(channelserver.TimeAdjusted().Unix()))
 	if s.server.erupeConfig.DevMode {
 		if s.server.erupeConfig.PatchServerManifest != "" && s.server.erupeConfig.PatchServerFile != "" {
 			ps.Uint8(bf, s.server.erupeConfig.PatchServerManifest, false)