Fix conflicts

This commit is contained in:
Sophie
2020-03-09 07:16:45 +00:00
45 changed files with 583 additions and 217 deletions

View File

@@ -20,7 +20,12 @@ func (m *MsgSysCastedBinary) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgSysCastedBinary) Parse(bf *byteframe.ByteFrame) error {
panic("Not implemented")
m.CharID = bf.ReadUint32()
m.Type0 = bf.ReadUint8()
m.Type1 = bf.ReadUint8()
dataSize := bf.ReadUint16()
m.RawDataPayload = bf.ReadBytes(uint(dataSize))
return nil
}
// Build builds a binary packet from the current data.

View File

@@ -6,7 +6,9 @@ import (
)
// MsgSysUnreserveStage represents the MSG_SYS_UNRESERVE_STAGE
type MsgSysUnreserveStage struct{}
type MsgSysUnreserveStage struct {
// Contains no fields.
}
// Opcode returns the ID associated with this packet type.
func (m *MsgSysUnreserveStage) Opcode() network.PacketID {
@@ -15,7 +17,7 @@ func (m *MsgSysUnreserveStage) Opcode() network.PacketID {
// Parse parses the packet from binary
func (m *MsgSysUnreserveStage) Parse(bf *byteframe.ByteFrame) error {
panic("Not implemented")
return nil
}
// Build builds a binary packet from the current data.