From ed9fef9bc3ca180d61ad1e609c5105aaa9cd84a2 Mon Sep 17 00:00:00 2001 From: Hexagon Date: Thu, 22 Jun 2023 10:56:26 -0300 Subject: [PATCH] player-data-struct: move 'game' variable to inside the PlayerData struct --- game/packet/server.go | 1 - game/server/auth.go | 2 +- pangya/player.go | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/game/packet/server.go b/game/packet/server.go index a77056f..93dc18b 100755 --- a/game/packet/server.go +++ b/game/packet/server.go @@ -137,7 +137,6 @@ type ServerChannelList struct { type PlayerMainData struct { ClientVersion common.PString ServerVersion common.PString - Game uint16 PlayerData pangya.PlayerData Unknown2 [321]byte } diff --git a/game/server/auth.go b/game/server/auth.go index ad2cf75..d06b42b 100644 --- a/game/server/auth.go +++ b/game/server/auth.go @@ -70,6 +70,7 @@ func (c *Conn) handleAuth(ctx context.Context) error { // TODO: need data modelling c.playerData = pangya.PlayerData{ + Game: 0xFFFF, UserInfo: pangya.PlayerInfo{ Username: c.player.Username, Nickname: c.player.Nickname.String, @@ -105,7 +106,6 @@ func (c *Conn) handleAuth(ctx context.Context) error { MainData: &gamepacket.PlayerMainData{ ClientVersion: common.ToPString("824.00"), ServerVersion: common.ToPString("Pangbox"), - Game: 0xFFFF, PlayerData: c.playerData, }, }) diff --git a/pangya/player.go b/pangya/player.go index 27e17d5..52e02d0 100755 --- a/pangya/player.go +++ b/pangya/player.go @@ -194,6 +194,7 @@ type PlayerMascotData struct { } type PlayerData struct { + Game uint16 UserInfo PlayerInfo PlayerStats PlayerStats Trophy [13][3]uint16