Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-15 08:25:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

rewrite EnumerateGuildMember

Browse Source
This commit is contained in:
wish
2023-04-23 21:48:13 +10:00
parent e61d6a60f3
commit 6fecfdd63f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/channelserver/handlers_guild.go
View File

@@ -1392,11 +1392,11 @@ func handleMsgMhfEnumerateGuildMember(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(member.GR) bf.WriteUint16(member.GR)
bf.WriteUint16(member.WeaponID) bf.WriteUint16(member.WeaponID)
if member.WeaponType == 1 || member.WeaponType == 5 || member.WeaponType == 10 { // If weapon is ranged if member.WeaponType == 1 || member.WeaponType == 5 || member.WeaponType == 10 { // If weapon is ranged
bf.WriteUint16(0x0700) bf.WriteUint8(7)
} else { } else {
bf.WriteUint16(0x0600) bf.WriteUint8(6)
} }
bf.WriteUint8(member.OrderIndex) bf.WriteUint16(member.OrderIndex)
bf.WriteBool(member.AvoidLeadership) bf.WriteBool(member.AvoidLeadership)
ps.Uint8(bf, member.Name, true) ps.Uint8(bf, member.Name, true)
} }

4
server/channelserver/handlers_guild_member.go
View File

@@ -17,7 +17,7 @@ type GuildMember struct {
RPYesterday uint16 `db:"rp_yesterday"` RPYesterday uint16 `db:"rp_yesterday"`
Name string `db:"name"` Name string `db:"name"`
IsApplicant bool `db:"is_applicant"` IsApplicant bool `db:"is_applicant"`
OrderIndex uint8 `db:"order_index"` OrderIndex uint16 `db:"order_index"`
LastLogin uint32 `db:"last_login"` LastLogin uint32 `db:"last_login"`
Recruiter bool `db:"recruiter"` Recruiter bool `db:"recruiter"`
AvoidLeadership bool `db:"avoid_leadership"` AvoidLeadership bool `db:"avoid_leadership"`
@@ -25,7 +25,7 @@ type GuildMember struct {
HRP uint16 `db:"hrp"` HRP uint16 `db:"hrp"`
GR uint16 `db:"gr"` GR uint16 `db:"gr"`
WeaponID uint16 `db:"weapon_id"` WeaponID uint16 `db:"weapon_id"`
WeaponType uint16 `db:"weapon_type"` WeaponType uint8 `db:"weapon_type"`
} }
func (gm *GuildMember) CanRecruit() bool { func (gm *GuildMember) CanRecruit() bool {