Leahnaya/wfc-server
1
0
Fork 0
mirror of https://github.com/WiiLink24/wfc-server.git synced 2026-03-21 17:44:58 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix incorrect clamping when sending qr2 kick order

Browse Source 
Clamped list of pids would only be assigned when actual clamping
occured, so when kicking <30 players nothing would happen...
This commit is contained in:
ppeb 2025-04-20 14:23:09 -05:00
parent c0e6817106
commit 9ca7b3c8e4
No known key found for this signature in database
GPG Key ID: CC147AD1B3D318D0
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
qr2/group.go
View File

@ -590,18 +590,13 @@ func OrderKickFromGroups(profilesToKick []uint32) {
// byte for length, that leaves 120 bytes worth of pids, thus 30 4-byte
// integers. Surely more than 30 online pids won't match at once :)
var profilesClamped []uint32
if len(profilesToKick) > 30 {
profilesClamped = profilesToKick[0:30]
}
moduleName := "QR2:OrderKickFromGroup/"
clampedLen := len(profilesClamped)
for i, pid := range profilesClamped {
moduleName += strconv.FormatUint(uint64(pid), 10)
iterMax := min(len(profilesToKick), 30)
for i := 0; i < iterMax; i++ {
moduleName += strconv.FormatUint(uint64(profilesToKick[i]), 10)
if i != clampedLen {
if i+1 != iterMax {
moduleName += ", "
}
}
@ -612,10 +607,11 @@ func OrderKickFromGroups(profilesToKick []uint32) {
var numSent int = 0
for _, session := range sessions {
message := createResponseHeader(ClientKickPeerOrder, session.SessionID) // 7 byte header
message = append(message, byte(len(profilesClamped))) // 1 byte len
message = append(message, byte(iterMax)) // 1 byte len
for _, pid := range profilesClamped {
message = binary.BigEndian.AppendUint32(message, pid) // All 4 bytes, preserves alignment
for i := 0; i < iterMax; i++ {
// All 4 bytes, preserves alignment
message = binary.BigEndian.AppendUint32(message, profilesToKick[i])
}
_, err := masterConn.WriteTo(message, &session.Addr)