From ba50dc419ad68a7f2b00892402c2e4199aed00af Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Tue, 24 Oct 2023 21:24:35 +1100
Subject: [PATCH] fix parsing and handling of DistItem packets

---
 network/mhfpacket/msg_mhf_apply_dist_item.go  | 20 ++++++--------
 .../mhfpacket/msg_mhf_enumerate_dist_item.go  | 15 +++++------
 server/channelserver/handlers_distitem.go     | 26 ++++++++++++++++---
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/network/mhfpacket/msg_mhf_apply_dist_item.go b/network/mhfpacket/msg_mhf_apply_dist_item.go
index 456d8fb12..f98dbb19a 100644
--- a/network/mhfpacket/msg_mhf_apply_dist_item.go
+++ b/network/mhfpacket/msg_mhf_apply_dist_item.go
@@ -1,18 +1,19 @@
 package mhfpacket
 
 import (
+	"errors"
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfApplyDistItem represents the MSG_MHF_APPLY_DIST_ITEM
 type MsgMhfApplyDistItem struct {
-	AckHandle   uint32
+	AckHandle        uint32
 	DistributionType uint8
-	DistributionID uint32
-	Unk2        uint32
-	Unk3        uint32
+	DistributionID   uint32
+	Unk2             uint32
+	Unk3             uint32
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -32,10 +33,5 @@ func (m *MsgMhfApplyDistItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.Clie
 
 // Build builds a binary packet from the current data.
 func (m *MsgMhfApplyDistItem) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	bf.WriteUint32(m.AckHandle)
-	bf.WriteUint8(m.DistributionType)
-	bf.WriteUint32(m.DistributionID)
-	bf.WriteUint32(m.Unk2)
-	bf.WriteUint32(m.Unk3)
-	return nil
-}
\ No newline at end of file
+	return errors.New("NOT IMPLEMENTED")
+}
diff --git a/network/mhfpacket/msg_mhf_enumerate_dist_item.go b/network/mhfpacket/msg_mhf_enumerate_dist_item.go
index 778a91ac6..6d0082ec8 100644
--- a/network/mhfpacket/msg_mhf_enumerate_dist_item.go
+++ b/network/mhfpacket/msg_mhf_enumerate_dist_item.go
@@ -1,17 +1,19 @@
 package mhfpacket
 
 import (
+	"errors"
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfEnumerateDistItem represents the MSG_MHF_ENUMERATE_DIST_ITEM
 type MsgMhfEnumerateDistItem struct {
 	AckHandle uint32
 	Unk0      uint8
-	Unk1      uint16
+	Unk1      uint8
 	Unk2      uint16
+	Unk3      []byte
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -23,16 +25,13 @@ func (m *MsgMhfEnumerateDistItem) Opcode() network.PacketID {
 func (m *MsgMhfEnumerateDistItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint8()
-	m.Unk1 = bf.ReadUint16()
+	m.Unk1 = bf.ReadUint8()
 	m.Unk2 = bf.ReadUint16()
+	m.Unk3 = bf.ReadBytes(uint(bf.ReadUint8()))
 	return nil
 }
 
 // Build builds a binary packet from the current data.
 func (m *MsgMhfEnumerateDistItem) Build(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
-	bf.WriteUint32(m.AckHandle)
-	bf.WriteUint8(m.Unk0)
-	bf.WriteUint16(m.Unk1)
-	bf.WriteUint16(m.Unk2)
-	return nil
+	return errors.New("NOT IMPLEMENTED")
 }
diff --git a/server/channelserver/handlers_distitem.go b/server/channelserver/handlers_distitem.go
index a2979756f..2bde7c60a 100644
--- a/server/channelserver/handlers_distitem.go
+++ b/server/channelserver/handlers_distitem.go
@@ -67,10 +67,28 @@ func handleMsgMhfEnumerateDistItem(s *Session, p mhfpacket.MHFPacket) {
 			bf.WriteUint16(distData.MaxSR)
 			bf.WriteUint16(distData.MinGR)
 			bf.WriteUint16(distData.MaxGR)
-			bf.WriteUint32(0) // Unk
-			bf.WriteUint32(0) // Unk
-			ps.Uint16(bf, distData.EventName, true)
-			bf.WriteBytes(make([]byte, 391))
+			bf.WriteUint8(0)
+			bf.WriteUint16(0)
+			bf.WriteUint8(0)
+			bf.WriteUint16(0)
+			bf.WriteUint16(0)
+			bf.WriteUint8(0)
+			ps.Uint8(bf, distData.EventName, true)
+			for i := 0; i < 6; i++ {
+				for j := 0; j < 13; j++ {
+					bf.WriteUint8(0)
+					bf.WriteUint32(0)
+				}
+			}
+			i := uint8(0)
+			bf.WriteUint8(i)
+			if i <= 10 {
+				for j := uint8(0); j < i; j++ {
+					bf.WriteUint32(0)
+					bf.WriteUint32(0)
+					bf.WriteUint32(0)
+				}
+			}
 		}
 		resp := byteframe.NewByteFrame()
 		resp.WriteUint16(uint16(distCount))