From 6fecfdd63f722c4201e97c45b8b6d48190e243cd Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 23 Apr 2023 21:48:13 +1000 Subject: [PATCH] rewrite EnumerateGuildMember --- server/channelserver/handlers_guild.go | 6 +++--- server/channelserver/handlers_guild_member.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/channelserver/handlers_guild.go b/server/channelserver/handlers_guild.go index 06f3b0692..09520d8c4 100644 --- a/server/channelserver/handlers_guild.go +++ b/server/channelserver/handlers_guild.go @@ -1392,11 +1392,11 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) { bf.WriteUint16(member.GR) bf.WriteUint16(member.WeaponID) if member.WeaponType == 1 || member.WeaponType == 5 || member.WeaponType == 10 { // If weapon is ranged - bf.WriteUint16(0x0700) + bf.WriteUint8(7) } else { - bf.WriteUint16(0x0600) + bf.WriteUint8(6) } - bf.WriteUint8(member.OrderIndex) + bf.WriteUint16(member.OrderIndex) bf.WriteBool(member.AvoidLeadership) ps.Uint8(bf, member.Name, true) } diff --git a/server/channelserver/handlers_guild_member.go b/server/channelserver/handlers_guild_member.go index 47387bffe..e053e2498 100644 --- a/server/channelserver/handlers_guild_member.go +++ b/server/channelserver/handlers_guild_member.go @@ -17,7 +17,7 @@ type GuildMember struct { RPYesterday uint16 `db:"rp_yesterday"` Name string `db:"name"` IsApplicant bool `db:"is_applicant"` - OrderIndex uint8 `db:"order_index"` + OrderIndex uint16 `db:"order_index"` LastLogin uint32 `db:"last_login"` Recruiter bool `db:"recruiter"` AvoidLeadership bool `db:"avoid_leadership"` @@ -25,7 +25,7 @@ type GuildMember struct { HRP uint16 `db:"hrp"` GR uint16 `db:"gr"` WeaponID uint16 `db:"weapon_id"` - WeaponType uint16 `db:"weapon_type"` + WeaponType uint8 `db:"weapon_type"` } func (gm *GuildMember) CanRecruit() bool {