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

chore(merge): merge main into develop

Browse Source 
Backports two softlock fixes and playtime regression fix from main.
Also removes handleMsgMhfEnterTournamentQuest from the nil-stub test
list — it's a real DB-backed handler and has its own dedicated test.
This commit is contained in:
Houmgaor
2026-03-23 22:50:27 +01:00
parent 6f7852cc12 abab6dc3a1
commit 9b3884fc26
12 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
network/mhfpacket/msg_batch_parse_test.go
View File

@@ -1594,7 +1594,6 @@ func TestBatchParseNotImplemented(t *testing.T) {
&MsgSysDispObject{}, &MsgSysHideObject{},
&MsgMhfServerCommand{}, &MsgMhfSetLoginwindow{}, &MsgMhfShutClient{},
&MsgMhfUpdateGuildcard{},
&MsgCaExchangeItem{},
}
for _, pkt := range packets {

7
network/mhfpacket/msg_ca_exchange_item.go
View File

@@ -9,7 +9,9 @@ import (
)
// MsgCaExchangeItem represents the MSG_CA_EXCHANGE_ITEM
type MsgCaExchangeItem struct{}
type MsgCaExchangeItem struct {
AckHandle uint32 // TODO: complete reverse-engineering of request fields
}
// Opcode returns the ID associated with this packet type.
func (m *MsgCaExchangeItem) Opcode() network.PacketID {
@@ -18,7 +20,8 @@ func (m *MsgCaExchangeItem) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgCaExchangeItem) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
return errors.New("NOT IMPLEMENTED")
m.AckHandle = bf.ReadUint32()
return nil
}
// Build builds a binary packet from the current data.

2
network/mhfpacket/msg_comprehensive_test.go
View File

@@ -497,6 +497,8 @@ func TestAckHandlePacketsParse(t *testing.T) {
{"MsgMhfGetKijuInfo", network.MSG_MHF_GET_KIJU_INFO},
{"MsgMhfGetExtraInfo", network.MSG_MHF_GET_EXTRA_INFO},
{"MsgMhfGetCogInfo", network.MSG_MHF_GET_COG_INFO},
{"MsgCaExchangeItem", network.MSG_CA_EXCHANGE_ITEM},
{"MsgMhfUseUdShopCoin", network.MSG_MHF_USE_UD_SHOP_COIN},
}
ctx := &clientctx.ClientContext{RealClientMode: cfg.ZZ}

7
network/mhfpacket/msg_mhf_use_ud_shop_coin.go
View File

@@ -9,7 +9,9 @@ import (
)
// MsgMhfUseUdShopCoin represents the MSG_MHF_USE_UD_SHOP_COIN
type MsgMhfUseUdShopCoin struct{}
type MsgMhfUseUdShopCoin struct {
AckHandle uint32 // TODO: complete reverse-engineering of request fields
}
// Opcode returns the ID associated with this packet type.
func (m *MsgMhfUseUdShopCoin) Opcode() network.PacketID {
@@ -18,7 +20,8 @@ func (m *MsgMhfUseUdShopCoin) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgMhfUseUdShopCoin) Parse(bf *byteframe.ByteFrame, ctx *clientctx.ClientContext) error {
return errors.New("NOT IMPLEMENTED")
m.AckHandle = bf.ReadUint32()
return nil
}
// Build builds a binary packet from the current data.

2
network/mhfpacket/msg_parse_small_test.go
View File

@@ -32,7 +32,7 @@ func TestParseSmallNotImplemented(t *testing.T) {
{"MsgMhfSetUdTacticsFollower", &MsgMhfSetUdTacticsFollower{}},
{"MsgMhfStampcardPrize", &MsgMhfStampcardPrize{}},
{"MsgMhfUpdateForceGuildRank", &MsgMhfUpdateForceGuildRank{}},
{"MsgMhfUseUdShopCoin", &MsgMhfUseUdShopCoin{}},
// SYS packets - NOT IMPLEMENTED
{"MsgSysAuthData", &MsgSysAuthData{}},