From aad3b088b98ec8b46c2023ad6584105b4a4765a7 Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Sun, 5 Oct 2025 16:14:39 +1100
Subject: [PATCH] alpelo object system backport test commit

---
 server/channelserver/handlers_stage.go     | 19 +++++-------
 server/channelserver/sys_channel_server.go | 36 +++++++++++-----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/server/channelserver/handlers_stage.go b/server/channelserver/handlers_stage.go
index 53ea9f868..eb59f2bcb 100644
--- a/server/channelserver/handlers_stage.go
+++ b/server/channelserver/handlers_stage.go
@@ -75,17 +75,14 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
 			if s == session || !session.loaded {
 				continue
 			}
-			temp = &mhfpacket.MsgSysInsertUser{CharID: session.charID}
-			newNotif.WriteUint16(uint16(temp.Opcode()))
-			temp.Build(newNotif, s.clientContext)
-			for i := 0; i < 3; i++ {
-				temp = &mhfpacket.MsgSysNotifyUserBinary{
-					CharID:     session.charID,
-					BinaryType: uint8(i + 1),
-				}
-				newNotif.WriteUint16(uint16(temp.Opcode()))
-				temp.Build(newNotif, s.clientContext)
-			}
+			session.QueueSendMHF(&mhfpacket.MsgSysInsertUser{CharID: s.charID})
+			session.QueueSendMHF(&mhfpacket.MsgSysNotifyUserBinary{CharID: s.charID, BinaryType: 1})
+			session.QueueSendMHF(&mhfpacket.MsgSysNotifyUserBinary{CharID: s.charID, BinaryType: 2})
+			session.QueueSendMHF(&mhfpacket.MsgSysNotifyUserBinary{CharID: s.charID, BinaryType: 3})
+			s.QueueSendMHF(&mhfpacket.MsgSysInsertUser{CharID: session.charID})
+			s.QueueSendMHF(&mhfpacket.MsgSysNotifyUserBinary{CharID: session.charID, BinaryType: 1})
+			s.QueueSendMHF(&mhfpacket.MsgSysNotifyUserBinary{CharID: session.charID, BinaryType: 2})
+			s.QueueSendMHF(&mhfpacket.MsgSysNotifyUserBinary{CharID: session.charID, BinaryType: 3})
 		}
 	}
 
diff --git a/server/channelserver/sys_channel_server.go b/server/channelserver/sys_channel_server.go
index 252a64d5c..16def7021 100644
--- a/server/channelserver/sys_channel_server.go
+++ b/server/channelserver/sys_channel_server.go
@@ -38,17 +38,17 @@ type userBinaryPartID struct {
 // Server is a MHF channel server.
 type Server struct {
 	sync.Mutex
-	Channels       []*Server
-	ID             uint16
-	GlobalID       string
-	IP             string
-	Port           uint16
-	logger         *zap.Logger
-	db             *sqlx.DB
-	erupeConfig    *_config.Config
-	acceptConns    chan net.Conn
-	deleteConns    chan net.Conn
-	sessions       map[net.Conn]*Session
+	Channels    []*Server
+	ID          uint16
+	GlobalID    string
+	IP          string
+	Port        uint16
+	logger      *zap.Logger
+	db          *sqlx.DB
+	erupeConfig *_config.Config
+	acceptConns chan net.Conn
+	deleteConns chan net.Conn
+	sessions    map[net.Conn]*Session
 	//objectIDs      map[*Session]uint16
 	listener       net.Listener // Listener that is created when Server.Start is called.
 	isShuttingDown bool
@@ -148,13 +148,13 @@ func (s *Server) UpdateRavi(semaID uint32, index uint8, value uint32, update boo
 // NewServer creates a new Server type.
 func NewServer(config *Config) *Server {
 	s := &Server{
-		ID:              config.ID,
-		logger:          config.Logger,
-		db:              config.DB,
-		erupeConfig:     config.ErupeConfig,
-		acceptConns:     make(chan net.Conn),
-		deleteConns:     make(chan net.Conn),
-		sessions:        make(map[net.Conn]*Session),
+		ID:          config.ID,
+		logger:      config.Logger,
+		db:          config.DB,
+		erupeConfig: config.ErupeConfig,
+		acceptConns: make(chan net.Conn),
+		deleteConns: make(chan net.Conn),
+		sessions:    make(map[net.Conn]*Session),
 		//objectIDs:       make(map[*Session]uint16),
 		stages:          make(map[string]*Stage),
 		userBinaryParts: make(map[userBinaryPartID][]byte),