From 813a3df6a7043c4697feec1cc643fa57eee7d8ed Mon Sep 17 00:00:00 2001
From: wish <wish@sek.ai>
Date: Wed, 30 Aug 2023 22:18:37 +1000
Subject: [PATCH] correctly parse RegisterEvent & move handlers

---
 network/mhfpacket/msg_mhf_register_event.go | 12 +++---
 server/channelserver/handlers_event.go      | 38 -------------------
 server/channelserver/handlers_register.go   | 42 +++++++++++++++++++++
 3 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/network/mhfpacket/msg_mhf_register_event.go b/network/mhfpacket/msg_mhf_register_event.go
index aaa5b51a8..956c4a399 100644
--- a/network/mhfpacket/msg_mhf_register_event.go
+++ b/network/mhfpacket/msg_mhf_register_event.go
@@ -1,20 +1,19 @@
 package mhfpacket
 
 import (
+	"erupe-ce/common/byteframe"
 	"erupe-ce/network"
 	"erupe-ce/network/clientctx"
-	"erupe-ce/common/byteframe"
 )
 
 // MsgMhfRegisterEvent represents the MSG_MHF_REGISTER_EVENT
 type MsgMhfRegisterEvent struct {
 	AckHandle uint32
 	Unk0      uint16
-	Unk1      uint8
-	Unk2      uint8
+	WorldID   uint16
+	LandID    uint16
 	Unk3      uint8
 	Unk4      uint8
-	Unk5      uint16
 }
 
 // Opcode returns the ID associated with this packet type.
@@ -26,11 +25,10 @@ func (m *MsgMhfRegisterEvent) Opcode() network.PacketID {
 func (m *MsgMhfRegisterEvent) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
 	m.AckHandle = bf.ReadUint32()
 	m.Unk0 = bf.ReadUint16()
-	m.Unk1 = bf.ReadUint8()
-	m.Unk2 = bf.ReadUint8()
+	m.WorldID = bf.ReadUint16()
+	m.LandID = bf.ReadUint16()
 	m.Unk3 = bf.ReadUint8()
 	m.Unk4 = bf.ReadUint8()
-	m.Unk5 = bf.ReadUint16()
 	return nil
 }
 
diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go
index 74d0cef13..d01f92a3d 100644
--- a/server/channelserver/handlers_event.go
+++ b/server/channelserver/handlers_event.go
@@ -10,44 +10,6 @@ import (
 	"erupe-ce/network/mhfpacket"
 )
 
-func handleMsgMhfRegisterEvent(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfRegisterEvent)
-	bf := byteframe.NewByteFrame()
-	bf.WriteUint8(pkt.Unk2)
-	bf.WriteUint8(pkt.Unk4)
-	bf.WriteUint16(0x1142)
-	doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())
-}
-
-func handleMsgMhfReleaseEvent(s *Session, p mhfpacket.MHFPacket) {
-	pkt := p.(*mhfpacket.MsgMhfReleaseEvent)
-
-	// Do this ack manually because it uses a non-(0|1) error code
-	/*
-		_ACK_SUCCESS = 0
-		_ACK_ERROR = 1
-
-		_ACK_EINPROGRESS = 16
-		_ACK_ENOENT = 17
-		_ACK_ENOSPC = 18
-		_ACK_ETIMEOUT = 19
-
-		_ACK_EINVALID = 64
-		_ACK_EFAILED = 65
-		_ACK_ENOMEM = 66
-		_ACK_ENOTEXIT = 67
-		_ACK_ENOTREADY = 68
-		_ACK_EALREADY = 69
-		_ACK_DISABLE_WORK = 71
-	*/
-	s.QueueSendMHF(&mhfpacket.MsgSysAck{
-		AckHandle:        pkt.AckHandle,
-		IsBufferResponse: false,
-		ErrorCode:        0x41,
-		AckData:          []byte{0x00, 0x00, 0x00, 0x00},
-	})
-}
-
 type Event struct {
 	EventType    uint16
 	Unk1         uint16
diff --git a/server/channelserver/handlers_register.go b/server/channelserver/handlers_register.go
index f060b664e..911249554 100644
--- a/server/channelserver/handlers_register.go
+++ b/server/channelserver/handlers_register.go
@@ -6,6 +6,48 @@ import (
 	"strings"
 )
 
+func handleMsgMhfRegisterEvent(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfRegisterEvent)
+	bf := byteframe.NewByteFrame()
+	if pkt.Unk3 > 0 {
+		doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
+		return
+	}
+	bf.WriteUint8(uint8(pkt.WorldID))
+	bf.WriteUint8(uint8(pkt.LandID))
+	bf.WriteUint16(0x1142) // Probably random ID
+	doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())
+}
+
+func handleMsgMhfReleaseEvent(s *Session, p mhfpacket.MHFPacket) {
+	pkt := p.(*mhfpacket.MsgMhfReleaseEvent)
+
+	// Do this ack manually because it uses a non-(0|1) error code
+	/*
+		_ACK_SUCCESS = 0
+		_ACK_ERROR = 1
+
+		_ACK_EINPROGRESS = 16
+		_ACK_ENOENT = 17
+		_ACK_ENOSPC = 18
+		_ACK_ETIMEOUT = 19
+
+		_ACK_EINVALID = 64
+		_ACK_EFAILED = 65
+		_ACK_ENOMEM = 66
+		_ACK_ENOTEXIT = 67
+		_ACK_ENOTREADY = 68
+		_ACK_EALREADY = 69
+		_ACK_DISABLE_WORK = 71
+	*/
+	s.QueueSendMHF(&mhfpacket.MsgSysAck{
+		AckHandle:        pkt.AckHandle,
+		IsBufferResponse: false,
+		ErrorCode:        0x41,
+		AckData:          []byte{0x00, 0x00, 0x00, 0x00},
+	})
+}
+
 type RaviUpdate struct {
 	Op   uint8
 	Dest uint8