fix scout enumeration data

This commit is contained in:
wish
2023-03-12 23:43:30 +11:00
parent a2a4989cda
commit c344fdd4c9

View File

@@ -204,7 +204,7 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
} }
rows, err := s.server.db.Queryx(` rows, err := s.server.db.Queryx(`
SELECT c.id, c.name, ga.actor_id SELECT c.id, c.name, c.hrp, c.gr, ga.actor_id
FROM guild_applications ga FROM guild_applications ga
JOIN characters c ON c.id = ga.character_id JOIN characters c ON c.id = ga.character_id
WHERE ga.guild_id = $1 AND ga.application_type = 'invited' WHERE ga.guild_id = $1 AND ga.application_type = 'invited'
@@ -229,14 +229,14 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
for rows.Next() { for rows.Next() {
var charName string var charName string
var charID uint32 var charID, actorID uint32
var actorID uint32 var hrp, gr uint16
err = rows.Scan(&charID, &charName, &actorID) err = rows.Scan(&charID, &charName, &hrp, &gr, &actorID)
if err != nil { if err != nil {
doAckSimpleFail(s, pkt.AckHandle, nil) doAckSimpleFail(s, pkt.AckHandle, nil)
panic(err) continue
} }
// This seems to be used as a unique ID for the invitation sent // This seems to be used as a unique ID for the invitation sent
@@ -246,8 +246,8 @@ func handleMsgMhfGetGuildScoutList(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(actorID) bf.WriteUint32(actorID)
bf.WriteUint32(charID) bf.WriteUint32(charID)
bf.WriteUint32(uint32(TimeAdjusted().Unix())) bf.WriteUint32(uint32(TimeAdjusted().Unix()))
bf.WriteUint16(0x00) // HR? bf.WriteUint16(hrp) // HR?
bf.WriteUint16(0x00) // GR? bf.WriteUint16(gr) // GR?
bf.WriteBytes(stringsupport.PaddedString(charName, 32, true)) bf.WriteBytes(stringsupport.PaddedString(charName, 32, true))
count++ count++
} }