Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-04-03 06:22:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve all remaining lint errors (errcheck) across 49 files

Browse Source 
Fix unchecked error returns on bf.Seek(), db.Exec(), QueryRow().Scan(),
pkt.Build(), logger.Sync(), and binary.Write() calls. The linter now
passes with 0 errors, build compiles, and all tests pass with -race.
This commit is contained in:
Houmgaor
2026-02-17 18:07:38 +01:00
parent 2a0e3e2c84
commit 46bbb6adf9
49 changed files with 497 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/byteframe/byteframe_test.go
View File

@@ -150,7 +150,7 @@ func TestByteFrame_WriteAndReadInt8(t *testing.T) {
bf.WriteInt8(v) bf.WriteInt8(v)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i, expected := range values { for i, expected := range values {
got := bf.ReadInt8() got := bf.ReadInt8()
if got != expected { if got != expected {
@@ -167,7 +167,7 @@ func TestByteFrame_WriteAndReadInt16(t *testing.T) {
bf.WriteInt16(v) bf.WriteInt16(v)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i, expected := range values { for i, expected := range values {
got := bf.ReadInt16() got := bf.ReadInt16()
if got != expected { if got != expected {
@@ -184,7 +184,7 @@ func TestByteFrame_WriteAndReadInt32(t *testing.T) {
bf.WriteInt32(v) bf.WriteInt32(v)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i, expected := range values { for i, expected := range values {
got := bf.ReadInt32() got := bf.ReadInt32()
if got != expected { if got != expected {
@@ -201,7 +201,7 @@ func TestByteFrame_WriteAndReadInt64(t *testing.T) {
bf.WriteInt64(v) bf.WriteInt64(v)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i, expected := range values { for i, expected := range values {
got := bf.ReadInt64() got := bf.ReadInt64()
if got != expected { if got != expected {
@@ -218,7 +218,7 @@ func TestByteFrame_WriteAndReadFloat32(t *testing.T) {
bf.WriteFloat32(v) bf.WriteFloat32(v)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i, expected := range values { for i, expected := range values {
got := bf.ReadFloat32() got := bf.ReadFloat32()
if got != expected { if got != expected {
@@ -235,7 +235,7 @@ func TestByteFrame_WriteAndReadFloat64(t *testing.T) {
bf.WriteFloat64(v) bf.WriteFloat64(v)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i, expected := range values { for i, expected := range values {
got := bf.ReadFloat64() got := bf.ReadFloat64()
if got != expected { if got != expected {
@@ -250,7 +250,7 @@ func TestByteFrame_WriteAndReadBool(t *testing.T) {
bf.WriteBool(false) bf.WriteBool(false)
bf.WriteBool(true) bf.WriteBool(true)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
if got := bf.ReadBool(); got != true { if got := bf.ReadBool(); got != true {
t.Errorf("ReadBool()[0] = %v, want true", got) t.Errorf("ReadBool()[0] = %v, want true", got)
} }
@@ -267,7 +267,7 @@ func TestByteFrame_WriteAndReadBytes(t *testing.T) {
input := []byte{0x01, 0x02, 0x03, 0x04, 0x05} input := []byte{0x01, 0x02, 0x03, 0x04, 0x05}
bf.WriteBytes(input) bf.WriteBytes(input)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
got := bf.ReadBytes(uint(len(input))) got := bf.ReadBytes(uint(len(input)))
if !bytes.Equal(got, input) { if !bytes.Equal(got, input) {
t.Errorf("ReadBytes() = %v, want %v", got, input) t.Errorf("ReadBytes() = %v, want %v", got, input)
@@ -279,7 +279,7 @@ func TestByteFrame_WriteAndReadNullTerminatedBytes(t *testing.T) {
input := []byte("Hello, World!") input := []byte("Hello, World!")
bf.WriteNullTerminatedBytes(input) bf.WriteNullTerminatedBytes(input)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
got := bf.ReadNullTerminatedBytes() got := bf.ReadNullTerminatedBytes()
if !bytes.Equal(got, input) { if !bytes.Equal(got, input) {
t.Errorf("ReadNullTerminatedBytes() = %v, want %v", got, input) t.Errorf("ReadNullTerminatedBytes() = %v, want %v", got, input)
@@ -291,7 +291,7 @@ func TestByteFrame_ReadNullTerminatedBytes_NoNull(t *testing.T) {
input := []byte("Hello") input := []byte("Hello")
bf.WriteBytes(input) bf.WriteBytes(input)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
got := bf.ReadNullTerminatedBytes() got := bf.ReadNullTerminatedBytes()
// When there's no null terminator, it should return empty slice // When there's no null terminator, it should return empty slice
if len(got) != 0 { if len(got) != 0 {
@@ -344,7 +344,7 @@ func TestByteFrame_Seek(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
// Reset to known position for each test // Reset to known position for each test
bf.Seek(5, io.SeekStart) _, _ = bf.Seek(5, io.SeekStart)
pos, err := bf.Seek(tt.offset, tt.whence) pos, err := bf.Seek(tt.offset, tt.whence)
if tt.wantErr { if tt.wantErr {
@@ -380,7 +380,7 @@ func TestByteFrame_Data(t *testing.T) {
func TestByteFrame_DataFromCurrent(t *testing.T) { func TestByteFrame_DataFromCurrent(t *testing.T) {
bf := NewByteFrame() bf := NewByteFrame()
bf.WriteBytes([]byte{0x01, 0x02, 0x03, 0x04, 0x05}) bf.WriteBytes([]byte{0x01, 0x02, 0x03, 0x04, 0x05})
bf.Seek(2, io.SeekStart) _, _ = bf.Seek(2, io.SeekStart)
data := bf.DataFromCurrent() data := bf.DataFromCurrent()
expected := []byte{0x03, 0x04, 0x05} expected := []byte{0x03, 0x04, 0x05}
@@ -420,7 +420,7 @@ func TestByteFrame_BufferGrowth(t *testing.T) {
} }
// Verify all data is still accessible // Verify all data is still accessible
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
got := bf.ReadUint32() got := bf.ReadUint32()
if got != uint32(i) { if got != uint32(i) {
@@ -439,7 +439,7 @@ func TestByteFrame_ReadPanic(t *testing.T) {
bf := NewByteFrame() bf := NewByteFrame()
bf.WriteUint8(0x01) bf.WriteUint8(0x01)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
bf.ReadUint8() bf.ReadUint8()
bf.ReadUint16() // Should panic - trying to read 2 bytes when only 1 was written bf.ReadUint16() // Should panic - trying to read 2 bytes when only 1 was written
} }
@@ -487,7 +487,7 @@ func BenchmarkByteFrame_ReadUint32(b *testing.B) {
} }
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
bf.ReadUint32() bf.ReadUint32()
} }
} }

4
common/decryption/jpk.go
View File

@@ -22,7 +22,7 @@ func UnpackSimple(data []byte) []byte {
header := bf.ReadUint32() header := bf.ReadUint32()
if header == 0x1A524B4A { if header == 0x1A524B4A {
bf.Seek(0x2, io.SeekCurrent) _, _ = bf.Seek(0x2, io.SeekCurrent)
jpkType := bf.ReadUint16() jpkType := bf.ReadUint16()
switch jpkType { switch jpkType {
@@ -30,7 +30,7 @@ func UnpackSimple(data []byte) []byte {
startOffset := bf.ReadInt32() startOffset := bf.ReadInt32()
outSize := bf.ReadInt32() outSize := bf.ReadInt32()
outBuffer := make([]byte, outSize) outBuffer := make([]byte, outSize)
bf.Seek(int64(startOffset), io.SeekStart) _, _ = bf.Seek(int64(startOffset), io.SeekStart)
ProcessDecode(bf, outBuffer) ProcessDecode(bf, outBuffer)
return outBuffer return outBuffer

6
common/decryption/jpk_test.go
View File

@@ -73,7 +73,7 @@ func TestUnpackSimple_JPKHeader(t *testing.T) {
} }
// Verify the header bytes are correct // Verify the header bytes are correct
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
header := bf.ReadUint32() header := bf.ReadUint32()
if header != 0x1A524B4A { if header != 0x1A524B4A {
t.Errorf("Header = 0x%X, want 0x1A524B4A", header) t.Errorf("Header = 0x%X, want 0x1A524B4A", header)
@@ -104,7 +104,7 @@ func TestReadByte(t *testing.T) {
bf.WriteUint8(0x42) bf.WriteUint8(0x42)
bf.WriteUint8(0xAB) bf.WriteUint8(0xAB)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
b1 := ReadByte(bf) b1 := ReadByte(bf)
b2 := ReadByte(bf) b2 := ReadByte(bf)
@@ -228,7 +228,7 @@ func BenchmarkReadByte(b *testing.B) {
b.ResetTimer() b.ResetTimer()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
_ = ReadByte(bf) _ = ReadByte(bf)
} }
} }

2
common/mhfitem/mhfitem_test.go
View File

@@ -303,7 +303,7 @@ func TestReadWarehouseEquipment_ZeroWarehouseID(t *testing.T) {
} }
bf.WriteUint16(0) bf.WriteUint16(0)
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
equipment := ReadWarehouseEquipment(bf) equipment := ReadWarehouseEquipment(bf)
if equipment.WarehouseID == 0 { if equipment.WarehouseID == 0 {

22
network/mhfpacket/mhfpacket_test.go
View File

@@ -73,7 +73,7 @@ func TestMsgSysPingRoundTrip(t *testing.T) {
} }
// Parse // Parse
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysPing{} parsed := &MsgSysPing{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -115,7 +115,7 @@ func TestMsgSysTimeRoundTrip(t *testing.T) {
} }
// Parse // Parse
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysTime{} parsed := &MsgSysTime{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -237,7 +237,7 @@ func TestParserInterface(t *testing.T) {
var p Parser = &MsgSysPing{} var p Parser = &MsgSysPing{}
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(123) bf.WriteUint32(123)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
err := p.Parse(bf, &clientctx.ClientContext{}) err := p.Parse(bf, &clientctx.ClientContext{})
if err != nil { if err != nil {
@@ -501,7 +501,7 @@ func TestMsgSysCreateStageParse(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateStage{} pkt := &MsgSysCreateStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -553,7 +553,7 @@ func TestMsgSysEnterStageParse(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnterStage{} pkt := &MsgSysEnterStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -602,7 +602,7 @@ func TestMsgSysMoveStageParse(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysMoveStage{} pkt := &MsgSysMoveStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -648,7 +648,7 @@ func TestMsgSysLockStageParse(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLockStage{} pkt := &MsgSysLockStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -691,7 +691,7 @@ func TestMsgSysUnlockStageRoundTrip(t *testing.T) {
// Parse should consume a uint16 without error // Parse should consume a uint16 without error
bf = byteframe.NewByteFrame() bf = byteframe.NewByteFrame()
bf.WriteUint16(tt.unk0) bf.WriteUint16(tt.unk0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysUnlockStage{} parsed := &MsgSysUnlockStage{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -716,7 +716,7 @@ func TestMsgSysBackStageParse(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysBackStage{} pkt := &MsgSysBackStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -746,7 +746,7 @@ func TestMsgSysLogoutParse(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogout{} pkt := &MsgSysLogout{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -800,7 +800,7 @@ func TestMsgSysLoginParse(t *testing.T) {
bf.WriteUint16(tt.hardcodedZero1) bf.WriteUint16(tt.hardcodedZero1)
bf.WriteUint16(tt.tokenStrLen) bf.WriteUint16(tt.tokenStrLen)
bf.WriteBytes(append([]byte(tt.tokenString), 0x00)) // null terminated bf.WriteBytes(append([]byte(tt.tokenString), 0x00)) // null terminated
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogin{} pkt := &MsgSysLogin{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

264
network/mhfpacket/msg_batch_parse_test.go
View File

File diff suppressed because it is too large Load Diff

66
network/mhfpacket/msg_build_test.go
View File

@@ -42,7 +42,7 @@ func TestBuildParseDuplicateObject(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysDuplicateObject{} parsed := &MsgSysDuplicateObject{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -98,7 +98,7 @@ func TestBuildParsePositionObject(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysPositionObject{} parsed := &MsgSysPositionObject{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -151,7 +151,7 @@ func TestBuildParseCastedBinary(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysCastedBinary{} parsed := &MsgSysCastedBinary{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -197,7 +197,7 @@ func TestBuildParseLoadRegister(t *testing.T) {
bf.WriteUint8(0) // Zeroed bf.WriteUint8(0) // Zeroed
bf.WriteUint16(0) // Zeroed bf.WriteUint16(0) // Zeroed
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysLoadRegister{} parsed := &MsgSysLoadRegister{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -240,7 +240,7 @@ func TestBuildParseOperateRegister(t *testing.T) {
bf.WriteUint16(uint16(len(tt.payload))) bf.WriteUint16(uint16(len(tt.payload)))
bf.WriteBytes(tt.payload) bf.WriteBytes(tt.payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysOperateRegister{} parsed := &MsgSysOperateRegister{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -284,7 +284,7 @@ func TestBuildParseNotifyUserBinary(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysNotifyUserBinary{} parsed := &MsgSysNotifyUserBinary{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -327,7 +327,7 @@ func TestBuildParseTime(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysTime{} parsed := &MsgSysTime{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -368,7 +368,7 @@ func TestBuildParseUpdateObjectBinary(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysUpdateObjectBinary{} parsed := &MsgSysUpdateObjectBinary{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -412,7 +412,7 @@ func TestBuildParseArrangeGuildMember(t *testing.T) {
bf.WriteUint32(id) bf.WriteUint32(id)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfArrangeGuildMember{} parsed := &MsgMhfArrangeGuildMember{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -461,7 +461,7 @@ func TestBuildParseEnumerateGuildMember(t *testing.T) {
bf.WriteUint32(tt.allianceID) bf.WriteUint32(tt.allianceID)
bf.WriteUint32(tt.guildID) bf.WriteUint32(tt.guildID)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfEnumerateGuildMember{} parsed := &MsgMhfEnumerateGuildMember{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -502,7 +502,7 @@ func TestBuildParseStateCampaign(t *testing.T) {
bf.WriteUint32(tt.campaignID) bf.WriteUint32(tt.campaignID)
bf.WriteUint16(tt.unk1) bf.WriteUint16(tt.unk1)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfStateCampaign{} parsed := &MsgMhfStateCampaign{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -545,7 +545,7 @@ func TestBuildParseApplyCampaign(t *testing.T) {
bf.WriteUint16(tt.unk1) bf.WriteUint16(tt.unk1)
bf.WriteBytes(tt.unk2) bf.WriteBytes(tt.unk2)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfApplyCampaign{} parsed := &MsgMhfApplyCampaign{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -593,7 +593,7 @@ func TestBuildParseEnumerateCampaign(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfEnumerateCampaign{} parsed := &MsgMhfEnumerateCampaign{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -635,7 +635,7 @@ func TestBuildParseEnumerateEvent(t *testing.T) {
bf.WriteUint16(0) // Zeroed (discarded by Parse) bf.WriteUint16(0) // Zeroed (discarded by Parse)
bf.WriteUint16(0) // Zeroed (discarded by Parse) bf.WriteUint16(0) // Zeroed (discarded by Parse)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfEnumerateEvent{} parsed := &MsgMhfEnumerateEvent{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -675,7 +675,7 @@ func TestBuildParseAddUdTacticsPoint(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfAddUdTacticsPoint{} parsed := &MsgMhfAddUdTacticsPoint{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -722,7 +722,7 @@ func TestBuildParseApplyDistItem(t *testing.T) {
bf.WriteUint32(tt.unk2) // Read when RealClientMode >= G8 bf.WriteUint32(tt.unk2) // Read when RealClientMode >= G8
bf.WriteUint32(tt.unk3) // Read when RealClientMode >= G10 bf.WriteUint32(tt.unk3) // Read when RealClientMode >= G10
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfApplyDistItem{} parsed := &MsgMhfApplyDistItem{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -778,7 +778,7 @@ func TestBuildParseEnumerateDistItem(t *testing.T) {
bf.WriteUint16(original.Unk2) bf.WriteUint16(original.Unk2)
bf.WriteUint8(0) // Unk3 length (for Z1+ client mode) bf.WriteUint8(0) // Unk3 length (for Z1+ client mode)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfEnumerateDistItem{} parsed := &MsgMhfEnumerateDistItem{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -827,7 +827,7 @@ func TestBuildParseAcquireExchangeShop(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfAcquireExchangeShop{} parsed := &MsgMhfAcquireExchangeShop{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -852,7 +852,7 @@ func TestBuildParseDisplayedAchievement(t *testing.T) {
ctx := &clientctx.ClientContext{} ctx := &clientctx.ClientContext{}
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint8(0) // Zeroed (discarded by Parse) bf.WriteUint8(0) // Zeroed (discarded by Parse)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfDisplayedAchievement{} parsed := &MsgMhfDisplayedAchievement{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
@@ -885,7 +885,7 @@ func TestBuildParseAddKouryouPoint(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfAddKouryouPoint{} parsed := &MsgMhfAddKouryouPoint{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -920,7 +920,7 @@ func TestBuildParseCheckDailyCafepoint(t *testing.T) {
bf.WriteUint32(tt.ackHandle) bf.WriteUint32(tt.ackHandle)
bf.WriteUint32(tt.unk) bf.WriteUint32(tt.unk)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfCheckDailyCafepoint{} parsed := &MsgMhfCheckDailyCafepoint{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -959,7 +959,7 @@ func TestBuildParsePing(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysPing{} parsed := &MsgSysPing{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -995,7 +995,7 @@ func TestBuildParseDeleteObject(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysDeleteObject{} parsed := &MsgSysDeleteObject{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1031,7 +1031,7 @@ func TestBuildParseNotifyRegister(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysNotifyRegister{} parsed := &MsgSysNotifyRegister{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1050,7 +1050,7 @@ func TestBuildParseUnlockStage(t *testing.T) {
ctx := &clientctx.ClientContext{} ctx := &clientctx.ClientContext{}
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint16(0) // Zeroed (discarded by Parse) bf.WriteUint16(0) // Zeroed (discarded by Parse)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysUnlockStage{} parsed := &MsgSysUnlockStage{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
@@ -1080,7 +1080,7 @@ func TestBuildParseUnlockGlobalSema(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysUnlockGlobalSema{} parsed := &MsgSysUnlockGlobalSema{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1137,7 +1137,7 @@ func TestBuildParseCastedBinaryPayloadIntegrity(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysCastedBinary{} parsed := &MsgSysCastedBinary{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1173,7 +1173,7 @@ func TestBuildParseOperateRegisterPayloadIntegrity(t *testing.T) {
bf.WriteUint16(uint16(len(payload))) // dataSize bf.WriteUint16(uint16(len(payload))) // dataSize
bf.WriteBytes(payload) bf.WriteBytes(payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysOperateRegister{} parsed := &MsgSysOperateRegister{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1202,7 +1202,7 @@ func TestBuildParseArrangeGuildMemberEmptySlice(t *testing.T) {
t.Errorf("wrote %d bytes, want 10 for empty CharIDs", len(bf.Data())) t.Errorf("wrote %d bytes, want 10 for empty CharIDs", len(bf.Data()))
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgMhfArrangeGuildMember{} parsed := &MsgMhfArrangeGuildMember{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1279,7 +1279,7 @@ func TestBuildParseTimeBooleanEncoding(t *testing.T) {
t.Errorf("Boolean false encoded as %d, want 0", data[0]) t.Errorf("Boolean false encoded as %d, want 0", data[0])
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysTime{} parsed := &MsgSysTime{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1317,7 +1317,7 @@ func TestBuildParseSysAckBufferSmall(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1358,7 +1358,7 @@ func TestBuildParseSysAckExtendedSize(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -1388,7 +1388,7 @@ func TestBuildParseSysAckNonBuffer(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
if err := parsed.Parse(bf, ctx); err != nil { if err := parsed.Parse(bf, ctx); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)

6
network/mhfpacket/msg_comprehensive_test.go
View File

@@ -513,7 +513,7 @@ func TestAckHandlePacketsParse(t *testing.T) {
for i := 0; i < 32; i++ { for i := 0; i < 32; i++ {
bf.WriteUint32(uint32(i)) bf.WriteUint32(uint32(i))
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
// Parse should not panic // Parse should not panic
err := pkt.Parse(bf, ctx) err := pkt.Parse(bf, ctx)
@@ -543,7 +543,7 @@ func TestAddAchievementParse(t *testing.T) {
bf.WriteUint8(tt.achievementID) bf.WriteUint8(tt.achievementID)
bf.WriteUint16(tt.unk1) bf.WriteUint16(tt.unk1)
bf.WriteUint16(tt.unk2) bf.WriteUint16(tt.unk2)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAddAchievement{} pkt := &MsgMhfAddAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -583,7 +583,7 @@ func TestGetAchievementParse(t *testing.T) {
bf.WriteUint32(tt.ackHandle) bf.WriteUint32(tt.ackHandle)
bf.WriteUint32(tt.charID) bf.WriteUint32(tt.charID)
bf.WriteUint32(tt.unk1) bf.WriteUint32(tt.unk1)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetAchievement{} pkt := &MsgMhfGetAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

6
network/mhfpacket/msg_mhf_acquire_cafe_item_test.go
View File

@@ -35,7 +35,7 @@ func TestMsgMhfAcquireCafeItemParse(t *testing.T) {
bf.WriteUint32(1000) // PointCost (uint32) bf.WriteUint32(1000) // PointCost (uint32)
bf.WriteUint16(0) // Unk0 bf.WriteUint16(0) // Unk0
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireCafeItem{} pkt := &MsgMhfAcquireCafeItem{}
ctx := &clientctx.ClientContext{} ctx := &clientctx.ClientContext{}
@@ -94,7 +94,7 @@ func TestMsgMhfAcquireCafeItemParseUint32PointCost(t *testing.T) {
bf.WriteUint32(tt.pointCost) bf.WriteUint32(tt.pointCost)
bf.WriteUint16(0) // Unk0 bf.WriteUint16(0) // Unk0
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireCafeItem{} pkt := &MsgMhfAcquireCafeItem{}
ctx := &clientctx.ClientContext{} ctx := &clientctx.ClientContext{}
@@ -123,7 +123,7 @@ func TestMsgMhfAcquireCafeItemParseFieldOrder(t *testing.T) {
bf.WriteUint32(0xBBCCDDEE) // PointCost (offset 10-13) bf.WriteUint32(0xBBCCDDEE) // PointCost (offset 10-13)
bf.WriteUint16(0xFF00) // Unk0 (offset 14-15) bf.WriteUint16(0xFF00) // Unk0 (offset 14-15)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireCafeItem{} pkt := &MsgMhfAcquireCafeItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

12
network/mhfpacket/msg_mhf_acquire_test.go
View File

@@ -48,7 +48,7 @@ func TestMsgMhfAcquireGuildTresureParse(t *testing.T) {
bf.WriteUint32(tt.ackHandle) bf.WriteUint32(tt.ackHandle)
bf.WriteUint32(tt.huntID) bf.WriteUint32(tt.huntID)
bf.WriteBool(tt.unk) bf.WriteBool(tt.unk)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireGuildTresure{} pkt := &MsgMhfAcquireGuildTresure{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -89,7 +89,7 @@ func TestMsgMhfAcquireTitleParse(t *testing.T) {
for _, id := range tt.titleIDs { for _, id := range tt.titleIDs {
bf.WriteUint16(id) bf.WriteUint16(id)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireTitle{} pkt := &MsgMhfAcquireTitle{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -130,7 +130,7 @@ func TestMsgMhfAcquireDistItemParse(t *testing.T) {
bf.WriteUint32(tt.ackHandle) bf.WriteUint32(tt.ackHandle)
bf.WriteUint8(tt.distributionType) bf.WriteUint8(tt.distributionType)
bf.WriteUint32(tt.distributionID) bf.WriteUint32(tt.distributionID)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireDistItem{} pkt := &MsgMhfAcquireDistItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -174,7 +174,7 @@ func TestMsgMhfAcquireMonthlyItemParse(t *testing.T) {
bf.WriteUint16(tt.unk2) bf.WriteUint16(tt.unk2)
bf.WriteUint32(tt.unk3) bf.WriteUint32(tt.unk3)
bf.WriteUint32(0) // Zeroed (consumed by Parse) bf.WriteUint32(0) // Zeroed (consumed by Parse)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireMonthlyItem{} pkt := &MsgMhfAcquireMonthlyItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -228,7 +228,7 @@ func TestAcquirePacketEdgeCases(t *testing.T) {
bf.WriteUint32(1) bf.WriteUint32(1)
bf.WriteUint32(0xFFFFFFFF) bf.WriteUint32(0xFFFFFFFF)
bf.WriteBool(true) bf.WriteBool(true)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireGuildTresure{} pkt := &MsgMhfAcquireGuildTresure{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -247,7 +247,7 @@ func TestAcquirePacketEdgeCases(t *testing.T) {
bf.WriteUint32(1) bf.WriteUint32(1)
bf.WriteUint8(i) bf.WriteUint8(i)
bf.WriteUint32(12345) bf.WriteUint32(12345)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAcquireDistItem{} pkt := &MsgMhfAcquireDistItem{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

14
network/mhfpacket/msg_mhf_guacot_test.go
View File

@@ -38,7 +38,7 @@ func TestMsgMhfUpdateGuacotParse_SingleEntry(t *testing.T) {
bf.WriteBytes([]byte("Porky")) bf.WriteBytes([]byte("Porky"))
pkt := &MsgMhfUpdateGuacot{} pkt := &MsgMhfUpdateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
if err != nil { if err != nil {
t.Fatalf("Parse() error: %v", err) t.Fatalf("Parse() error: %v", err)
@@ -99,7 +99,7 @@ func TestMsgMhfUpdateGuacotParse_MultipleEntries(t *testing.T) {
} }
pkt := &MsgMhfUpdateGuacot{} pkt := &MsgMhfUpdateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
if err != nil { if err != nil {
t.Fatalf("Parse() error: %v", err) t.Fatalf("Parse() error: %v", err)
@@ -129,7 +129,7 @@ func TestMsgMhfUpdateGuacotParse_ZeroEntries(t *testing.T) {
bf.WriteUint16(0) // Zeroed bf.WriteUint16(0) // Zeroed
pkt := &MsgMhfUpdateGuacot{} pkt := &MsgMhfUpdateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
if err != nil { if err != nil {
t.Fatalf("Parse() error: %v", err) t.Fatalf("Parse() error: %v", err)
@@ -160,7 +160,7 @@ func TestMsgMhfUpdateGuacotParse_DeletionEntry(t *testing.T) {
bf.WriteUint8(0) // Empty name bf.WriteUint8(0) // Empty name
pkt := &MsgMhfUpdateGuacot{} pkt := &MsgMhfUpdateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
if err != nil { if err != nil {
t.Fatalf("Parse() error: %v", err) t.Fatalf("Parse() error: %v", err)
@@ -187,7 +187,7 @@ func TestMsgMhfUpdateGuacotParse_EmptyName(t *testing.T) {
bf.WriteUint8(0) // Empty name bf.WriteUint8(0) // Empty name
pkt := &MsgMhfUpdateGuacot{} pkt := &MsgMhfUpdateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
if err != nil { if err != nil {
t.Fatalf("Parse() error: %v", err) t.Fatalf("Parse() error: %v", err)
@@ -205,7 +205,7 @@ func TestMsgMhfEnumerateGuacotParse(t *testing.T) {
bf.WriteUint16(0) // Zeroed bf.WriteUint16(0) // Zeroed
pkt := &MsgMhfEnumerateGuacot{} pkt := &MsgMhfEnumerateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
if err != nil { if err != nil {
t.Fatalf("Parse() error: %v", err) t.Fatalf("Parse() error: %v", err)
@@ -251,7 +251,7 @@ func TestGoocooStruct_Data1Size(t *testing.T) {
bf.WriteUint8(0) // No name bf.WriteUint8(0) // No name
pkt := &MsgMhfUpdateGuacot{} pkt := &MsgMhfUpdateGuacot{}
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
_ = pkt.Parse(bf, nil) _ = pkt.Parse(bf, nil)
g := pkt.Goocoos[0] g := pkt.Goocoos[0]

2
network/mhfpacket/msg_mhf_packets_test.go
View File

@@ -517,7 +517,7 @@ func TestAchievementPacketParse(t *testing.T) {
bf.WriteUint8(5) // AchievementID bf.WriteUint8(5) // AchievementID
bf.WriteUint16(100) // Unk1 bf.WriteUint16(100) // Unk1
bf.WriteUint16(200) // Unk2 bf.WriteUint16(200) // Unk2
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAddAchievement{} pkt := &MsgMhfAddAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

52
network/mhfpacket/msg_parse_large_test.go
View File

@@ -31,7 +31,7 @@ func TestParseLargeMsgSysUpdateRightBuild(t *testing.T) {
t.Fatalf("Build() wrote %d bytes, want at least 12", len(data)) t.Fatalf("Build() wrote %d bytes, want at least 12", len(data))
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
if bf.ReadUint32() != 0x12345678 { if bf.ReadUint32() != 0x12345678 {
t.Error("ClientRespAckHandle mismatch") t.Error("ClientRespAckHandle mismatch")
} }
@@ -54,7 +54,7 @@ func TestParseLargeMsgMhfOperateWarehouse(t *testing.T) {
bf.WriteUint16(0) // Unk bf.WriteUint16(0) // Unk
bf.WriteBytes([]byte("TestBox")) bf.WriteBytes([]byte("TestBox"))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateWarehouse{} pkt := &MsgMhfOperateWarehouse{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -89,7 +89,7 @@ func TestParseLargeMsgMhfOperateWarehouseEquip(t *testing.T) {
bf.WriteUint16(0) // Unk bf.WriteUint16(0) // Unk
bf.WriteBytes([]byte("Arms")) bf.WriteBytes([]byte("Arms"))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateWarehouse{} pkt := &MsgMhfOperateWarehouse{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -129,7 +129,7 @@ func TestParseLargeMsgMhfLoadHouse(t *testing.T) {
bf.WriteUint8(uint8(len(tt.password) + 1)) // Password length bf.WriteUint8(uint8(len(tt.password) + 1)) // Password length
bf.WriteBytes([]byte(tt.password)) bf.WriteBytes([]byte(tt.password))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfLoadHouse{} pkt := &MsgMhfLoadHouse{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -168,7 +168,7 @@ func TestParseLargeMsgMhfSendMail(t *testing.T) {
bf.WriteUint8(0) // null terminator for Subject bf.WriteUint8(0) // null terminator for Subject
bf.WriteBytes([]byte("Hello World")) bf.WriteBytes([]byte("Hello World"))
bf.WriteUint8(0) // null terminator for Body bf.WriteUint8(0) // null terminator for Body
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfSendMail{} pkt := &MsgMhfSendMail{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -229,7 +229,7 @@ func TestParseLargeMsgMhfApplyBbsArticle(t *testing.T) {
copy(descBytes, "This is a description") copy(descBytes, "This is a description")
bf.WriteBytes(descBytes) bf.WriteBytes(descBytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfApplyBbsArticle{} pkt := &MsgMhfApplyBbsArticle{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -267,7 +267,7 @@ func TestParseLargeMsgMhfChargeFesta(t *testing.T) {
bf.WriteUint16(20) // soul value 2 bf.WriteUint16(20) // soul value 2
bf.WriteUint16(30) // soul value 3 bf.WriteUint16(30) // soul value 3
bf.WriteUint8(0) // Unk bf.WriteUint8(0) // Unk
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfChargeFesta{} pkt := &MsgMhfChargeFesta{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -302,7 +302,7 @@ func TestParseLargeMsgMhfChargeFestaZeroSouls(t *testing.T) {
bf.WriteUint32(0) // GuildID bf.WriteUint32(0) // GuildID
bf.WriteUint16(0) // soul count = 0 bf.WriteUint16(0) // soul count = 0
bf.WriteUint8(0) // Unk bf.WriteUint8(0) // Unk
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfChargeFesta{} pkt := &MsgMhfChargeFesta{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -325,7 +325,7 @@ func TestParseLargeMsgMhfOperateJoint(t *testing.T) {
bf.WriteUint8(3) // dataLen = 3 bf.WriteUint8(3) // dataLen = 3
bf.WriteBytes([]byte{0xAA, 0xBB, 0xCC, 0xDD}) // Data1 (always 4 bytes) bf.WriteBytes([]byte{0xAA, 0xBB, 0xCC, 0xDD}) // Data1 (always 4 bytes)
bf.WriteBytes([]byte{0x01, 0x02, 0x03}) // Data2 (dataLen bytes) bf.WriteBytes([]byte{0x01, 0x02, 0x03}) // Data2 (dataLen bytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateJoint{} pkt := &MsgMhfOperateJoint{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -361,7 +361,7 @@ func TestParseLargeMsgMhfOperationInvGuild(t *testing.T) {
bf.WriteUint8(7) // DaysActive bf.WriteUint8(7) // DaysActive
bf.WriteUint8(3) // PlayStyle bf.WriteUint8(3) // PlayStyle
bf.WriteUint8(2) // GuildRequest bf.WriteUint8(2) // GuildRequest
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperationInvGuild{} pkt := &MsgMhfOperationInvGuild{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -400,7 +400,7 @@ func TestParseLargeMsgMhfSaveMercenary(t *testing.T) {
bf.WriteUint32(uint32(len(mercData))) // dataSize bf.WriteUint32(uint32(len(mercData))) // dataSize
bf.WriteUint32(0) // Merc index (skipped) bf.WriteUint32(0) // Merc index (skipped)
bf.WriteBytes(mercData) bf.WriteBytes(mercData)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfSaveMercenary{} pkt := &MsgMhfSaveMercenary{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -442,7 +442,7 @@ func TestParseLargeMsgMhfUpdateHouse(t *testing.T) {
bf.WriteUint8(uint8(len(tt.password) + 1)) // Password length bf.WriteUint8(uint8(len(tt.password) + 1)) // Password length
bf.WriteBytes([]byte(tt.password)) bf.WriteBytes([]byte(tt.password))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateHouse{} pkt := &MsgMhfUpdateHouse{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -477,7 +477,7 @@ func TestParseLargeMsgSysCreateAcquireSemaphore(t *testing.T) {
bf.WriteUint8(4) // PlayerCount bf.WriteUint8(4) // PlayerCount
bf.WriteUint8(uint8(len(semBytes))) // SemaphoreIDLength bf.WriteUint8(uint8(len(semBytes))) // SemaphoreIDLength
bf.WriteBytes(semBytes) bf.WriteBytes(semBytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateAcquireSemaphore{} pkt := &MsgSysCreateAcquireSemaphore{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -509,7 +509,7 @@ func TestParseLargeMsgMhfOperateGuild(t *testing.T) {
bf.WriteUint8(uint8(len(dataPayload))) // dataLen bf.WriteUint8(uint8(len(dataPayload))) // dataLen
bf.WriteBytes([]byte{0x01, 0x02, 0x03, 0x04}) // Data1 (always 4 bytes) bf.WriteBytes([]byte{0x01, 0x02, 0x03, 0x04}) // Data1 (always 4 bytes)
bf.WriteBytes(dataPayload) // Data2 (dataLen bytes) bf.WriteBytes(dataPayload) // Data2 (dataLen bytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfOperateGuild{} pkt := &MsgMhfOperateGuild{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -549,7 +549,7 @@ func TestParseLargeMsgMhfReadBeatLevel(t *testing.T) {
for _, id := range ids { for _, id := range ids {
bf.WriteUint32(id) bf.WriteUint32(id)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfReadBeatLevel{} pkt := &MsgMhfReadBeatLevel{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -593,7 +593,7 @@ func TestParseLargeMsgSysCreateObject(t *testing.T) {
bf.WriteFloat32(tt.y) bf.WriteFloat32(tt.y)
bf.WriteFloat32(tt.z) bf.WriteFloat32(tt.z)
bf.WriteUint32(tt.unk0) bf.WriteUint32(tt.unk0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateObject{} pkt := &MsgSysCreateObject{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -629,7 +629,7 @@ func TestParseLargeMsgSysLockGlobalSema(t *testing.T) {
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.WriteBytes([]byte("channel_01")) bf.WriteBytes([]byte("channel_01"))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLockGlobalSema{} pkt := &MsgSysLockGlobalSema{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -661,7 +661,7 @@ func TestParseLargeMsgMhfCreateJoint(t *testing.T) {
bf.WriteUint32(15) // len (unused) bf.WriteUint32(15) // len (unused)
bf.WriteBytes([]byte("Alliance01")) bf.WriteBytes([]byte("Alliance01"))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfCreateJoint{} pkt := &MsgMhfCreateJoint{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -686,7 +686,7 @@ func TestParseLargeMsgMhfGetUdTacticsRemainingPoint(t *testing.T) {
bf.WriteUint32(100) // Unk0 bf.WriteUint32(100) // Unk0
bf.WriteUint32(200) // Unk1 bf.WriteUint32(200) // Unk1
bf.WriteUint32(300) // Unk2 bf.WriteUint32(300) // Unk2
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetUdTacticsRemainingPoint{} pkt := &MsgMhfGetUdTacticsRemainingPoint{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -715,7 +715,7 @@ func TestParseLargeMsgMhfPostCafeDurationBonusReceived(t *testing.T) {
bf.WriteUint32(1001) // CafeBonusID[0] bf.WriteUint32(1001) // CafeBonusID[0]
bf.WriteUint32(1002) // CafeBonusID[1] bf.WriteUint32(1002) // CafeBonusID[1]
bf.WriteUint32(1003) // CafeBonusID[2] bf.WriteUint32(1003) // CafeBonusID[2]
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfPostCafeDurationBonusReceived{} pkt := &MsgMhfPostCafeDurationBonusReceived{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -741,7 +741,7 @@ func TestParseLargeMsgMhfPostCafeDurationBonusReceivedEmpty(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(1) // AckHandle bf.WriteUint32(1) // AckHandle
bf.WriteUint32(0) // count = 0 bf.WriteUint32(0) // count = 0
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfPostCafeDurationBonusReceived{} pkt := &MsgMhfPostCafeDurationBonusReceived{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -759,7 +759,7 @@ func TestParseLargeMsgMhfRegistGuildAdventureDiva(t *testing.T) {
bf.WriteUint32(5) // Destination bf.WriteUint32(5) // Destination
bf.WriteUint32(1000) // Charge bf.WriteUint32(1000) // Charge
bf.WriteUint32(42) // CharID (skipped) bf.WriteUint32(42) // CharID (skipped)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfRegistGuildAdventureDiva{} pkt := &MsgMhfRegistGuildAdventureDiva{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -784,7 +784,7 @@ func TestParseLargeMsgMhfStateFestaG(t *testing.T) {
bf.WriteUint32(100) // FestaID bf.WriteUint32(100) // FestaID
bf.WriteUint32(200) // GuildID bf.WriteUint32(200) // GuildID
bf.WriteUint16(0) // Hardcoded 0 bf.WriteUint16(0) // Hardcoded 0
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfStateFestaG{} pkt := &MsgMhfStateFestaG{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -809,7 +809,7 @@ func TestParseLargeMsgMhfStateFestaU(t *testing.T) {
bf.WriteUint32(300) // FestaID bf.WriteUint32(300) // FestaID
bf.WriteUint32(400) // GuildID bf.WriteUint32(400) // GuildID
bf.WriteUint16(0) // Hardcoded 0 bf.WriteUint16(0) // Hardcoded 0
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfStateFestaU{} pkt := &MsgMhfStateFestaU{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -835,7 +835,7 @@ func TestParseLargeMsgSysEnumerateStage(t *testing.T) {
bf.WriteUint8(0) // skipped byte bf.WriteUint8(0) // skipped byte
bf.WriteBytes([]byte("quest_")) bf.WriteBytes([]byte("quest_"))
bf.WriteUint8(0) // null terminator bf.WriteUint8(0) // null terminator
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnumerateStage{} pkt := &MsgSysEnumerateStage{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
@@ -861,7 +861,7 @@ func TestParseLargeMsgSysReserveStage(t *testing.T) {
bf.WriteUint8(0x11) // Ready bf.WriteUint8(0x11) // Ready
bf.WriteUint8(uint8(len(stageBytes))) // stageIDLength bf.WriteUint8(uint8(len(stageBytes))) // stageIDLength
bf.WriteBytes(stageBytes) bf.WriteBytes(stageBytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysReserveStage{} pkt := &MsgSysReserveStage{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {

30
network/mhfpacket/msg_parse_medium_test.go
View File

@@ -34,7 +34,7 @@ func TestParseMediumVoteFesta(t *testing.T) {
bf.WriteUint32(tt.guildID) bf.WriteUint32(tt.guildID)
bf.WriteUint32(tt.trialID) bf.WriteUint32(tt.trialID)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfVoteFesta{} pkt := &MsgMhfVoteFesta{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -79,7 +79,7 @@ func TestParseMediumAcquireSemaphore(t *testing.T) {
bf.WriteUint8(uint8(len(idBytes))) bf.WriteUint8(uint8(len(idBytes)))
bf.WriteBytes(idBytes) bf.WriteBytes(idBytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysAcquireSemaphore{} pkt := &MsgSysAcquireSemaphore{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -117,7 +117,7 @@ func TestParseMediumCheckSemaphore(t *testing.T) {
bf.WriteUint8(uint8(len(idBytes))) bf.WriteUint8(uint8(len(idBytes)))
bf.WriteBytes(idBytes) bf.WriteBytes(idBytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCheckSemaphore{} pkt := &MsgSysCheckSemaphore{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -154,7 +154,7 @@ func TestParseMediumGetUserBinary(t *testing.T) {
bf.WriteUint32(tt.charID) bf.WriteUint32(tt.charID)
bf.WriteUint8(tt.binaryType) bf.WriteUint8(tt.binaryType)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysGetUserBinary{} pkt := &MsgSysGetUserBinary{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -193,7 +193,7 @@ func TestParseMediumSetObjectBinary(t *testing.T) {
bf.WriteUint16(uint16(len(tt.payload))) bf.WriteUint16(uint16(len(tt.payload)))
bf.WriteBytes(tt.payload) bf.WriteBytes(tt.payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysSetObjectBinary{} pkt := &MsgSysSetObjectBinary{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -232,7 +232,7 @@ func TestParseMediumSetUserBinary(t *testing.T) {
bf.WriteUint16(uint16(len(tt.payload))) bf.WriteUint16(uint16(len(tt.payload)))
bf.WriteBytes(tt.payload) bf.WriteBytes(tt.payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysSetUserBinary{} pkt := &MsgSysSetUserBinary{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -272,7 +272,7 @@ func TestParseMediumGetUdRanking(t *testing.T) {
bf.WriteUint32(tt.ack) bf.WriteUint32(tt.ack)
bf.WriteUint8(tt.unk0) bf.WriteUint8(tt.unk0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetUdRanking{} pkt := &MsgMhfGetUdRanking{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -307,7 +307,7 @@ func TestParseMediumGetUdTacticsRanking(t *testing.T) {
bf.WriteUint32(tt.ack) bf.WriteUint32(tt.ack)
bf.WriteUint32(tt.guildID) bf.WriteUint32(tt.guildID)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetUdTacticsRanking{} pkt := &MsgMhfGetUdTacticsRanking{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -344,7 +344,7 @@ func TestParseMediumRegistGuildTresure(t *testing.T) {
bf.WriteBytes(tt.data) bf.WriteBytes(tt.data)
bf.WriteUint32(0) // trailing uint32 that is read and discarded bf.WriteUint32(0) // trailing uint32 that is read and discarded
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfRegistGuildTresure{} pkt := &MsgMhfRegistGuildTresure{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -375,7 +375,7 @@ func TestParseMediumUpdateMyhouseInfo(t *testing.T) {
} }
bf.WriteBytes(payload) bf.WriteBytes(payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateMyhouseInfo{} pkt := &MsgMhfUpdateMyhouseInfo{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -397,7 +397,7 @@ func TestParseMediumUpdateMyhouseInfo(t *testing.T) {
bf.WriteUint32(0) bf.WriteUint32(0)
bf.WriteBytes(make([]byte, 0x16A)) bf.WriteBytes(make([]byte, 0x16A))
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfUpdateMyhouseInfo{} pkt := &MsgMhfUpdateMyhouseInfo{}
if err := pkt.Parse(bf, nil); err != nil { if err := pkt.Parse(bf, nil); err != nil {
t.Fatalf("Parse() error = %v", err) t.Fatalf("Parse() error = %v", err)
@@ -525,7 +525,7 @@ func TestParseMediumAckHandleOnlyBatch(t *testing.T) {
t.Run(tc.name+"/ack_"+ackHex(ackVal), func(t *testing.T) { t.Run(tc.name+"/ack_"+ackHex(ackVal), func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(ackVal) bf.WriteUint32(ackVal)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
err := tc.pkt.Parse(bf, ctx) err := tc.pkt.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -545,7 +545,7 @@ func TestParseMediumAckHandleOnlyVerifyValues(t *testing.T) {
makeFrame := func() *byteframe.ByteFrame { makeFrame := func() *byteframe.ByteFrame {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(ack) bf.WriteUint32(ack)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
return bf return bf
} }
@@ -735,7 +735,7 @@ func TestParseMediumAckHandleOnlyVerifyValues(t *testing.T) {
func TestParseMediumDeleteUser(t *testing.T) { func TestParseMediumDeleteUser(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(12345) bf.WriteUint32(12345)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysDeleteUser{} pkt := &MsgSysDeleteUser{}
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)
@@ -752,7 +752,7 @@ func TestParseMediumDeleteUser(t *testing.T) {
func TestParseMediumInsertUser(t *testing.T) { func TestParseMediumInsertUser(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(12345) bf.WriteUint32(12345)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysInsertUser{} pkt := &MsgSysInsertUser{}
err := pkt.Parse(bf, nil) err := pkt.Parse(bf, nil)

8
network/mhfpacket/msg_parse_small_test.go
View File

@@ -65,7 +65,7 @@ func TestParseSmallNotImplemented(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
// Write some padding bytes so Parse has data available if it tries to read. // Write some padding bytes so Parse has data available if it tries to read.
bf.WriteUint32(0) bf.WriteUint32(0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
err := tc.pkt.Parse(bf, ctx) err := tc.pkt.Parse(bf, ctx)
if err == nil { if err == nil {
@@ -116,7 +116,7 @@ func TestParseSmallLogout(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint8(tt.unk0) bf.WriteUint8(tt.unk0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogout{} pkt := &MsgSysLogout{}
err := pkt.Parse(bf, ctx) err := pkt.Parse(bf, ctx)
@@ -142,7 +142,7 @@ func TestParseSmallEnumerateHouse(t *testing.T) {
bf.WriteUint8(2) // Method bf.WriteUint8(2) // Method
bf.WriteUint16(100) // Unk bf.WriteUint16(100) // Unk
bf.WriteUint8(0) // lenName = 0 (no name) bf.WriteUint8(0) // lenName = 0 (no name)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfEnumerateHouse{} pkt := &MsgMhfEnumerateHouse{}
err := pkt.Parse(bf, ctx) err := pkt.Parse(bf, ctx)
@@ -173,7 +173,7 @@ func TestParseSmallEnumerateHouse(t *testing.T) {
nameBytes := []byte("Test\x00") nameBytes := []byte("Test\x00")
bf.WriteUint8(uint8(len(nameBytes))) // lenName > 0 bf.WriteUint8(uint8(len(nameBytes))) // lenName > 0
bf.WriteBytes(nameBytes) // null-terminated name bf.WriteBytes(nameBytes) // null-terminated name
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfEnumerateHouse{} pkt := &MsgMhfEnumerateHouse{}
err := pkt.Parse(bf, ctx) err := pkt.Parse(bf, ctx)

14
network/mhfpacket/msg_parse_test.go
View File

@@ -14,7 +14,7 @@ func TestMsgMhfGetAchievementDetailedParse(t *testing.T) {
bf.WriteUint32(0x12345678) // AckHandle bf.WriteUint32(0x12345678) // AckHandle
bf.WriteUint32(54321) // CharID bf.WriteUint32(54321) // CharID
bf.WriteUint32(99999) // Unk1 bf.WriteUint32(99999) // Unk1
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfGetAchievement{} pkt := &MsgMhfGetAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -36,7 +36,7 @@ func TestMsgMhfAddAchievementDetailedParse(t *testing.T) {
bf.WriteUint8(42) // AchievementID bf.WriteUint8(42) // AchievementID
bf.WriteUint16(12345) // Unk1 bf.WriteUint16(12345) // Unk1
bf.WriteUint16(0xFFFF) // Unk2 - max value bf.WriteUint16(0xFFFF) // Unk2 - max value
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgMhfAddAchievement{} pkt := &MsgMhfAddAchievement{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -78,7 +78,7 @@ func TestMsgSysCastBinaryDetailedParse(t *testing.T) {
bf.WriteUint8(tt.messageType) bf.WriteUint8(tt.messageType)
bf.WriteUint16(uint16(len(tt.payload))) bf.WriteUint16(uint16(len(tt.payload)))
bf.WriteBytes(tt.payload) bf.WriteBytes(tt.payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCastBinary{} pkt := &MsgSysCastBinary{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -116,7 +116,7 @@ func TestMsgSysLogoutDetailedParse(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint8(tt.unk0) bf.WriteUint8(tt.unk0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLogout{} pkt := &MsgSysLogout{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -144,7 +144,7 @@ func TestMsgSysBackStageDetailedParse(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(tt.ackHandle) bf.WriteUint32(tt.ackHandle)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysBackStage{} pkt := &MsgSysBackStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -171,7 +171,7 @@ func TestMsgSysPingDetailedParse(t *testing.T) {
for _, tt := range tests { for _, tt := range tests {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(tt.ackHandle) bf.WriteUint32(tt.ackHandle)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysPing{} pkt := &MsgSysPing{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -200,7 +200,7 @@ func TestMsgSysTimeDetailedParse(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteBool(tt.getRemoteTime) bf.WriteBool(tt.getRemoteTime)
bf.WriteUint32(tt.timestamp) bf.WriteUint32(tt.timestamp)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysTime{} pkt := &MsgSysTime{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

8
network/mhfpacket/msg_sys_core_test.go
View File

@@ -65,7 +65,7 @@ func TestMsgSysAckRoundTrip(t *testing.T) {
} }
// Parse // Parse
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -109,7 +109,7 @@ func TestMsgSysAckLargePayload(t *testing.T) {
} }
// Parse // Parse
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -206,7 +206,7 @@ func TestMsgSysAckNonBufferResponse(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {
@@ -235,7 +235,7 @@ func TestMsgSysAckNonBufferShortData(t *testing.T) {
t.Fatalf("Build() error = %v", err) t.Fatalf("Build() error = %v", err)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
parsed := &MsgSysAck{} parsed := &MsgSysAck{}
err = parsed.Parse(bf, ctx) err = parsed.Parse(bf, ctx)
if err != nil { if err != nil {

2
network/mhfpacket/msg_sys_packets_test.go
View File

@@ -31,7 +31,7 @@ func TestMsgSysCastBinaryParse(t *testing.T) {
bf.WriteUint8(tt.messageType) bf.WriteUint8(tt.messageType)
bf.WriteUint16(uint16(len(tt.payload))) bf.WriteUint16(uint16(len(tt.payload)))
bf.WriteBytes(tt.payload) bf.WriteBytes(tt.payload)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCastBinary{} pkt := &MsgSysCastBinary{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

16
network/mhfpacket/msg_sys_stage_test.go
View File

@@ -55,7 +55,7 @@ func TestMsgSysCreateStageFields(t *testing.T) {
stageIDBytes := []byte(tt.stageID) stageIDBytes := []byte(tt.stageID)
bf.WriteUint8(uint8(len(stageIDBytes))) bf.WriteUint8(uint8(len(stageIDBytes)))
bf.WriteBytes(append(stageIDBytes, 0x00)) bf.WriteBytes(append(stageIDBytes, 0x00))
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateStage{} pkt := &MsgSysCreateStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -99,7 +99,7 @@ func TestMsgSysEnterStageFields(t *testing.T) {
stageIDBytes := []byte(tt.stageID) stageIDBytes := []byte(tt.stageID)
bf.WriteUint8(uint8(len(stageIDBytes))) bf.WriteUint8(uint8(len(stageIDBytes)))
bf.WriteBytes(append(stageIDBytes, 0x00)) bf.WriteBytes(append(stageIDBytes, 0x00))
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnterStage{} pkt := &MsgSysEnterStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -139,7 +139,7 @@ func TestMsgSysMoveStageFields(t *testing.T) {
stageIDBytes := []byte(tt.stageID) stageIDBytes := []byte(tt.stageID)
bf.WriteUint8(uint8(len(stageIDBytes))) bf.WriteUint8(uint8(len(stageIDBytes)))
bf.WriteBytes(stageIDBytes) bf.WriteBytes(stageIDBytes)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysMoveStage{} pkt := &MsgSysMoveStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -181,7 +181,7 @@ func TestMsgSysLockStageFields(t *testing.T) {
stageIDBytes := []byte(tt.stageID) stageIDBytes := []byte(tt.stageID)
bf.WriteUint8(uint8(len(stageIDBytes))) bf.WriteUint8(uint8(len(stageIDBytes)))
bf.WriteBytes(append(stageIDBytes, 0x00)) bf.WriteBytes(append(stageIDBytes, 0x00))
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysLockStage{} pkt := &MsgSysLockStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -215,7 +215,7 @@ func TestMsgSysUnlockStageFields(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint16(tt.unk0) bf.WriteUint16(tt.unk0)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysUnlockStage{} pkt := &MsgSysUnlockStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -242,7 +242,7 @@ func TestMsgSysBackStageFields(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(tt.handle) bf.WriteUint32(tt.handle)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysBackStage{} pkt := &MsgSysBackStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -271,7 +271,7 @@ func TestStageIDEdgeCases(t *testing.T) {
bf.WriteUint8(4) bf.WriteUint8(4)
bf.WriteUint8(uint8(len(longID))) bf.WriteUint8(uint8(len(longID)))
bf.WriteBytes(append(longID, 0x00)) bf.WriteBytes(append(longID, 0x00))
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysCreateStage{} pkt := &MsgSysCreateStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})
@@ -293,7 +293,7 @@ func TestStageIDEdgeCases(t *testing.T) {
bf.WriteUint8(0) bf.WriteUint8(0)
bf.WriteUint8(uint8(len(stageID))) bf.WriteUint8(uint8(len(stageID)))
bf.WriteBytes([]byte(stageID)) bf.WriteBytes([]byte(stageID))
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
pkt := &MsgSysEnterStage{} pkt := &MsgSysEnterStage{}
err := pkt.Parse(bf, &clientctx.ClientContext{}) err := pkt.Parse(bf, &clientctx.ClientContext{})

30
server/api/endpoints_test.go
View File

@@ -142,7 +142,7 @@ func TestLoginEndpointInvalidJSON(t *testing.T) {
// TestLoginEndpointEmptyCredentials tests login with empty credentials // TestLoginEndpointEmptyCredentials tests login with empty credentials
func TestLoginEndpointEmptyCredentials(t *testing.T) { func TestLoginEndpointEmptyCredentials(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -194,7 +194,7 @@ func TestLoginEndpointEmptyCredentials(t *testing.T) {
// TestRegisterEndpointInvalidJSON tests register with invalid JSON // TestRegisterEndpointInvalidJSON tests register with invalid JSON
func TestRegisterEndpointInvalidJSON(t *testing.T) { func TestRegisterEndpointInvalidJSON(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -217,7 +217,7 @@ func TestRegisterEndpointInvalidJSON(t *testing.T) {
// TestRegisterEndpointEmptyCredentials tests register with empty fields // TestRegisterEndpointEmptyCredentials tests register with empty fields
func TestRegisterEndpointEmptyCredentials(t *testing.T) { func TestRegisterEndpointEmptyCredentials(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -265,7 +265,7 @@ func TestRegisterEndpointEmptyCredentials(t *testing.T) {
// TestCreateCharacterEndpointInvalidJSON tests create character with invalid JSON // TestCreateCharacterEndpointInvalidJSON tests create character with invalid JSON
func TestCreateCharacterEndpointInvalidJSON(t *testing.T) { func TestCreateCharacterEndpointInvalidJSON(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -288,7 +288,7 @@ func TestCreateCharacterEndpointInvalidJSON(t *testing.T) {
// TestDeleteCharacterEndpointInvalidJSON tests delete character with invalid JSON // TestDeleteCharacterEndpointInvalidJSON tests delete character with invalid JSON
func TestDeleteCharacterEndpointInvalidJSON(t *testing.T) { func TestDeleteCharacterEndpointInvalidJSON(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -311,7 +311,7 @@ func TestDeleteCharacterEndpointInvalidJSON(t *testing.T) {
// TestExportSaveEndpointInvalidJSON tests export save with invalid JSON // TestExportSaveEndpointInvalidJSON tests export save with invalid JSON
func TestExportSaveEndpointInvalidJSON(t *testing.T) { func TestExportSaveEndpointInvalidJSON(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -334,7 +334,7 @@ func TestExportSaveEndpointInvalidJSON(t *testing.T) {
// TestScreenShotEndpointDisabled tests screenshot endpoint when disabled // TestScreenShotEndpointDisabled tests screenshot endpoint when disabled
func TestScreenShotEndpointDisabled(t *testing.T) { func TestScreenShotEndpointDisabled(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
cfg.Screenshots.Enabled = false cfg.Screenshots.Enabled = false
@@ -373,7 +373,7 @@ func TestScreenShotEndpointInvalidMethod(t *testing.T) {
// TestScreenShotGetInvalidToken tests screenshot get with invalid token // TestScreenShotGetInvalidToken tests screenshot get with invalid token
func TestScreenShotGetInvalidToken(t *testing.T) { func TestScreenShotGetInvalidToken(t *testing.T) {
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -413,7 +413,7 @@ func TestNewAuthDataStructure(t *testing.T) {
t.Skip("newAuthData requires database for getReturnExpiry - needs integration test") t.Skip("newAuthData requires database for getReturnExpiry - needs integration test")
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
cfg.DebugOptions.MaxLauncherHR = false cfg.DebugOptions.MaxLauncherHR = false
@@ -469,7 +469,7 @@ func TestNewAuthDataDebugMode(t *testing.T) {
t.Skip("newAuthData requires database for getReturnExpiry - needs integration test") t.Skip("newAuthData requires database for getReturnExpiry - needs integration test")
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
cfg.DebugOptions.MaxLauncherHR = true cfg.DebugOptions.MaxLauncherHR = true
@@ -503,7 +503,7 @@ func TestNewAuthDataMezFesConfiguration(t *testing.T) {
t.Skip("newAuthData requires database for getReturnExpiry - needs integration test") t.Skip("newAuthData requires database for getReturnExpiry - needs integration test")
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
cfg.GameplayOptions.MezFesSoloTickets = 150 cfg.GameplayOptions.MezFesSoloTickets = 150
@@ -537,7 +537,7 @@ func TestNewAuthDataHideNotices(t *testing.T) {
t.Skip("newAuthData requires database for getReturnExpiry - needs integration test") t.Skip("newAuthData requires database for getReturnExpiry - needs integration test")
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
cfg.HideLoginNotice = true cfg.HideLoginNotice = true
@@ -561,7 +561,7 @@ func TestNewAuthDataTimestamps(t *testing.T) {
t.Skip("newAuthData requires database for getReturnExpiry - needs integration test") t.Skip("newAuthData requires database for getReturnExpiry - needs integration test")
logger := NewTestLogger(t) logger := NewTestLogger(t)
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -586,7 +586,7 @@ func TestNewAuthDataTimestamps(t *testing.T) {
// BenchmarkLauncherEndpoint benchmarks the launcher endpoint // BenchmarkLauncherEndpoint benchmarks the launcher endpoint
func BenchmarkLauncherEndpoint(b *testing.B) { func BenchmarkLauncherEndpoint(b *testing.B) {
logger, _ := zap.NewDevelopment() logger, _ := zap.NewDevelopment()
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{
@@ -605,7 +605,7 @@ func BenchmarkLauncherEndpoint(b *testing.B) {
// BenchmarkNewAuthData benchmarks the newAuthData function // BenchmarkNewAuthData benchmarks the newAuthData function
func BenchmarkNewAuthData(b *testing.B) { func BenchmarkNewAuthData(b *testing.B) {
logger, _ := zap.NewDevelopment() logger, _ := zap.NewDevelopment()
defer logger.Sync() defer func() { _ = logger.Sync() }()
cfg := NewTestConfig() cfg := NewTestConfig()
server := &APIServer{ server := &APIServer{

18
server/channelserver/handlers.go
View File

@@ -444,7 +444,7 @@ func handleMsgSysRecordLog(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgSysRecordLog) pkt := p.(*mhfpacket.MsgSysRecordLog)
if _config.ErupeConfig.RealClientMode == _config.ZZ { if _config.ErupeConfig.RealClientMode == _config.ZZ {
bf := byteframe.NewByteFrameFromBytes(pkt.Data) bf := byteframe.NewByteFrameFromBytes(pkt.Data)
bf.Seek(32, 0) _, _ = bf.Seek(32, 0)
var val uint8 var val uint8
for i := 0; i < 176; i++ { for i := 0; i < 176; i++ {
val = bf.ReadUint8() val = bf.ReadUint8()
@@ -1069,7 +1069,7 @@ func handleMsgMhfUpdateGuacot(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUpdateGuacot) pkt := p.(*mhfpacket.MsgMhfUpdateGuacot)
for _, goocoo := range pkt.Goocoos { for _, goocoo := range pkt.Goocoos {
if goocoo.Data1[0] == 0 { if goocoo.Data1[0] == 0 {
s.server.db.Exec(fmt.Sprintf("UPDATE goocoo SET goocoo%d=NULL WHERE id=$1", goocoo.Index), s.charID) _, _ = s.server.db.Exec(fmt.Sprintf("UPDATE goocoo SET goocoo%d=NULL WHERE id=$1", goocoo.Index), s.charID)
} else { } else {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(goocoo.Index) bf.WriteUint32(goocoo.Index)
@@ -1081,7 +1081,7 @@ func handleMsgMhfUpdateGuacot(s *Session, p mhfpacket.MHFPacket) {
} }
bf.WriteUint8(uint8(len(goocoo.Name))) bf.WriteUint8(uint8(len(goocoo.Name)))
bf.WriteBytes(goocoo.Name) bf.WriteBytes(goocoo.Name)
s.server.db.Exec(fmt.Sprintf("UPDATE goocoo SET goocoo%d=$1 WHERE id=$2", goocoo.Index), bf.Data(), s.charID) _, _ = s.server.db.Exec(fmt.Sprintf("UPDATE goocoo SET goocoo%d=$1 WHERE id=$2", goocoo.Index), bf.Data(), s.charID)
dumpSaveData(s, bf.Data(), fmt.Sprintf("goocoo-%d", goocoo.Index)) dumpSaveData(s, bf.Data(), fmt.Sprintf("goocoo-%d", goocoo.Index))
} }
} }
@@ -1144,7 +1144,7 @@ func handleMsgMhfGetEtcPoints(s *Session, p mhfpacket.MHFPacket) {
var dailyTime time.Time var dailyTime time.Time
_ = s.server.db.QueryRow("SELECT COALESCE(daily_time, $2) FROM characters WHERE id = $1", s.charID, time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)).Scan(&dailyTime) _ = s.server.db.QueryRow("SELECT COALESCE(daily_time, $2) FROM characters WHERE id = $1", s.charID, time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC)).Scan(&dailyTime)
if TimeAdjusted().After(dailyTime) { if TimeAdjusted().After(dailyTime) {
s.server.db.Exec("UPDATE characters SET bonus_quests = 0, daily_quests = 0 WHERE id=$1", s.charID) _, _ = s.server.db.Exec("UPDATE characters SET bonus_quests = 0, daily_quests = 0 WHERE id=$1", s.charID)
} }
var bonusQuests, dailyQuests, promoPoints uint32 var bonusQuests, dailyQuests, promoPoints uint32
@@ -1174,9 +1174,9 @@ func handleMsgMhfUpdateEtcPoint(s *Session, p mhfpacket.MHFPacket) {
err := s.server.db.QueryRow(fmt.Sprintf(`SELECT %s FROM characters WHERE id = $1`, column), s.charID).Scan(&value) err := s.server.db.QueryRow(fmt.Sprintf(`SELECT %s FROM characters WHERE id = $1`, column), s.charID).Scan(&value)
if err == nil { if err == nil {
if value+pkt.Delta < 0 { if value+pkt.Delta < 0 {
s.server.db.Exec(fmt.Sprintf(`UPDATE characters SET %s = 0 WHERE id = $1`, column), s.charID) _, _ = s.server.db.Exec(fmt.Sprintf(`UPDATE characters SET %s = 0 WHERE id = $1`, column), s.charID)
} else { } else {
s.server.db.Exec(fmt.Sprintf(`UPDATE characters SET %s = %s + $1 WHERE id = $2`, column, column), pkt.Delta, s.charID) _, _ = s.server.db.Exec(fmt.Sprintf(`UPDATE characters SET %s = %s + $1 WHERE id = $2`, column, column), pkt.Delta, s.charID)
} }
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
@@ -1517,7 +1517,7 @@ func handleMsgMhfUpdateEquipSkinHist(s *Session, p mhfpacket.MHFPacket) {
bitInByte := bit % 8 bitInByte := bit % 8
data[startByte+byteInd] |= bits.Reverse8(1 << uint(bitInByte)) data[startByte+byteInd] |= bits.Reverse8(1 << uint(bitInByte))
dumpSaveData(s, data, "skinhist") dumpSaveData(s, data, "skinhist")
s.server.db.Exec("UPDATE characters SET skin_hist=$1 WHERE id=$2", data, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET skin_hist=$1 WHERE id=$2", data, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -1593,14 +1593,14 @@ func handleMsgMhfGetTrendWeapon(s *Session, p mhfpacket.MHFPacket) {
x++ x++
} }
} }
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
bf.WriteUint8(x) bf.WriteUint8(x)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }
func handleMsgMhfUpdateUseTrendWeaponLog(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateUseTrendWeaponLog(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUpdateUseTrendWeaponLog) pkt := p.(*mhfpacket.MsgMhfUpdateUseTrendWeaponLog)
s.server.db.Exec(`INSERT INTO trend_weapons (weapon_id, weapon_type, count) VALUES ($1, $2, 1) ON CONFLICT (weapon_id) DO _, _ = s.server.db.Exec(`INSERT INTO trend_weapons (weapon_id, weapon_type, count) VALUES ($1, $2, 1) ON CONFLICT (weapon_id) DO
UPDATE SET count = trend_weapons.count+1`, pkt.WeaponID, pkt.WeaponType) UPDATE SET count = trend_weapons.count+1`, pkt.WeaponID, pkt.WeaponType)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

6
server/channelserver/handlers_achievement.go
View File

@@ -90,7 +90,7 @@ func handleMsgMhfGetAchievement(s *Session, p mhfpacket.MHFPacket) {
var exists int var exists int
err := s.server.db.QueryRow("SELECT id FROM achievements WHERE id=$1", pkt.CharID).Scan(&exists) err := s.server.db.QueryRow("SELECT id FROM achievements WHERE id=$1", pkt.CharID).Scan(&exists)
if err != nil { if err != nil {
s.server.db.Exec("INSERT INTO achievements (id) VALUES ($1)", pkt.CharID) _, _ = s.server.db.Exec("INSERT INTO achievements (id) VALUES ($1)", pkt.CharID)
} }
var scores [33]int32 var scores [33]int32
@@ -152,10 +152,10 @@ func handleMsgMhfAddAchievement(s *Session, p mhfpacket.MHFPacket) {
var exists int var exists int
err := s.server.db.QueryRow("SELECT id FROM achievements WHERE id=$1", s.charID).Scan(&exists) err := s.server.db.QueryRow("SELECT id FROM achievements WHERE id=$1", s.charID).Scan(&exists)
if err != nil { if err != nil {
s.server.db.Exec("INSERT INTO achievements (id) VALUES ($1)", s.charID) _, _ = s.server.db.Exec("INSERT INTO achievements (id) VALUES ($1)", s.charID)
} }
s.server.db.Exec(fmt.Sprintf("UPDATE achievements SET ach%d=ach%d+1 WHERE id=$1", pkt.AchievementID, pkt.AchievementID), s.charID) _, _ = s.server.db.Exec(fmt.Sprintf("UPDATE achievements SET ach%d=ach%d+1 WHERE id=$1", pkt.AchievementID, pkt.AchievementID), s.charID)
} }
func handleMsgMhfPaymentAchievement(s *Session, p mhfpacket.MHFPacket) {} func handleMsgMhfPaymentAchievement(s *Session, p mhfpacket.MHFPacket) {}

16
server/channelserver/handlers_cafe.go
View File

@@ -58,7 +58,7 @@ func handleMsgMhfCheckDailyCafepoint(s *Session, p mhfpacket.MHFPacket) {
bondBonus = 5 // Bond point bonus quests bondBonus = 5 // Bond point bonus quests
bonusQuests = s.server.erupeConfig.GameplayOptions.BonusQuestAllowance bonusQuests = s.server.erupeConfig.GameplayOptions.BonusQuestAllowance
dailyQuests = s.server.erupeConfig.GameplayOptions.DailyQuestAllowance dailyQuests = s.server.erupeConfig.GameplayOptions.DailyQuestAllowance
s.server.db.Exec("UPDATE characters SET daily_time=$1, bonus_quests = $2, daily_quests = $3 WHERE id=$4", midday, bonusQuests, dailyQuests, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET daily_time=$1, bonus_quests = $2, daily_quests = $3 WHERE id=$4", midday, bonusQuests, dailyQuests, s.charID)
bf.WriteBool(true) // Success? bf.WriteBool(true) // Success?
} else { } else {
bf.WriteBool(false) bf.WriteBool(false)
@@ -77,12 +77,12 @@ func handleMsgMhfGetCafeDuration(s *Session, p mhfpacket.MHFPacket) {
err := s.server.db.QueryRow(`SELECT cafe_reset FROM characters WHERE id=$1`, s.charID).Scan(&cafeReset) err := s.server.db.QueryRow(`SELECT cafe_reset FROM characters WHERE id=$1`, s.charID).Scan(&cafeReset)
if err != nil { if err != nil {
cafeReset = TimeWeekNext() cafeReset = TimeWeekNext()
s.server.db.Exec(`UPDATE characters SET cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID) _, _ = s.server.db.Exec(`UPDATE characters SET cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID)
} }
if TimeAdjusted().After(cafeReset) { if TimeAdjusted().After(cafeReset) {
cafeReset = TimeWeekNext() cafeReset = TimeWeekNext()
s.server.db.Exec(`UPDATE characters SET cafe_time=0, cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID) _, _ = s.server.db.Exec(`UPDATE characters SET cafe_time=0, cafe_reset=$1 WHERE id=$2`, cafeReset, s.charID)
s.server.db.Exec(`DELETE FROM cafe_accepted WHERE character_id=$1`, s.charID) _, _ = s.server.db.Exec(`DELETE FROM cafe_accepted WHERE character_id=$1`, s.charID)
} }
var cafeTime uint32 var cafeTime uint32
@@ -181,7 +181,7 @@ func handleMsgMhfReceiveCafeDurationBonus(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(cafeBonus.ItemID) bf.WriteUint32(cafeBonus.ItemID)
bf.WriteUint32(cafeBonus.Quantity) bf.WriteUint32(cafeBonus.Quantity)
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
bf.WriteUint32(count) bf.WriteUint32(count)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }
@@ -199,7 +199,7 @@ func handleMsgMhfPostCafeDurationBonusReceived(s *Session, p mhfpacket.MHFPacket
_ = addPointNetcafe(s, int(cafeBonus.Quantity)) _ = addPointNetcafe(s, int(cafeBonus.Quantity))
} }
} }
s.server.db.Exec("INSERT INTO public.cafe_accepted VALUES ($1, $2)", cbID, s.charID) _, _ = s.server.db.Exec("INSERT INTO public.cafe_accepted VALUES ($1, $2)", cbID, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -215,7 +215,7 @@ func addPointNetcafe(s *Session, p int) error {
} else { } else {
points += p points += p
} }
s.server.db.Exec("UPDATE characters SET netcafe_points=$1 WHERE id=$2", points, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET netcafe_points=$1 WHERE id=$2", points, s.charID)
return nil return nil
} }
@@ -228,7 +228,7 @@ func handleMsgMhfStartBoostTime(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
return return
} }
s.server.db.Exec("UPDATE characters SET boost_time=$1 WHERE id=$2", boostLimit, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET boost_time=$1 WHERE id=$2", boostLimit, s.charID)
bf.WriteUint32(uint32(boostLimit.Unix())) bf.WriteUint32(uint32(boostLimit.Unix()))
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }

10
server/channelserver/handlers_cast_binary.go
View File

@@ -123,11 +123,11 @@ func parseChatCommand(s *Session, command string) {
err := s.server.db.QueryRow(`SELECT id, username FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, cid).Scan(&uid, &uname) err := s.server.db.QueryRow(`SELECT id, username FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, cid).Scan(&uid, &uname)
if err == nil { if err == nil {
if expiry.IsZero() { if expiry.IsZero() {
s.server.db.Exec(`INSERT INTO bans VALUES ($1) _, _ = s.server.db.Exec(`INSERT INTO bans VALUES ($1)
ON CONFLICT (user_id) DO UPDATE SET expires=NULL`, uid) ON CONFLICT (user_id) DO UPDATE SET expires=NULL`, uid)
sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.ban.success, uname)) sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.ban.success, uname))
} else { } else {
s.server.db.Exec(`INSERT INTO bans VALUES ($1, $2) _, _ = s.server.db.Exec(`INSERT INTO bans VALUES ($1, $2)
ON CONFLICT (user_id) DO UPDATE SET expires=$2`, uid, expiry) ON CONFLICT (user_id) DO UPDATE SET expires=$2`, uid, expiry)
sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.ban.success, uname)+fmt.Sprintf(s.server.i18n.commands.ban.length, expiry.Format(time.DateTime))) sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.ban.success, uname)+fmt.Sprintf(s.server.i18n.commands.ban.length, expiry.Format(time.DateTime)))
} }
@@ -150,7 +150,7 @@ func parseChatCommand(s *Session, command string) {
if err := s.server.db.QueryRow(`SELECT COALESCE(timer, false) FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, s.charID).Scan(&state); err != nil { if err := s.server.db.QueryRow(`SELECT COALESCE(timer, false) FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, s.charID).Scan(&state); err != nil {
s.logger.Error("Failed to get timer state", zap.Error(err)) s.logger.Error("Failed to get timer state", zap.Error(err))
} }
s.server.db.Exec(`UPDATE users u SET timer=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, !state, s.charID) _, _ = s.server.db.Exec(`UPDATE users u SET timer=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, !state, s.charID)
if state { if state {
sendServerChatMessage(s, s.server.i18n.commands.timer.disabled) sendServerChatMessage(s, s.server.i18n.commands.timer.disabled)
} else { } else {
@@ -308,7 +308,7 @@ func parseChatCommand(s *Session, command string) {
} }
err := s.server.db.QueryRow("SELECT rights FROM users u INNER JOIN characters c ON u.id = c.user_id WHERE c.id = $1", s.charID).Scan(&rightsInt) err := s.server.db.QueryRow("SELECT rights FROM users u INNER JOIN characters c ON u.id = c.user_id WHERE c.id = $1", s.charID).Scan(&rightsInt)
if err == nil { if err == nil {
s.server.db.Exec("UPDATE users u SET rights=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", rightsInt+delta, s.charID) _, _ = s.server.db.Exec("UPDATE users u SET rights=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", rightsInt+delta, s.charID)
} }
updateRights(s) updateRights(s)
} else { } else {
@@ -406,7 +406,7 @@ func parseChatCommand(s *Session, command string) {
randToken := make([]byte, 4) randToken := make([]byte, 4)
_, _ = rand.Read(randToken) _, _ = rand.Read(randToken)
_token = fmt.Sprintf("%x-%x", randToken[:2], randToken[2:]) _token = fmt.Sprintf("%x-%x", randToken[:2], randToken[2:])
s.server.db.Exec(`UPDATE users u SET discord_token = $1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, _token, s.charID) _, _ = s.server.db.Exec(`UPDATE users u SET discord_token = $1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, _token, s.charID)
} }
sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.discord.success, _token)) sendServerChatMessage(s, fmt.Sprintf(s.server.i18n.commands.discord.success, _token))
} else { } else {

2
server/channelserver/handlers_character.go
View File

@@ -186,7 +186,7 @@ func (save *CharacterSaveData) Save(s *Session) {
s.logger.Error("Failed to update savedata", zap.Error(err), zap.Uint32("charID", save.CharID)) s.logger.Error("Failed to update savedata", zap.Error(err), zap.Uint32("charID", save.CharID))
} }
s.server.db.Exec(`UPDATE user_binary SET house_tier=$1, house_data=$2, bookshelf=$3, gallery=$4, tore=$5, garden=$6 WHERE id=$7 _, _ = s.server.db.Exec(`UPDATE user_binary SET house_tier=$1, house_data=$2, bookshelf=$3, gallery=$4, tore=$5, garden=$6 WHERE id=$7
`, save.HouseTier, save.HouseData, save.BookshelfData, save.GalleryData, save.ToreData, save.GardenData, s.charID) `, save.HouseTier, save.HouseData, save.BookshelfData, save.GalleryData, save.ToreData, save.GardenData, s.charID)
} }

4
server/channelserver/handlers_clients.go
View File

@@ -94,7 +94,7 @@ func handleMsgMhfOprMember(s *Session, p mhfpacket.MHFPacket) {
} else { } else {
csv = stringsupport.CSVAdd(csv, int(cid)) csv = stringsupport.CSVAdd(csv, int(cid))
} }
s.server.db.Exec("UPDATE characters SET blocked=$1 WHERE id=$2", csv, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET blocked=$1 WHERE id=$2", csv, s.charID)
} }
} else { // Friendlist } else { // Friendlist
err := s.server.db.QueryRow("SELECT friends FROM characters WHERE id=$1", s.charID).Scan(&csv) err := s.server.db.QueryRow("SELECT friends FROM characters WHERE id=$1", s.charID).Scan(&csv)
@@ -104,7 +104,7 @@ func handleMsgMhfOprMember(s *Session, p mhfpacket.MHFPacket) {
} else { } else {
csv = stringsupport.CSVAdd(csv, int(cid)) csv = stringsupport.CSVAdd(csv, int(cid))
} }
s.server.db.Exec("UPDATE characters SET friends=$1 WHERE id=$2", csv, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET friends=$1 WHERE id=$2", csv, s.charID)
} }
} }
} }

4
server/channelserver/handlers_data.go
View File

@@ -78,7 +78,7 @@ func handleMsgMhfSavedata(s *Session, p mhfpacket.MHFPacket) {
s.rawConn.Close() s.rawConn.Close()
s.logger.Warn("Save cancelled due to corruption.") s.logger.Warn("Save cancelled due to corruption.")
if s.server.erupeConfig.DeleteOnSaveCorruption { if s.server.erupeConfig.DeleteOnSaveCorruption {
s.server.db.Exec("UPDATE characters SET deleted=true WHERE id=$1", s.charID) _, _ = s.server.db.Exec("UPDATE characters SET deleted=true WHERE id=$1", s.charID)
} }
return return
} }
@@ -172,7 +172,7 @@ func handleMsgMhfLoaddata(s *Session, p mhfpacket.MHFPacket) {
s.logger.Error("Failed to decompress savedata", zap.Error(err)) s.logger.Error("Failed to decompress savedata", zap.Error(err))
} }
bf := byteframe.NewByteFrameFromBytes(decompSaveData) bf := byteframe.NewByteFrameFromBytes(decompSaveData)
bf.Seek(88, io.SeekStart) _, _ = bf.Seek(88, io.SeekStart)
name := bf.ReadNullTerminatedBytes() name := bf.ReadNullTerminatedBytes()
s.server.userBinaryPartsLock.Lock() s.server.userBinaryPartsLock.Lock()
s.server.userBinaryParts[userBinaryPartID{charID: s.charID, index: 1}] = append(name, []byte{0x00}...) s.server.userBinaryParts[userBinaryPartID{charID: s.charID, index: 1}] = append(name, []byte{0x00}...)

6
server/channelserver/handlers_distitem.go
View File

@@ -170,11 +170,11 @@ func handleMsgMhfAcquireDistItem(s *Session, p mhfpacket.MHFPacket) {
case 17: case 17:
_ = addPointNetcafe(s, int(item.Quantity)) _ = addPointNetcafe(s, int(item.Quantity))
case 19: case 19:
s.server.db.Exec("UPDATE users u SET gacha_premium=gacha_premium+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID) _, _ = s.server.db.Exec("UPDATE users u SET gacha_premium=gacha_premium+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID)
case 20: case 20:
s.server.db.Exec("UPDATE users u SET gacha_trial=gacha_trial+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID) _, _ = s.server.db.Exec("UPDATE users u SET gacha_trial=gacha_trial+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID)
case 21: case 21:
s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID) _, _ = s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points+$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", item.Quantity, s.charID)
case 23: case 23:
saveData, err := GetCharacterSaveData(s, s.charID) saveData, err := GetCharacterSaveData(s, s.charID)
if err == nil { if err == nil {

4
server/channelserver/handlers_diva.go
View File

@@ -12,7 +12,7 @@ import (
) )
func cleanupDiva(s *Session) { func cleanupDiva(s *Session) {
s.server.db.Exec("DELETE FROM events WHERE event_type='diva'") _, _ = s.server.db.Exec("DELETE FROM events WHERE event_type='diva'")
} }
func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 { func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 {
@@ -49,7 +49,7 @@ func generateDivaTimestamps(s *Session, start uint32, debug bool) []uint32 {
cleanupDiva(s) cleanupDiva(s)
// Generate a new diva defense, starting midnight tomorrow // Generate a new diva defense, starting midnight tomorrow
start = uint32(midnight.Add(24 * time.Hour).Unix()) start = uint32(midnight.Add(24 * time.Hour).Unix())
s.server.db.Exec("INSERT INTO events (event_type, start_time) VALUES ('diva', to_timestamp($1)::timestamp without time zone)", start) _, _ = s.server.db.Exec("INSERT INTO events (event_type, start_time) VALUES ('diva', to_timestamp($1)::timestamp without time zone)", start)
} }
timestamps[0] = start timestamps[0] = start
timestamps[1] = timestamps[0] + 601200 timestamps[1] = timestamps[0] + 601200

8
server/channelserver/handlers_event.go
View File

@@ -69,7 +69,7 @@ func handleMsgMhfGetWeeklySchedule(s *Session, p mhfpacket.MHFPacket) {
weapons := token.RNG.Intn(s.server.erupeConfig.GameplayOptions.MaxFeatureWeapons-s.server.erupeConfig.GameplayOptions.MinFeatureWeapons+1) + s.server.erupeConfig.GameplayOptions.MinFeatureWeapons weapons := token.RNG.Intn(s.server.erupeConfig.GameplayOptions.MaxFeatureWeapons-s.server.erupeConfig.GameplayOptions.MinFeatureWeapons+1) + s.server.erupeConfig.GameplayOptions.MinFeatureWeapons
temp = generateFeatureWeapons(weapons) temp = generateFeatureWeapons(weapons)
temp.StartTime = t temp.StartTime = t
s.server.db.Exec(`INSERT INTO feature_weapon VALUES ($1, $2)`, temp.StartTime, temp.ActiveFeatures) _, _ = s.server.db.Exec(`INSERT INTO feature_weapon VALUES ($1, $2)`, temp.StartTime, temp.ActiveFeatures)
} }
features = append(features, temp) features = append(features, temp)
} }
@@ -155,7 +155,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) {
{WeekReq: 5, Expiration: temp}, {WeekReq: 5, Expiration: temp},
} }
for _, boost := range loginBoosts { for _, boost := range loginBoosts {
s.server.db.Exec(`INSERT INTO login_boost VALUES ($1, $2, $3, $4)`, s.charID, boost.WeekReq, boost.Expiration, time.Time{}) _, _ = s.server.db.Exec(`INSERT INTO login_boost VALUES ($1, $2, $3, $4)`, s.charID, boost.WeekReq, boost.Expiration, time.Time{})
} }
} }
@@ -164,7 +164,7 @@ func handleMsgMhfGetKeepLoginBoostStatus(s *Session, p mhfpacket.MHFPacket) {
if !boost.Reset.IsZero() && boost.Reset.Before(TimeAdjusted()) { if !boost.Reset.IsZero() && boost.Reset.Before(TimeAdjusted()) {
boost.Expiration = TimeWeekStart() boost.Expiration = TimeWeekStart()
boost.Reset = time.Time{} boost.Reset = time.Time{}
s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, boost.Expiration, boost.Reset, s.charID, boost.WeekReq) _, _ = s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, boost.Expiration, boost.Reset, s.charID, boost.WeekReq)
} }
boost.WeekCount = uint8((TimeAdjusted().Unix()-boost.Expiration.Unix())/604800 + 1) boost.WeekCount = uint8((TimeAdjusted().Unix()-boost.Expiration.Unix())/604800 + 1)
@@ -207,7 +207,7 @@ func handleMsgMhfUseKeepLoginBoost(s *Session, p mhfpacket.MHFPacket) {
expiration = TimeAdjusted().Add(240 * time.Minute) expiration = TimeAdjusted().Add(240 * time.Minute)
} }
bf.WriteUint32(uint32(expiration.Unix())) bf.WriteUint32(uint32(expiration.Unix()))
s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, expiration, TimeWeekNext(), s.charID, pkt.BoostWeekUsed) _, _ = s.server.db.Exec(`UPDATE login_boost SET expiration=$1, reset=$2 WHERE char_id=$3 AND week_req=$4`, expiration, TimeWeekNext(), s.charID, pkt.BoostWeekUsed)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }

26
server/channelserver/handlers_festa.go
View File

@@ -13,7 +13,7 @@ import (
func handleMsgMhfSaveMezfesData(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSaveMezfesData(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfSaveMezfesData) pkt := p.(*mhfpacket.MsgMhfSaveMezfesData)
s.server.db.Exec(`UPDATE characters SET mezfes=$1 WHERE id=$2`, pkt.RawDataPayload, s.charID) _, _ = s.server.db.Exec(`UPDATE characters SET mezfes=$1 WHERE id=$2`, pkt.RawDataPayload, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
} }
@@ -96,11 +96,11 @@ func handleMsgMhfEnumerateRanking(s *Session, p mhfpacket.MHFPacket) {
} }
func cleanupFesta(s *Session) { func cleanupFesta(s *Session) {
s.server.db.Exec("DELETE FROM events WHERE event_type='festa'") _, _ = s.server.db.Exec("DELETE FROM events WHERE event_type='festa'")
s.server.db.Exec("DELETE FROM festa_registrations") _, _ = s.server.db.Exec("DELETE FROM festa_registrations")
s.server.db.Exec("DELETE FROM festa_submissions") _, _ = s.server.db.Exec("DELETE FROM festa_submissions")
s.server.db.Exec("DELETE FROM festa_prizes_accepted") _, _ = s.server.db.Exec("DELETE FROM festa_prizes_accepted")
s.server.db.Exec("UPDATE guild_characters SET trial_vote=NULL") _, _ = s.server.db.Exec("UPDATE guild_characters SET trial_vote=NULL")
} }
func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 { func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
@@ -134,7 +134,7 @@ func generateFestaTimestamps(s *Session, start uint32, debug bool) []uint32 {
cleanupFesta(s) cleanupFesta(s)
// Generate a new festa, starting midnight tomorrow // Generate a new festa, starting midnight tomorrow
start = uint32(midnight.Add(24 * time.Hour).Unix()) start = uint32(midnight.Add(24 * time.Hour).Unix())
s.server.db.Exec("INSERT INTO events (event_type, start_time) VALUES ('festa', to_timestamp($1)::timestamp without time zone)", start) _, _ = s.server.db.Exec("INSERT INTO events (event_type, start_time) VALUES ('festa', to_timestamp($1)::timestamp without time zone)", start)
} }
timestamps[0] = start timestamps[0] = start
timestamps[1] = timestamps[0] + 604800 timestamps[1] = timestamps[0] + 604800
@@ -466,7 +466,7 @@ func handleMsgMhfEnumerateFestaMember(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfVoteFesta(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfVoteFesta(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfVoteFesta) pkt := p.(*mhfpacket.MsgMhfVoteFesta)
s.server.db.Exec(`UPDATE guild_characters SET trial_vote=$1 WHERE character_id=$2`, pkt.TrialID, s.charID) _, _ = s.server.db.Exec(`UPDATE guild_characters SET trial_vote=$1 WHERE character_id=$2`, pkt.TrialID, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -480,9 +480,9 @@ func handleMsgMhfEntryFesta(s *Session, p mhfpacket.MHFPacket) {
team := uint32(token.RNG.Intn(2)) team := uint32(token.RNG.Intn(2))
switch team { switch team {
case 0: case 0:
s.server.db.Exec("INSERT INTO festa_registrations VALUES ($1, 'blue')", guild.ID) _, _ = s.server.db.Exec("INSERT INTO festa_registrations VALUES ($1, 'blue')", guild.ID)
case 1: case 1:
s.server.db.Exec("INSERT INTO festa_registrations VALUES ($1, 'red')", guild.ID) _, _ = s.server.db.Exec("INSERT INTO festa_registrations VALUES ($1, 'red')", guild.ID)
} }
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(team) bf.WriteUint32(team)
@@ -512,19 +512,19 @@ func handleMsgMhfChargeFesta(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfAcquireFesta(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfAcquireFesta(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfAcquireFesta) pkt := p.(*mhfpacket.MsgMhfAcquireFesta)
s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES (0, $1)", s.charID) _, _ = s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES (0, $1)", s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
func handleMsgMhfAcquireFestaPersonalPrize(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfAcquireFestaPersonalPrize(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfAcquireFestaPersonalPrize) pkt := p.(*mhfpacket.MsgMhfAcquireFestaPersonalPrize)
s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES ($1, $2)", pkt.PrizeID, s.charID) _, _ = s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES ($1, $2)", pkt.PrizeID, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
func handleMsgMhfAcquireFestaIntermediatePrize(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfAcquireFestaIntermediatePrize(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfAcquireFestaIntermediatePrize) pkt := p.(*mhfpacket.MsgMhfAcquireFestaIntermediatePrize)
s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES ($1, $2)", pkt.PrizeID, s.charID) _, _ = s.server.db.Exec("INSERT INTO public.festa_prizes_accepted VALUES ($1, $2)", pkt.PrizeID, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

48
server/channelserver/handlers_guild.go
View File

@@ -715,9 +715,9 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
case mhfpacket.OperateGuildDonateRank: case mhfpacket.OperateGuildDonateRank:
bf.WriteBytes(handleDonateRP(s, uint16(pkt.Data1.ReadUint32()), guild, 0)) bf.WriteBytes(handleDonateRP(s, uint16(pkt.Data1.ReadUint32()), guild, 0))
case mhfpacket.OperateGuildSetApplicationDeny: case mhfpacket.OperateGuildSetApplicationDeny:
s.server.db.Exec("UPDATE guilds SET recruiting=false WHERE id=$1", guild.ID) _, _ = s.server.db.Exec("UPDATE guilds SET recruiting=false WHERE id=$1", guild.ID)
case mhfpacket.OperateGuildSetApplicationAllow: case mhfpacket.OperateGuildSetApplicationAllow:
s.server.db.Exec("UPDATE guilds SET recruiting=true WHERE id=$1", guild.ID) _, _ = s.server.db.Exec("UPDATE guilds SET recruiting=true WHERE id=$1", guild.ID)
case mhfpacket.OperateGuildSetAvoidLeadershipTrue: case mhfpacket.OperateGuildSetAvoidLeadershipTrue:
handleAvoidLeadershipUpdate(s, pkt, true) handleAvoidLeadershipUpdate(s, pkt, true)
case mhfpacket.OperateGuildSetAvoidLeadershipFalse: case mhfpacket.OperateGuildSetAvoidLeadershipFalse:
@@ -751,7 +751,7 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
case mhfpacket.OperateGuildChangePugi3: case mhfpacket.OperateGuildChangePugi3:
handleChangePugi(s, uint8(pkt.Data1.ReadUint32()), guild, 3) handleChangePugi(s, uint8(pkt.Data1.ReadUint32()), guild, 3)
case mhfpacket.OperateGuildUnlockOutfit: case mhfpacket.OperateGuildUnlockOutfit:
s.server.db.Exec(`UPDATE guilds SET pugi_outfits=$1 WHERE id=$2`, pkt.Data1.ReadUint32(), guild.ID) _, _ = s.server.db.Exec(`UPDATE guilds SET pugi_outfits=$1 WHERE id=$2`, pkt.Data1.ReadUint32(), guild.ID)
case mhfpacket.OperateGuildDonateRoom: case mhfpacket.OperateGuildDonateRoom:
quantity := uint16(pkt.Data1.ReadUint32()) quantity := uint16(pkt.Data1.ReadUint32())
bf.WriteBytes(handleDonateRP(s, quantity, guild, 2)) bf.WriteBytes(handleDonateRP(s, quantity, guild, 2))
@@ -759,7 +759,7 @@ func handleMsgMhfOperateGuild(s *Session, p mhfpacket.MHFPacket) {
quantity := uint16(pkt.Data1.ReadUint32()) quantity := uint16(pkt.Data1.ReadUint32())
bf.WriteBytes(handleDonateRP(s, quantity, guild, 1)) bf.WriteBytes(handleDonateRP(s, quantity, guild, 1))
// TODO: Move this value onto rp_yesterday and reset to 0... daily? // TODO: Move this value onto rp_yesterday and reset to 0... daily?
s.server.db.Exec(`UPDATE guild_characters SET rp_today=rp_today+$1 WHERE character_id=$2`, quantity, s.charID) _, _ = s.server.db.Exec(`UPDATE guild_characters SET rp_today=rp_today+$1 WHERE character_id=$2`, quantity, s.charID)
case mhfpacket.OperateGuildEventExchange: case mhfpacket.OperateGuildEventExchange:
rp := uint16(pkt.Data1.ReadUint32()) rp := uint16(pkt.Data1.ReadUint32())
var balance uint32 var balance uint32
@@ -825,18 +825,18 @@ func handleDonateRP(s *Session, amount uint16, guild *Guild, _type int) []byte {
saveData.Save(s) saveData.Save(s)
switch _type { switch _type {
case 0: case 0:
s.server.db.Exec(`UPDATE guilds SET rank_rp = rank_rp + $1 WHERE id = $2`, amount, guild.ID) _, _ = s.server.db.Exec(`UPDATE guilds SET rank_rp = rank_rp + $1 WHERE id = $2`, amount, guild.ID)
case 1: case 1:
s.server.db.Exec(`UPDATE guilds SET event_rp = event_rp + $1 WHERE id = $2`, amount, guild.ID) _, _ = s.server.db.Exec(`UPDATE guilds SET event_rp = event_rp + $1 WHERE id = $2`, amount, guild.ID)
case 2: case 2:
if resetRoom { if resetRoom {
s.server.db.Exec(`UPDATE guilds SET room_rp = 0 WHERE id = $1`, guild.ID) _, _ = s.server.db.Exec(`UPDATE guilds SET room_rp = 0 WHERE id = $1`, guild.ID)
s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, TimeAdjusted().Add(time.Hour*24*7), guild.ID) _, _ = s.server.db.Exec(`UPDATE guilds SET room_expiry = $1 WHERE id = $2`, TimeAdjusted().Add(time.Hour*24*7), guild.ID)
} else { } else {
s.server.db.Exec(`UPDATE guilds SET room_rp = room_rp + $1 WHERE id = $2`, amount, guild.ID) _, _ = s.server.db.Exec(`UPDATE guilds SET room_rp = room_rp + $1 WHERE id = $2`, amount, guild.ID)
} }
} }
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
bf.WriteUint32(uint32(saveData.RP)) bf.WriteUint32(uint32(saveData.RP))
return bf.Data() return bf.Data()
} }
@@ -1622,7 +1622,7 @@ func handleMsgMhfEnumerateGuildItem(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfUpdateGuildItem(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateGuildItem(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUpdateGuildItem) pkt := p.(*mhfpacket.MsgMhfUpdateGuildItem)
newStacks := mhfitem.DiffItemStacks(guildGetItems(s, pkt.GuildID), pkt.UpdatedItems) newStacks := mhfitem.DiffItemStacks(guildGetItems(s, pkt.GuildID), pkt.UpdatedItems)
s.server.db.Exec(`UPDATE guilds SET item_box=$1 WHERE id=$2`, mhfitem.SerializeWarehouseItems(newStacks), pkt.GuildID) _, _ = s.server.db.Exec(`UPDATE guilds SET item_box=$1 WHERE id=$2`, mhfitem.SerializeWarehouseItems(newStacks), pkt.GuildID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -1810,9 +1810,9 @@ func handleMsgMhfRegistGuildCooking(s *Session, p mhfpacket.MHFPacket) {
guild, _ := GetGuildInfoByCharacterId(s, s.charID) guild, _ := GetGuildInfoByCharacterId(s, s.charID)
startTime := TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.ClanMealDuration-3600) * time.Second) startTime := TimeAdjusted().Add(time.Duration(s.server.erupeConfig.GameplayOptions.ClanMealDuration-3600) * time.Second)
if pkt.OverwriteID != 0 { if pkt.OverwriteID != 0 {
s.server.db.Exec("UPDATE guild_meals SET meal_id = $1, level = $2, created_at = $3 WHERE id = $4", pkt.MealID, pkt.Success, startTime, pkt.OverwriteID) _, _ = s.server.db.Exec("UPDATE guild_meals SET meal_id = $1, level = $2, created_at = $3 WHERE id = $4", pkt.MealID, pkt.Success, startTime, pkt.OverwriteID)
} else { } else {
s.server.db.QueryRow("INSERT INTO guild_meals (guild_id, meal_id, level, created_at) VALUES ($1, $2, $3, $4) RETURNING id", guild.ID, pkt.MealID, pkt.Success, startTime).Scan(&pkt.OverwriteID) _ = s.server.db.QueryRow("INSERT INTO guild_meals (guild_id, meal_id, level, created_at) VALUES ($1, $2, $3, $4) RETURNING id", guild.ID, pkt.MealID, pkt.Success, startTime).Scan(&pkt.OverwriteID)
} }
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint16(1) bf.WriteUint16(1)
@@ -1843,7 +1843,7 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
switch pkt.Operation { switch pkt.Operation {
case 0: // Acquire case 0: // Acquire
s.server.db.Exec(`UPDATE guild_characters SET box_claimed=$1 WHERE character_id=$2`, TimeAdjusted(), s.charID) _, _ = s.server.db.Exec(`UPDATE guild_characters SET box_claimed=$1 WHERE character_id=$2`, TimeAdjusted(), s.charID)
case 1: // Enumerate case 1: // Enumerate
bf.WriteUint8(0) // Entries bf.WriteUint8(0) // Entries
rows, err := s.server.db.Query(`SELECT kl.id, kl.monster FROM kill_logs kl rows, err := s.server.db.Query(`SELECT kl.id, kl.monster FROM kill_logs kl
@@ -1867,7 +1867,7 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(huntID) bf.WriteUint32(huntID)
bf.WriteUint32(monID) bf.WriteUint32(monID)
} }
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
bf.WriteUint8(count) bf.WriteUint8(count)
} }
case 2: // Check case 2: // Check
@@ -1913,7 +1913,7 @@ func handleMsgMhfEnumerateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
return return
} }
s.server.db.Exec("UPDATE characters SET guild_post_checked = now() WHERE id = $1", s.charID) _, _ = s.server.db.Exec("UPDATE characters SET guild_post_checked = now() WHERE id = $1", s.charID)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
var postCount uint32 var postCount uint32
for msgs.Next() { for msgs.Next() {
@@ -1952,14 +1952,14 @@ func handleMsgMhfUpdateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
} }
switch pkt.MessageOp { switch pkt.MessageOp {
case 0: // Create message case 0: // Create message
s.server.db.Exec("INSERT INTO guild_posts (guild_id, author_id, stamp_id, post_type, title, body) VALUES ($1, $2, $3, $4, $5, $6)", guild.ID, s.charID, pkt.StampID, pkt.PostType, pkt.Title, pkt.Body) _, _ = s.server.db.Exec("INSERT INTO guild_posts (guild_id, author_id, stamp_id, post_type, title, body) VALUES ($1, $2, $3, $4, $5, $6)", guild.ID, s.charID, pkt.StampID, pkt.PostType, pkt.Title, pkt.Body)
// TODO: if there are too many messages, purge excess // TODO: if there are too many messages, purge excess
case 1: // Delete message case 1: // Delete message
s.server.db.Exec("DELETE FROM guild_posts WHERE id = $1", pkt.PostID) _, _ = s.server.db.Exec("DELETE FROM guild_posts WHERE id = $1", pkt.PostID)
case 2: // Update message case 2: // Update message
s.server.db.Exec("UPDATE guild_posts SET title = $1, body = $2 WHERE id = $3", pkt.Title, pkt.Body, pkt.PostID) _, _ = s.server.db.Exec("UPDATE guild_posts SET title = $1, body = $2 WHERE id = $3", pkt.Title, pkt.Body, pkt.PostID)
case 3: // Update stamp case 3: // Update stamp
s.server.db.Exec("UPDATE guild_posts SET stamp_id = $1 WHERE id = $2", pkt.StampID, pkt.PostID) _, _ = s.server.db.Exec("UPDATE guild_posts SET stamp_id = $1 WHERE id = $2", pkt.StampID, pkt.PostID)
case 4: // Like message case 4: // Like message
var likedBy string var likedBy string
err := s.server.db.QueryRow("SELECT liked_by FROM guild_posts WHERE id = $1", pkt.PostID).Scan(&likedBy) err := s.server.db.QueryRow("SELECT liked_by FROM guild_posts WHERE id = $1", pkt.PostID).Scan(&likedBy)
@@ -1968,10 +1968,10 @@ func handleMsgMhfUpdateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
} else { } else {
if pkt.LikeState { if pkt.LikeState {
likedBy = stringsupport.CSVAdd(likedBy, int(s.charID)) likedBy = stringsupport.CSVAdd(likedBy, int(s.charID))
s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE id = $2", likedBy, pkt.PostID) _, _ = s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE id = $2", likedBy, pkt.PostID)
} else { } else {
likedBy = stringsupport.CSVRemove(likedBy, int(s.charID)) likedBy = stringsupport.CSVRemove(likedBy, int(s.charID))
s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE id = $2", likedBy, pkt.PostID) _, _ = s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE id = $2", likedBy, pkt.PostID)
} }
} }
case 5: // Check for new messages case 5: // Check for new messages
@@ -1979,7 +1979,7 @@ func handleMsgMhfUpdateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
var newPosts int var newPosts int
err := s.server.db.QueryRow("SELECT guild_post_checked FROM characters WHERE id = $1", s.charID).Scan(&timeChecked) err := s.server.db.QueryRow("SELECT guild_post_checked FROM characters WHERE id = $1", s.charID).Scan(&timeChecked)
if err == nil { if err == nil {
s.server.db.QueryRow("SELECT COUNT(*) FROM guild_posts WHERE guild_id = $1 AND (EXTRACT(epoch FROM created_at)::int) > $2", guild.ID, timeChecked.Unix()).Scan(&newPosts) _ = s.server.db.QueryRow("SELECT COUNT(*) FROM guild_posts WHERE guild_id = $1 AND (EXTRACT(epoch FROM created_at)::int) > $2", guild.ID, timeChecked.Unix()).Scan(&newPosts)
if newPosts > 0 { if newPosts > 0 {
doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01}) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
return return
@@ -2012,7 +2012,7 @@ func handleMsgMhfUpdateGuild(s *Session, p mhfpacket.MHFPacket) {}
func handleMsgMhfSetGuildManageRight(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSetGuildManageRight(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfSetGuildManageRight) pkt := p.(*mhfpacket.MsgMhfSetGuildManageRight)
s.server.db.Exec("UPDATE guild_characters SET recruiter=$1 WHERE character_id=$2", pkt.Allowed, pkt.CharID) _, _ = s.server.db.Exec("UPDATE guild_characters SET recruiter=$1 WHERE character_id=$2", pkt.Allowed, pkt.CharID)
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

12
server/channelserver/handlers_guild_alliance.go
View File

@@ -145,11 +145,11 @@ func handleMsgMhfOperateJoint(s *Session, p mhfpacket.MHFPacket) {
case mhfpacket.OPERATE_JOINT_LEAVE: case mhfpacket.OPERATE_JOINT_LEAVE:
if guild.LeaderCharID == s.charID { if guild.LeaderCharID == s.charID {
if guild.ID == alliance.SubGuild1ID && alliance.SubGuild2ID > 0 { if guild.ID == alliance.SubGuild1ID && alliance.SubGuild2ID > 0 {
s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = sub2_id, sub2_id = NULL WHERE id = $1`, alliance.ID) _, _ = s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = sub2_id, sub2_id = NULL WHERE id = $1`, alliance.ID)
} else if guild.ID == alliance.SubGuild1ID && alliance.SubGuild2ID == 0 { } else if guild.ID == alliance.SubGuild1ID && alliance.SubGuild2ID == 0 {
s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = NULL WHERE id = $1`, alliance.ID) _, _ = s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = NULL WHERE id = $1`, alliance.ID)
} else { } else {
s.server.db.Exec(`UPDATE guild_alliances SET sub2_id = NULL WHERE id = $1`, alliance.ID) _, _ = s.server.db.Exec(`UPDATE guild_alliances SET sub2_id = NULL WHERE id = $1`, alliance.ID)
} }
// TODO: Handle deleting Alliance applications // TODO: Handle deleting Alliance applications
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
@@ -164,11 +164,11 @@ func handleMsgMhfOperateJoint(s *Session, p mhfpacket.MHFPacket) {
if alliance.ParentGuild.LeaderCharID == s.charID { if alliance.ParentGuild.LeaderCharID == s.charID {
kickedGuildID := pkt.Data1.ReadUint32() kickedGuildID := pkt.Data1.ReadUint32()
if kickedGuildID == alliance.SubGuild1ID && alliance.SubGuild2ID > 0 { if kickedGuildID == alliance.SubGuild1ID && alliance.SubGuild2ID > 0 {
s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = sub2_id, sub2_id = NULL WHERE id = $1`, alliance.ID) _, _ = s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = sub2_id, sub2_id = NULL WHERE id = $1`, alliance.ID)
} else if kickedGuildID == alliance.SubGuild1ID && alliance.SubGuild2ID == 0 { } else if kickedGuildID == alliance.SubGuild1ID && alliance.SubGuild2ID == 0 {
s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = NULL WHERE id = $1`, alliance.ID) _, _ = s.server.db.Exec(`UPDATE guild_alliances SET sub1_id = NULL WHERE id = $1`, alliance.ID)
} else { } else {
s.server.db.Exec(`UPDATE guild_alliances SET sub2_id = NULL WHERE id = $1`, alliance.ID) _, _ = s.server.db.Exec(`UPDATE guild_alliances SET sub2_id = NULL WHERE id = $1`, alliance.ID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} else { } else {

12
server/channelserver/handlers_guild_tresure.go
View File

@@ -108,14 +108,14 @@ func handleMsgMhfRegistGuildTresure(s *Session, p mhfpacket.MHFPacket) {
huntData.WriteBytes(bf.ReadBytes(9)) huntData.WriteBytes(bf.ReadBytes(9))
} }
} }
s.server.db.Exec(`INSERT INTO guild_hunts (guild_id, host_id, destination, level, hunt_data, cats_used) VALUES ($1, $2, $3, $4, $5, $6) _, _ = s.server.db.Exec(`INSERT INTO guild_hunts (guild_id, host_id, destination, level, hunt_data, cats_used) VALUES ($1, $2, $3, $4, $5, $6)
`, guild.ID, s.charID, destination, level, huntData.Data(), catsUsed) `, guild.ID, s.charID, destination, level, huntData.Data(), catsUsed)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
func handleMsgMhfAcquireGuildTresure(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfAcquireGuildTresure(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfAcquireGuildTresure) pkt := p.(*mhfpacket.MsgMhfAcquireGuildTresure)
s.server.db.Exec(`UPDATE guild_hunts SET acquired=true WHERE id=$1`, pkt.HuntID) _, _ = s.server.db.Exec(`UPDATE guild_hunts SET acquired=true WHERE id=$1`, pkt.HuntID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -123,12 +123,12 @@ func handleMsgMhfOperateGuildTresureReport(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfOperateGuildTresureReport) pkt := p.(*mhfpacket.MsgMhfOperateGuildTresureReport)
switch pkt.State { switch pkt.State {
case 0: // Report registration case 0: // Report registration
s.server.db.Exec(`UPDATE guild_characters SET treasure_hunt=$1 WHERE character_id=$2`, pkt.HuntID, s.charID) _, _ = s.server.db.Exec(`UPDATE guild_characters SET treasure_hunt=$1 WHERE character_id=$2`, pkt.HuntID, s.charID)
case 1: // Collected by hunter case 1: // Collected by hunter
s.server.db.Exec(`UPDATE guild_hunts SET collected=true WHERE id=$1`, pkt.HuntID) _, _ = s.server.db.Exec(`UPDATE guild_hunts SET collected=true WHERE id=$1`, pkt.HuntID)
s.server.db.Exec(`UPDATE guild_characters SET treasure_hunt=NULL WHERE treasure_hunt=$1`, pkt.HuntID) _, _ = s.server.db.Exec(`UPDATE guild_characters SET treasure_hunt=NULL WHERE treasure_hunt=$1`, pkt.HuntID)
case 2: // Claim treasure case 2: // Claim treasure
s.server.db.Exec(`INSERT INTO guild_hunts_claimed VALUES ($1, $2)`, pkt.HuntID, s.charID) _, _ = s.server.db.Exec(`INSERT INTO guild_hunts_claimed VALUES ($1, $2)`, pkt.HuntID, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

40
server/channelserver/handlers_house.go
View File

@@ -41,7 +41,7 @@ FROM warehouse
func handleMsgMhfUpdateInterior(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateInterior(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUpdateInterior) pkt := p.(*mhfpacket.MsgMhfUpdateInterior)
s.server.db.Exec(`UPDATE user_binary SET house_furniture=$1 WHERE id=$2`, pkt.InteriorData, s.charID) _, _ = s.server.db.Exec(`UPDATE user_binary SET house_furniture=$1 WHERE id=$2`, pkt.InteriorData, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -64,7 +64,7 @@ func handleMsgMhfEnumerateHouse(s *Session, p mhfpacket.MHFPacket) {
switch pkt.Method { switch pkt.Method {
case 1: case 1:
var friendsList string var friendsList string
s.server.db.QueryRow("SELECT friends FROM characters WHERE id=$1", s.charID).Scan(&friendsList) _ = s.server.db.QueryRow("SELECT friends FROM characters WHERE id=$1", s.charID).Scan(&friendsList)
cids := stringsupport.CSVElems(friendsList) cids := stringsupport.CSVElems(friendsList)
for _, cid := range cids { for _, cid := range cids {
house := HouseData{} house := HouseData{}
@@ -130,7 +130,7 @@ func handleMsgMhfEnumerateHouse(s *Session, p mhfpacket.MHFPacket) {
} }
ps.Uint8(bf, house.Name, true) ps.Uint8(bf, house.Name, true)
} }
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
bf.WriteUint16(uint16(len(houses))) bf.WriteUint16(uint16(len(houses)))
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }
@@ -142,7 +142,7 @@ func handleMsgMhfUpdateHouse(s *Session, p mhfpacket.MHFPacket) {
// 03 = open friends // 03 = open friends
// 04 = open guild // 04 = open guild
// 05 = open friends+guild // 05 = open friends+guild
s.server.db.Exec(`UPDATE user_binary SET house_state=$1, house_password=$2 WHERE id=$3`, pkt.State, pkt.Password, s.charID) _, _ = s.server.db.Exec(`UPDATE user_binary SET house_state=$1, house_password=$2 WHERE id=$3`, pkt.State, pkt.Password, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -152,7 +152,7 @@ func handleMsgMhfLoadHouse(s *Session, p mhfpacket.MHFPacket) {
var state uint8 var state uint8
var password string var password string
s.server.db.QueryRow(`SELECT COALESCE(house_state, 2) as house_state, COALESCE(house_password, '') as house_password FROM user_binary WHERE id=$1 _ = s.server.db.QueryRow(`SELECT COALESCE(house_state, 2) as house_state, COALESCE(house_password, '') as house_password FROM user_binary WHERE id=$1
`, pkt.CharID).Scan(&state, &password) `, pkt.CharID).Scan(&state, &password)
if pkt.Destination != 9 && len(pkt.Password) > 0 && pkt.CheckPass { if pkt.Destination != 9 && len(pkt.Password) > 0 && pkt.CheckPass {
@@ -168,7 +168,7 @@ func handleMsgMhfLoadHouse(s *Session, p mhfpacket.MHFPacket) {
// Friends list verification // Friends list verification
if state == 3 || state == 5 { if state == 3 || state == 5 {
var friendsList string var friendsList string
s.server.db.QueryRow(`SELECT friends FROM characters WHERE id=$1`, pkt.CharID).Scan(&friendsList) _ = s.server.db.QueryRow(`SELECT friends FROM characters WHERE id=$1`, pkt.CharID).Scan(&friendsList)
cids := stringsupport.CSVElems(friendsList) cids := stringsupport.CSVElems(friendsList)
for _, cid := range cids { for _, cid := range cids {
if uint32(cid) == s.charID { if uint32(cid) == s.charID {
@@ -199,7 +199,7 @@ func handleMsgMhfLoadHouse(s *Session, p mhfpacket.MHFPacket) {
} }
var houseTier, houseData, houseFurniture, bookshelf, gallery, tore, garden []byte var houseTier, houseData, houseFurniture, bookshelf, gallery, tore, garden []byte
s.server.db.QueryRow(`SELECT house_tier, house_data, house_furniture, bookshelf, gallery, tore, garden FROM user_binary WHERE id=$1 _ = s.server.db.QueryRow(`SELECT house_tier, house_data, house_furniture, bookshelf, gallery, tore, garden FROM user_binary WHERE id=$1
`, pkt.CharID).Scan(&houseTier, &houseData, &houseFurniture, &bookshelf, &gallery, &tore, &garden) `, pkt.CharID).Scan(&houseTier, &houseData, &houseFurniture, &bookshelf, &gallery, &tore, &garden)
if houseFurniture == nil { if houseFurniture == nil {
houseFurniture = make([]byte, 20) houseFurniture = make([]byte, 20)
@@ -238,7 +238,7 @@ func handleMsgMhfLoadHouse(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfGetMyhouseInfo(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGetMyhouseInfo(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfGetMyhouseInfo) pkt := p.(*mhfpacket.MsgMhfGetMyhouseInfo)
var data []byte var data []byte
s.server.db.QueryRow(`SELECT mission FROM user_binary WHERE id=$1`, s.charID).Scan(&data) _ = s.server.db.QueryRow(`SELECT mission FROM user_binary WHERE id=$1`, s.charID).Scan(&data)
if len(data) > 0 { if len(data) > 0 {
doAckBufSucceed(s, pkt.AckHandle, data) doAckBufSucceed(s, pkt.AckHandle, data)
} else { } else {
@@ -248,7 +248,7 @@ func handleMsgMhfGetMyhouseInfo(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfUpdateMyhouseInfo(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateMyhouseInfo(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUpdateMyhouseInfo) pkt := p.(*mhfpacket.MsgMhfUpdateMyhouseInfo)
s.server.db.Exec("UPDATE user_binary SET mission=$1 WHERE id=$2", pkt.Data, s.charID) _, _ = s.server.db.Exec("UPDATE user_binary SET mission=$1 WHERE id=$2", pkt.Data, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -317,7 +317,7 @@ func handleMsgMhfSaveDecoMyset(s *Session, p mhfpacket.MHFPacket) {
} }
dumpSaveData(s, bf.Data(), "decomyset") dumpSaveData(s, bf.Data(), "decomyset")
s.server.db.Exec("UPDATE characters SET decomyset=$1 WHERE id=$2", bf.Data(), s.charID) _, _ = s.server.db.Exec("UPDATE characters SET decomyset=$1 WHERE id=$2", bf.Data(), s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -350,7 +350,7 @@ func handleMsgMhfEnumerateTitle(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint32(uint32(title.Acquired.Unix())) bf.WriteUint32(uint32(title.Acquired.Unix()))
bf.WriteUint32(uint32(title.Updated.Unix())) bf.WriteUint32(uint32(title.Updated.Unix()))
} }
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
bf.WriteUint16(count) bf.WriteUint16(count)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())
} }
@@ -361,9 +361,9 @@ func handleMsgMhfAcquireTitle(s *Session, p mhfpacket.MHFPacket) {
var exists int var exists int
err := s.server.db.QueryRow(`SELECT count(*) FROM titles WHERE id=$1 AND char_id=$2`, title, s.charID).Scan(&exists) err := s.server.db.QueryRow(`SELECT count(*) FROM titles WHERE id=$1 AND char_id=$2`, title, s.charID).Scan(&exists)
if err != nil || exists == 0 { if err != nil || exists == 0 {
s.server.db.Exec(`INSERT INTO titles VALUES ($1, $2, now(), now())`, title, s.charID) _, _ = s.server.db.Exec(`INSERT INTO titles VALUES ($1, $2, now(), now())`, title, s.charID)
} else { } else {
s.server.db.Exec(`UPDATE titles SET updated_at=now() WHERE id=$1 AND char_id=$2`, title, s.charID) _, _ = s.server.db.Exec(`UPDATE titles SET updated_at=now() WHERE id=$1 AND char_id=$2`, title, s.charID)
} }
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
@@ -375,7 +375,7 @@ func initializeWarehouse(s *Session) {
var t int var t int
err := s.server.db.QueryRow("SELECT character_id FROM warehouse WHERE character_id=$1", s.charID).Scan(&t) err := s.server.db.QueryRow("SELECT character_id FROM warehouse WHERE character_id=$1", s.charID).Scan(&t)
if err != nil { if err != nil {
s.server.db.Exec("INSERT INTO warehouse (character_id) VALUES ($1)", s.charID) _, _ = s.server.db.Exec("INSERT INTO warehouse (character_id) VALUES ($1)", s.charID)
} }
} }
@@ -389,7 +389,7 @@ func handleMsgMhfOperateWarehouse(s *Session, p mhfpacket.MHFPacket) {
var count uint8 var count uint8
itemNames := make([]string, 10) itemNames := make([]string, 10)
equipNames := make([]string, 10) equipNames := make([]string, 10)
s.server.db.QueryRow(fmt.Sprintf("%s WHERE character_id=$1", warehouseNamesQuery), s.charID).Scan(&itemNames[0], _ = s.server.db.QueryRow(fmt.Sprintf("%s WHERE character_id=$1", warehouseNamesQuery), s.charID).Scan(&itemNames[0],
&itemNames[1], &itemNames[2], &itemNames[3], &itemNames[4], &itemNames[5], &itemNames[6], &itemNames[7], &itemNames[8], &itemNames[9], &equipNames[0], &itemNames[1], &itemNames[2], &itemNames[3], &itemNames[4], &itemNames[5], &itemNames[6], &itemNames[7], &itemNames[8], &itemNames[9], &equipNames[0],
&equipNames[1], &equipNames[2], &equipNames[3], &equipNames[4], &equipNames[5], &equipNames[6], &equipNames[7], &equipNames[8], &equipNames[9]) &equipNames[1], &equipNames[2], &equipNames[3], &equipNames[4], &equipNames[5], &equipNames[6], &equipNames[7], &equipNames[8], &equipNames[9])
bf.WriteUint32(0) bf.WriteUint32(0)
@@ -418,9 +418,9 @@ func handleMsgMhfOperateWarehouse(s *Session, p mhfpacket.MHFPacket) {
case 2: case 2:
switch pkt.BoxType { switch pkt.BoxType {
case 0: case 0:
s.server.db.Exec(fmt.Sprintf("UPDATE warehouse SET item%dname=$1 WHERE character_id=$2", pkt.BoxIndex), pkt.Name, s.charID) _, _ = s.server.db.Exec(fmt.Sprintf("UPDATE warehouse SET item%dname=$1 WHERE character_id=$2", pkt.BoxIndex), pkt.Name, s.charID)
case 1: case 1:
s.server.db.Exec(fmt.Sprintf("UPDATE warehouse SET equip%dname=$1 WHERE character_id=$2", pkt.BoxIndex), pkt.Name, s.charID) _, _ = s.server.db.Exec(fmt.Sprintf("UPDATE warehouse SET equip%dname=$1 WHERE character_id=$2", pkt.BoxIndex), pkt.Name, s.charID)
} }
case 3: case 3:
bf.WriteUint32(0) // Usage renewal time, >1 = disabled bf.WriteUint32(0) // Usage renewal time, >1 = disabled
@@ -443,14 +443,14 @@ func addWarehouseItem(s *Session, item mhfitem.MHFItemStack) {
giftBox := warehouseGetItems(s, 10) giftBox := warehouseGetItems(s, 10)
item.WarehouseID = token.RNG.Uint32() item.WarehouseID = token.RNG.Uint32()
giftBox = append(giftBox, item) giftBox = append(giftBox, item)
s.server.db.Exec("UPDATE warehouse SET item10=$1 WHERE character_id=$2", mhfitem.SerializeWarehouseItems(giftBox), s.charID) _, _ = s.server.db.Exec("UPDATE warehouse SET item10=$1 WHERE character_id=$2", mhfitem.SerializeWarehouseItems(giftBox), s.charID)
} }
func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack { func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
initializeWarehouse(s) initializeWarehouse(s)
var data []byte var data []byte
var items []mhfitem.MHFItemStack var items []mhfitem.MHFItemStack
s.server.db.QueryRow(fmt.Sprintf(`SELECT item%d FROM warehouse WHERE character_id=$1`, index), s.charID).Scan(&data) _ = s.server.db.QueryRow(fmt.Sprintf(`SELECT item%d FROM warehouse WHERE character_id=$1`, index), s.charID).Scan(&data)
if len(data) > 0 { if len(data) > 0 {
box := byteframe.NewByteFrameFromBytes(data) box := byteframe.NewByteFrameFromBytes(data)
numStacks := box.ReadUint16() numStacks := box.ReadUint16()
@@ -465,7 +465,7 @@ func warehouseGetItems(s *Session, index uint8) []mhfitem.MHFItemStack {
func warehouseGetEquipment(s *Session, index uint8) []mhfitem.MHFEquipment { func warehouseGetEquipment(s *Session, index uint8) []mhfitem.MHFEquipment {
var data []byte var data []byte
var equipment []mhfitem.MHFEquipment var equipment []mhfitem.MHFEquipment
s.server.db.QueryRow(fmt.Sprintf(`SELECT equip%d FROM warehouse WHERE character_id=$1`, index), s.charID).Scan(&data) _ = s.server.db.QueryRow(fmt.Sprintf(`SELECT equip%d FROM warehouse WHERE character_id=$1`, index), s.charID).Scan(&data)
if len(data) > 0 { if len(data) > 0 {
box := byteframe.NewByteFrameFromBytes(data) box := byteframe.NewByteFrameFromBytes(data)
numStacks := box.ReadUint16() numStacks := box.ReadUint16()

10
server/channelserver/handlers_mail.go
View File

@@ -216,7 +216,7 @@ func handleMsgMhfReadMail(s *Session, p mhfpacket.MHFPacket) {
return return
} }
s.server.db.Exec(`UPDATE mail SET read = true WHERE id = $1`, mail.ID) _, _ = s.server.db.Exec(`UPDATE mail SET read = true WHERE id = $1`, mail.ID)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
body := stringsupport.UTF8ToSJIS(mail.Body) body := stringsupport.UTF8ToSJIS(mail.Body)
bf.WriteNullTerminatedBytes(body) bf.WriteNullTerminatedBytes(body)
@@ -303,13 +303,13 @@ func handleMsgMhfOprtMail(s *Session, p mhfpacket.MHFPacket) {
switch pkt.Operation { switch pkt.Operation {
case mhfpacket.OperateMailDelete: case mhfpacket.OperateMailDelete:
s.server.db.Exec(`UPDATE mail SET deleted = true WHERE id = $1`, mail.ID) _, _ = s.server.db.Exec(`UPDATE mail SET deleted = true WHERE id = $1`, mail.ID)
case mhfpacket.OperateMailLock: case mhfpacket.OperateMailLock:
s.server.db.Exec(`UPDATE mail SET locked = TRUE WHERE id = $1`, mail.ID) _, _ = s.server.db.Exec(`UPDATE mail SET locked = TRUE WHERE id = $1`, mail.ID)
case mhfpacket.OperateMailUnlock: case mhfpacket.OperateMailUnlock:
s.server.db.Exec(`UPDATE mail SET locked = FALSE WHERE id = $1`, mail.ID) _, _ = s.server.db.Exec(`UPDATE mail SET locked = FALSE WHERE id = $1`, mail.ID)
case mhfpacket.OperateMailAcquireItem: case mhfpacket.OperateMailAcquireItem:
s.server.db.Exec(`UPDATE mail SET attached_item_received = TRUE WHERE id = $1`, mail.ID) _, _ = s.server.db.Exec(`UPDATE mail SET attached_item_received = TRUE WHERE id = $1`, mail.ID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

34
server/channelserver/handlers_mercenary.go
View File

@@ -178,7 +178,7 @@ func handleMsgMhfCreateMercenary(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
var nextID uint32 var nextID uint32
_ = s.server.db.QueryRow("SELECT nextval('rasta_id_seq')").Scan(&nextID) _ = s.server.db.QueryRow("SELECT nextval('rasta_id_seq')").Scan(&nextID)
s.server.db.Exec("UPDATE characters SET rasta_id=$1 WHERE id=$2", nextID, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET rasta_id=$1 WHERE id=$2", nextID, s.charID)
bf.WriteUint32(nextID) bf.WriteUint32(nextID)
doAckSimpleSucceed(s, pkt.AckHandle, bf.Data()) doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())
} }
@@ -188,9 +188,9 @@ func handleMsgMhfSaveMercenary(s *Session, p mhfpacket.MHFPacket) {
dumpSaveData(s, pkt.MercData, "mercenary") dumpSaveData(s, pkt.MercData, "mercenary")
if len(pkt.MercData) > 0 { if len(pkt.MercData) > 0 {
temp := byteframe.NewByteFrameFromBytes(pkt.MercData) temp := byteframe.NewByteFrameFromBytes(pkt.MercData)
s.server.db.Exec("UPDATE characters SET savemercenary=$1, rasta_id=$2 WHERE id=$3", pkt.MercData, temp.ReadUint32(), s.charID) _, _ = s.server.db.Exec("UPDATE characters SET savemercenary=$1, rasta_id=$2 WHERE id=$3", pkt.MercData, temp.ReadUint32(), s.charID)
} }
s.server.db.Exec("UPDATE characters SET gcp=$1, pact_id=$2 WHERE id=$3", pkt.GCP, pkt.PactMercID, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET gcp=$1, pact_id=$2 WHERE id=$3", pkt.GCP, pkt.PactMercID, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
} }
@@ -200,9 +200,9 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
var pactID, cid uint32 var pactID, cid uint32
var name string var name string
s.server.db.QueryRow("SELECT pact_id FROM characters WHERE id=$1", s.charID).Scan(&pactID) _ = s.server.db.QueryRow("SELECT pact_id FROM characters WHERE id=$1", s.charID).Scan(&pactID)
if pactID > 0 { if pactID > 0 {
s.server.db.QueryRow("SELECT name, id FROM characters WHERE rasta_id = $1", pactID).Scan(&name, &cid) _ = s.server.db.QueryRow("SELECT name, id FROM characters WHERE rasta_id = $1", pactID).Scan(&name, &cid)
bf.WriteUint8(1) // numLends bf.WriteUint8(1) // numLends
bf.WriteUint32(pactID) bf.WriteUint32(pactID)
bf.WriteUint32(cid) bf.WriteUint32(cid)
@@ -240,8 +240,8 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
if pkt.Op != 1 && pkt.Op != 4 { if pkt.Op != 1 && pkt.Op != 4 {
var data []byte var data []byte
var gcp uint32 var gcp uint32
s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id=$1", s.charID).Scan(&data) _ = s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id=$1", s.charID).Scan(&data)
s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id=$1", s.charID).Scan(&gcp) _ = s.server.db.QueryRow("SELECT COALESCE(gcp, 0) FROM characters WHERE id=$1", s.charID).Scan(&gcp)
if len(data) == 0 { if len(data) == 0 {
bf.WriteBool(false) bf.WriteBool(false)
@@ -259,7 +259,7 @@ func handleMsgMhfReadMercenaryW(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfReadMercenaryM(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfReadMercenaryM(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfReadMercenaryM) pkt := p.(*mhfpacket.MsgMhfReadMercenaryM)
var data []byte var data []byte
s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id = $1", pkt.CharID).Scan(&data) _ = s.server.db.QueryRow("SELECT savemercenary FROM characters WHERE id = $1", pkt.CharID).Scan(&data)
resp := byteframe.NewByteFrame() resp := byteframe.NewByteFrame()
if len(data) == 0 { if len(data) == 0 {
resp.WriteBool(false) resp.WriteBool(false)
@@ -273,11 +273,11 @@ func handleMsgMhfContractMercenary(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfContractMercenary) pkt := p.(*mhfpacket.MsgMhfContractMercenary)
switch pkt.Op { switch pkt.Op {
case 0: // Form loan case 0: // Form loan
s.server.db.Exec("UPDATE characters SET pact_id=$1 WHERE id=$2", pkt.PactMercID, pkt.CID) _, _ = s.server.db.Exec("UPDATE characters SET pact_id=$1 WHERE id=$2", pkt.PactMercID, pkt.CID)
case 1: // Cancel lend case 1: // Cancel lend
s.server.db.Exec("UPDATE characters SET pact_id=0 WHERE id=$1", s.charID) _, _ = s.server.db.Exec("UPDATE characters SET pact_id=0 WHERE id=$1", s.charID)
case 2: // Cancel loan case 2: // Cancel loan
s.server.db.Exec("UPDATE characters SET pact_id=0 WHERE id=$1", pkt.CID) _, _ = s.server.db.Exec("UPDATE characters SET pact_id=0 WHERE id=$1", pkt.CID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -332,7 +332,7 @@ func handleMsgMhfSaveOtomoAirou(s *Session, p mhfpacket.MHFPacket) {
s.logger.Error("Failed to compress airou", zap.Error(err)) s.logger.Error("Failed to compress airou", zap.Error(err))
} else { } else {
comp = append([]byte{0x01}, comp...) comp = append([]byte{0x01}, comp...)
s.server.db.Exec("UPDATE characters SET otomoairou=$1 WHERE id=$2", comp, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET otomoairou=$1 WHERE id=$2", comp, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -442,18 +442,18 @@ func GetAirouDetails(bf *byteframe.ByteFrame) []Airou {
catStart, _ := bf.Seek(0, io.SeekCurrent) catStart, _ := bf.Seek(0, io.SeekCurrent)
catDef.ID = bf.ReadUint32() catDef.ID = bf.ReadUint32()
bf.Seek(1, io.SeekCurrent) // unknown value, probably a bool _, _ = bf.Seek(1, io.SeekCurrent) // unknown value, probably a bool
catDef.Name = bf.ReadBytes(18) // always 18 len, reads first null terminated string out of section and discards rest catDef.Name = bf.ReadBytes(18) // always 18 len, reads first null terminated string out of section and discards rest
catDef.Task = bf.ReadUint8() catDef.Task = bf.ReadUint8()
bf.Seek(16, io.SeekCurrent) // appearance data and what is seemingly null bytes _, _ = bf.Seek(16, io.SeekCurrent) // appearance data and what is seemingly null bytes
catDef.Personality = bf.ReadUint8() catDef.Personality = bf.ReadUint8()
catDef.Class = bf.ReadUint8() catDef.Class = bf.ReadUint8()
bf.Seek(5, io.SeekCurrent) // affection and colour sliders _, _ = bf.Seek(5, io.SeekCurrent) // affection and colour sliders
catDef.Experience = bf.ReadUint32() // raw cat rank points, doesn't have a rank catDef.Experience = bf.ReadUint32() // raw cat rank points, doesn't have a rank
bf.Seek(1, io.SeekCurrent) // bool for weapon being equipped _, _ = bf.Seek(1, io.SeekCurrent) // bool for weapon being equipped
catDef.WeaponType = bf.ReadUint8() // weapon type, presumably always 6 for melee? catDef.WeaponType = bf.ReadUint8() // weapon type, presumably always 6 for melee?
catDef.WeaponID = bf.ReadUint16() // weapon id catDef.WeaponID = bf.ReadUint16() // weapon id
bf.Seek(catStart+int64(catDefLen), io.SeekStart) _, _ = bf.Seek(catStart+int64(catDefLen), io.SeekStart)
cats[x] = catDef cats[x] = catDef
} }
return cats return cats

4
server/channelserver/handlers_mercenary_test.go
View File

@@ -185,14 +185,14 @@ func TestGetAirouDetails_ExtraTrailingBytes(t *testing.T) {
_ = binary.Write(catBuf, binary.BigEndian, uint32(500)) // experience _ = binary.Write(catBuf, binary.BigEndian, uint32(500)) // experience
catBuf.WriteByte(0) // weapon equipped bool catBuf.WriteByte(0) // weapon equipped bool
catBuf.WriteByte(6) // weaponType catBuf.WriteByte(6) // weaponType
binary.Write(catBuf, binary.BigEndian, uint16(50)) // weaponID _ = binary.Write(catBuf, binary.BigEndian, uint16(50)) // weaponID
catData := catBuf.Bytes() catData := catBuf.Bytes()
// Add 10 extra trailing bytes // Add 10 extra trailing bytes
extra := make([]byte, 10) extra := make([]byte, 10)
catDataWithExtra := append(catData, extra...) catDataWithExtra := append(catData, extra...)
binary.Write(buf, binary.BigEndian, uint32(len(catDataWithExtra))) _ = binary.Write(buf, binary.BigEndian, uint32(len(catDataWithExtra)))
buf.Write(catDataWithExtra) buf.Write(catDataWithExtra)
bf := byteframe.NewByteFrameFromBytes(buf.Bytes()) bf := byteframe.NewByteFrameFromBytes(buf.Bytes())

14
server/channelserver/handlers_quest.go
View File

@@ -206,7 +206,7 @@ func handleMsgMhfLoadFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfSaveFavoriteQuest(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfSaveFavoriteQuest) pkt := p.(*mhfpacket.MsgMhfSaveFavoriteQuest)
dumpSaveData(s, pkt.Data, "favquest") dumpSaveData(s, pkt.Data, "favquest")
s.server.db.Exec("UPDATE characters SET savefavoritequest=$1 WHERE id=$2", pkt.Data, s.charID) _, _ = s.server.db.Exec("UPDATE characters SET savefavoritequest=$1 WHERE id=$2", pkt.Data, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00}) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x00})
} }
@@ -320,9 +320,9 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) {
// Time Flag Replacement // Time Flag Replacement
// Bitset Structure: b8 UNK, b7 Required Objective, b6 UNK, b5 Night, b4 Day, b3 Cold, b2 Warm, b1 Spring // Bitset Structure: b8 UNK, b7 Required Objective, b6 UNK, b5 Night, b4 Day, b3 Cold, b2 Warm, b1 Spring
// if the byte is set to 0 the game choses the quest file corresponding to whatever season the game is on // if the byte is set to 0 the game choses the quest file corresponding to whatever season the game is on
bf.Seek(25, 0) _, _ = bf.Seek(25, 0)
flagByte := bf.ReadUint8() flagByte := bf.ReadUint8()
bf.Seek(25, 0) _, _ = bf.Seek(25, 0)
if s.server.erupeConfig.GameplayOptions.SeasonOverride { if s.server.erupeConfig.GameplayOptions.SeasonOverride {
bf.WriteUint8(flagByte & 0b11100000) bf.WriteUint8(flagByte & 0b11100000)
} else { } else {
@@ -338,13 +338,13 @@ func makeEventQuest(s *Session, rows *sql.Rows) ([]byte, error) {
// Bitset Structure Quest Variant 2: b8 Road, b7 High Conquest, b6 Fixed Difficulty, b5 No Active Feature, b4 Timer, b3 No Cuff, b2 No Halk Pots, b1 Low Conquest // Bitset Structure Quest Variant 2: b8 Road, b7 High Conquest, b6 Fixed Difficulty, b5 No Active Feature, b4 Timer, b3 No Cuff, b2 No Halk Pots, b1 Low Conquest
// Bitset Structure Quest Variant 3: b8 No Sigils, b7 UNK, b6 Interception, b5 Zenith, b4 No GP Skills, b3 No Simple Mode?, b2 GSR to GR, b1 No Reward Skills // Bitset Structure Quest Variant 3: b8 No Sigils, b7 UNK, b6 Interception, b5 Zenith, b4 No GP Skills, b3 No Simple Mode?, b2 GSR to GR, b1 No Reward Skills
bf.Seek(175, 0) _, _ = bf.Seek(175, 0)
questVariant3 := bf.ReadUint8() questVariant3 := bf.ReadUint8()
questVariant3 &= 0b11011111 // disable Interception flag questVariant3 &= 0b11011111 // disable Interception flag
bf.Seek(175, 0) _, _ = bf.Seek(175, 0)
bf.WriteUint8(questVariant3) bf.WriteUint8(questVariant3)
bf.Seek(0, 2) _, _ = bf.Seek(0, 2)
ps.Uint8(bf, "", true) // Debug/Notes string for quest ps.Uint8(bf, "", true) // Debug/Notes string for quest
return bf.Data(), nil return bf.Data(), nil
} }
@@ -669,7 +669,7 @@ func handleMsgMhfEnumerateQuest(s *Session, p mhfpacket.MHFPacket) {
bf.WriteUint16(totalCount) bf.WriteUint16(totalCount)
bf.WriteUint16(pkt.Offset) bf.WriteUint16(pkt.Offset)
bf.Seek(0, io.SeekStart) _, _ = bf.Seek(0, io.SeekStart)
bf.WriteUint16(returnedCount) bf.WriteUint16(returnedCount)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())

8
server/channelserver/handlers_rengoku.go
View File

@@ -24,18 +24,18 @@ func handleMsgMhfSaveRengokuData(s *Session, p mhfpacket.MHFPacket) {
return return
} }
bf := byteframe.NewByteFrameFromBytes(pkt.RawDataPayload) bf := byteframe.NewByteFrameFromBytes(pkt.RawDataPayload)
bf.Seek(71, 0) _, _ = bf.Seek(71, 0)
maxStageMp := bf.ReadUint32() maxStageMp := bf.ReadUint32()
maxScoreMp := bf.ReadUint32() maxScoreMp := bf.ReadUint32()
bf.Seek(4, 1) _, _ = bf.Seek(4, 1)
maxStageSp := bf.ReadUint32() maxStageSp := bf.ReadUint32()
maxScoreSp := bf.ReadUint32() maxScoreSp := bf.ReadUint32()
var t int var t int
err = s.server.db.QueryRow("SELECT character_id FROM rengoku_score WHERE character_id=$1", s.charID).Scan(&t) err = s.server.db.QueryRow("SELECT character_id FROM rengoku_score WHERE character_id=$1", s.charID).Scan(&t)
if err != nil { if err != nil {
s.server.db.Exec("INSERT INTO rengoku_score (character_id) VALUES ($1)", s.charID) _, _ = s.server.db.Exec("INSERT INTO rengoku_score (character_id) VALUES ($1)", s.charID)
} }
s.server.db.Exec("UPDATE rengoku_score SET max_stages_mp=$1, max_points_mp=$2, max_stages_sp=$3, max_points_sp=$4 WHERE character_id=$5", maxStageMp, maxScoreMp, maxStageSp, maxScoreSp, s.charID) _, _ = s.server.db.Exec("UPDATE rengoku_score SET max_stages_mp=$1, max_points_mp=$2, max_stages_sp=$3, max_points_sp=$4 WHERE character_id=$5", maxStageMp, maxScoreMp, maxStageSp, maxScoreSp, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

4
server/channelserver/handlers_savedata_integration_test.go
View File

@@ -517,7 +517,7 @@ func TestSaveLoad_CompleteSaveLoadCycle(t *testing.T) {
// Verify Road Points persisted // Verify Road Points persisted
var loadedRdP uint32 var loadedRdP uint32
db.QueryRow("SELECT frontier_points FROM characters WHERE id = $1", charID).Scan(&loadedRdP) _ = db.QueryRow("SELECT frontier_points FROM characters WHERE id = $1", charID).Scan(&loadedRdP)
if loadedRdP != rdpPoints { if loadedRdP != rdpPoints {
t.Errorf("RdP not persisted: got %d, want %d (BUG CONFIRMED)", loadedRdP, rdpPoints) t.Errorf("RdP not persisted: got %d, want %d (BUG CONFIRMED)", loadedRdP, rdpPoints)
} else { } else {
@@ -526,7 +526,7 @@ func TestSaveLoad_CompleteSaveLoadCycle(t *testing.T) {
// Verify Koryo Points persisted // Verify Koryo Points persisted
var loadedKoryo uint32 var loadedKoryo uint32
db.QueryRow("SELECT kouryou_point FROM characters WHERE id = $1", charID).Scan(&loadedKoryo) _ = db.QueryRow("SELECT kouryou_point FROM characters WHERE id = $1", charID).Scan(&loadedKoryo)
if loadedKoryo != koryoPoints { if loadedKoryo != koryoPoints {
t.Errorf("Koryo points not persisted: got %d, want %d (BUG CONFIRMED)", loadedKoryo, koryoPoints) t.Errorf("Koryo points not persisted: got %d, want %d (BUG CONFIRMED)", loadedKoryo, koryoPoints)
} else { } else {

52
server/channelserver/handlers_shop_gacha.go
View File

@@ -174,14 +174,14 @@ func handleMsgMhfEnumerateShop(s *Session, p mhfpacket.MHFPacket) {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(pkt.ShopID) bf.WriteUint32(pkt.ShopID)
var gachaType int var gachaType int
s.server.db.QueryRow(`SELECT gacha_type FROM gacha_shop WHERE id = $1`, pkt.ShopID).Scan(&gachaType) _ = s.server.db.QueryRow(`SELECT gacha_type FROM gacha_shop WHERE id = $1`, pkt.ShopID).Scan(&gachaType)
rows, err := s.server.db.Queryx(`SELECT entry_type, id, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points, COALESCE(name, '') AS name FROM gacha_entries WHERE gacha_id = $1 ORDER BY weight DESC`, pkt.ShopID) rows, err := s.server.db.Queryx(`SELECT entry_type, id, item_type, item_number, item_quantity, weight, rarity, rolls, daily_limit, frontier_points, COALESCE(name, '') AS name FROM gacha_entries WHERE gacha_id = $1 ORDER BY weight DESC`, pkt.ShopID)
if err != nil { if err != nil {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
return return
} }
var divisor float64 var divisor float64
s.server.db.QueryRow(`SELECT COALESCE(SUM(weight) / 100000.0, 0) AS chance FROM gacha_entries WHERE gacha_id = $1`, pkt.ShopID).Scan(&divisor) _ = s.server.db.QueryRow(`SELECT COALESCE(SUM(weight) / 100000.0, 0) AS chance FROM gacha_entries WHERE gacha_id = $1`, pkt.ShopID).Scan(&divisor)
var entry GachaEntry var entry GachaEntry
var entries []GachaEntry var entries []GachaEntry
@@ -270,7 +270,7 @@ func handleMsgMhfAcquireExchangeShop(s *Session, p mhfpacket.MHFPacket) {
continue continue
} }
buyCount := bf.ReadUint32() buyCount := bf.ReadUint32()
s.server.db.Exec(`INSERT INTO shop_items_bought (character_id, shop_item_id, bought) _, _ = s.server.db.Exec(`INSERT INTO shop_items_bought (character_id, shop_item_id, bought)
VALUES ($1,$2,$3) ON CONFLICT (character_id, shop_item_id) VALUES ($1,$2,$3) ON CONFLICT (character_id, shop_item_id)
DO UPDATE SET bought = bought + $3 DO UPDATE SET bought = bought + $3
WHERE EXCLUDED.character_id=$1 AND EXCLUDED.shop_item_id=$2 WHERE EXCLUDED.character_id=$1 AND EXCLUDED.shop_item_id=$2
@@ -289,7 +289,7 @@ func handleMsgMhfGetGachaPlayHistory(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfGetGachaPoint(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfGetGachaPoint(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfGetGachaPoint) pkt := p.(*mhfpacket.MsgMhfGetGachaPoint)
var fp, gp, gt uint32 var fp, gp, gt uint32
s.server.db.QueryRow("SELECT COALESCE(frontier_points, 0), COALESCE(gacha_premium, 0), COALESCE(gacha_trial, 0) FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)", s.charID).Scan(&fp, &gp, &gt) _ = s.server.db.QueryRow("SELECT COALESCE(frontier_points, 0), COALESCE(gacha_premium, 0), COALESCE(gacha_trial, 0) FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)", s.charID).Scan(&fp, &gp, &gt)
resp := byteframe.NewByteFrame() resp := byteframe.NewByteFrame()
resp.WriteUint32(gp) resp.WriteUint32(gp)
resp.WriteUint32(gt) resp.WriteUint32(gt)
@@ -300,21 +300,21 @@ func handleMsgMhfGetGachaPoint(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfUseGachaPoint(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUseGachaPoint(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfUseGachaPoint) pkt := p.(*mhfpacket.MsgMhfUseGachaPoint)
if pkt.TrialCoins > 0 { if pkt.TrialCoins > 0 {
s.server.db.Exec(`UPDATE users u SET gacha_trial=gacha_trial-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, pkt.TrialCoins, s.charID) _, _ = s.server.db.Exec(`UPDATE users u SET gacha_trial=gacha_trial-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, pkt.TrialCoins, s.charID)
} }
if pkt.PremiumCoins > 0 { if pkt.PremiumCoins > 0 {
s.server.db.Exec(`UPDATE users u SET gacha_premium=gacha_premium-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, pkt.PremiumCoins, s.charID) _, _ = s.server.db.Exec(`UPDATE users u SET gacha_premium=gacha_premium-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, pkt.PremiumCoins, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
func spendGachaCoin(s *Session, quantity uint16) { func spendGachaCoin(s *Session, quantity uint16) {
var gt uint16 var gt uint16
s.server.db.QueryRow(`SELECT COALESCE(gacha_trial, 0) FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, s.charID).Scan(&gt) _ = s.server.db.QueryRow(`SELECT COALESCE(gacha_trial, 0) FROM users u WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$1)`, s.charID).Scan(&gt)
if quantity <= gt { if quantity <= gt {
s.server.db.Exec(`UPDATE users u SET gacha_trial=gacha_trial-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, quantity, s.charID) _, _ = s.server.db.Exec(`UPDATE users u SET gacha_trial=gacha_trial-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, quantity, s.charID)
} else { } else {
s.server.db.Exec(`UPDATE users u SET gacha_premium=gacha_premium-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, quantity, s.charID) _, _ = s.server.db.Exec(`UPDATE users u SET gacha_premium=gacha_premium-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, quantity, s.charID)
} }
} }
@@ -343,7 +343,7 @@ func transactGacha(s *Session, gachaID uint32, rollID uint8) (int, error) {
case 20: case 20:
spendGachaCoin(s, itemNumber) spendGachaCoin(s, itemNumber)
case 21: case 21:
s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", itemNumber, s.charID) _, _ = s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points-$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)", itemNumber, s.charID)
} }
return rolls, nil return rolls, nil
} }
@@ -363,7 +363,7 @@ func getGuaranteedItems(s *Session, gachaID uint32, rollID uint8) []GachaItem {
func addGachaItem(s *Session, items []GachaItem) { func addGachaItem(s *Session, items []GachaItem) {
var data []byte var data []byte
s.server.db.QueryRow(`SELECT gacha_items FROM characters WHERE id = $1`, s.charID).Scan(&data) _ = s.server.db.QueryRow(`SELECT gacha_items FROM characters WHERE id = $1`, s.charID).Scan(&data)
if len(data) > 0 { if len(data) > 0 {
numItems := int(data[0]) numItems := int(data[0])
data = data[1:] data = data[1:]
@@ -383,7 +383,7 @@ func addGachaItem(s *Session, items []GachaItem) {
newItem.WriteUint16(items[i].ItemID) newItem.WriteUint16(items[i].ItemID)
newItem.WriteUint16(items[i].Quantity) newItem.WriteUint16(items[i].Quantity)
} }
s.server.db.Exec(`UPDATE characters SET gacha_items = $1 WHERE id = $2`, newItem.Data(), s.charID) _, _ = s.server.db.Exec(`UPDATE characters SET gacha_items = $1 WHERE id = $2`, newItem.Data(), s.charID)
} }
func getRandomEntries(entries []GachaEntry, rolls int, isBox bool) ([]GachaEntry, error) { func getRandomEntries(entries []GachaEntry, rolls int, isBox bool) ([]GachaEntry, error) {
@@ -436,9 +436,9 @@ func handleMsgMhfReceiveGachaItem(s *Session, p mhfpacket.MHFPacket) {
update := byteframe.NewByteFrame() update := byteframe.NewByteFrame()
update.WriteUint8(uint8(len(data[181:]) / 5)) update.WriteUint8(uint8(len(data[181:]) / 5))
update.WriteBytes(data[181:]) update.WriteBytes(data[181:])
s.server.db.Exec("UPDATE characters SET gacha_items = $1 WHERE id = $2", update.Data(), s.charID) _, _ = s.server.db.Exec("UPDATE characters SET gacha_items = $1 WHERE id = $2", update.Data(), s.charID)
} else { } else {
s.server.db.Exec("UPDATE characters SET gacha_items = null WHERE id = $1", s.charID) _, _ = s.server.db.Exec("UPDATE characters SET gacha_items = null WHERE id = $1", s.charID)
} }
} }
} }
@@ -507,9 +507,9 @@ func handleMsgMhfPlayStepupGacha(s *Session, p mhfpacket.MHFPacket) {
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 1))
return return
} }
s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points+(SELECT frontier_points FROM gacha_entries WHERE gacha_id = $1 AND entry_type = $2) WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$3)", pkt.GachaID, pkt.RollType, s.charID) _, _ = s.server.db.Exec("UPDATE users u SET frontier_points=frontier_points+(SELECT frontier_points FROM gacha_entries WHERE gacha_id = $1 AND entry_type = $2) WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$3)", pkt.GachaID, pkt.RollType, s.charID)
s.server.db.Exec(`DELETE FROM gacha_stepup WHERE gacha_id = $1 AND character_id = $2`, pkt.GachaID, s.charID) _, _ = s.server.db.Exec(`DELETE FROM gacha_stepup WHERE gacha_id = $1 AND character_id = $2`, pkt.GachaID, s.charID)
s.server.db.Exec(`INSERT INTO gacha_stepup (gacha_id, step, character_id) VALUES ($1, $2, $3)`, pkt.GachaID, pkt.RollType+1, s.charID) _, _ = s.server.db.Exec(`INSERT INTO gacha_stepup (gacha_id, step, character_id) VALUES ($1, $2, $3)`, pkt.GachaID, pkt.RollType+1, s.charID)
rows, err := s.server.db.Queryx(`SELECT id, weight, rarity FROM gacha_entries WHERE gacha_id = $1 AND entry_type = 100 ORDER BY weight DESC`, pkt.GachaID) rows, err := s.server.db.Queryx(`SELECT id, weight, rarity FROM gacha_entries WHERE gacha_id = $1 AND entry_type = 100 ORDER BY weight DESC`, pkt.GachaID)
if err != nil { if err != nil {
@@ -563,11 +563,11 @@ func handleMsgMhfGetStepupStatus(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfGetStepupStatus) pkt := p.(*mhfpacket.MsgMhfGetStepupStatus)
// TODO: Reset daily (noon) // TODO: Reset daily (noon)
var step uint8 var step uint8
s.server.db.QueryRow(`SELECT step FROM gacha_stepup WHERE gacha_id = $1 AND character_id = $2`, pkt.GachaID, s.charID).Scan(&step) _ = s.server.db.QueryRow(`SELECT step FROM gacha_stepup WHERE gacha_id = $1 AND character_id = $2`, pkt.GachaID, s.charID).Scan(&step)
var stepCheck int var stepCheck int
s.server.db.QueryRow(`SELECT COUNT(1) FROM gacha_entries WHERE gacha_id = $1 AND entry_type = $2`, pkt.GachaID, step).Scan(&stepCheck) _ = s.server.db.QueryRow(`SELECT COUNT(1) FROM gacha_entries WHERE gacha_id = $1 AND entry_type = $2`, pkt.GachaID, step).Scan(&stepCheck)
if stepCheck == 0 { if stepCheck == 0 {
s.server.db.Exec(`DELETE FROM gacha_stepup WHERE gacha_id = $1 AND character_id = $2`, pkt.GachaID, s.charID) _, _ = s.server.db.Exec(`DELETE FROM gacha_stepup WHERE gacha_id = $1 AND character_id = $2`, pkt.GachaID, s.charID)
step = 0 step = 0
} }
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
@@ -627,7 +627,7 @@ func handleMsgMhfPlayBoxGacha(s *Session, p mhfpacket.MHFPacket) {
if err != nil { if err != nil {
continue continue
} }
s.server.db.Exec(`INSERT INTO gacha_box (gacha_id, entry_id, character_id) VALUES ($1, $2, $3)`, pkt.GachaID, rewardEntries[i].ID, s.charID) _, _ = s.server.db.Exec(`INSERT INTO gacha_box (gacha_id, entry_id, character_id) VALUES ($1, $2, $3)`, pkt.GachaID, rewardEntries[i].ID, s.charID)
for items.Next() { for items.Next() {
err = items.StructScan(&reward) err = items.StructScan(&reward)
if err == nil { if err == nil {
@@ -648,7 +648,7 @@ func handleMsgMhfPlayBoxGacha(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfResetBoxGachaInfo(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfResetBoxGachaInfo(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfResetBoxGachaInfo) pkt := p.(*mhfpacket.MsgMhfResetBoxGachaInfo)
s.server.db.Exec("DELETE FROM gacha_box WHERE gacha_id = $1 AND character_id = $2", pkt.GachaID, s.charID) _, _ = s.server.db.Exec("DELETE FROM gacha_box WHERE gacha_id = $1 AND character_id = $2", pkt.GachaID, s.charID)
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -656,9 +656,9 @@ func handleMsgMhfExchangeFpoint2Item(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfExchangeFpoint2Item) pkt := p.(*mhfpacket.MsgMhfExchangeFpoint2Item)
var balance uint32 var balance uint32
var itemValue, quantity int var itemValue, quantity int
s.server.db.QueryRow("SELECT quantity, fpoints FROM fpoint_items WHERE id=$1", pkt.TradeID).Scan(&quantity, &itemValue) _ = s.server.db.QueryRow("SELECT quantity, fpoints FROM fpoint_items WHERE id=$1", pkt.TradeID).Scan(&quantity, &itemValue)
cost := (int(pkt.Quantity) * quantity) * itemValue cost := (int(pkt.Quantity) * quantity) * itemValue
s.server.db.QueryRow("UPDATE users u SET frontier_points=frontier_points::int - $1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2) RETURNING frontier_points", cost, s.charID).Scan(&balance) _ = s.server.db.QueryRow("UPDATE users u SET frontier_points=frontier_points::int - $1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2) RETURNING frontier_points", cost, s.charID).Scan(&balance)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(balance) bf.WriteUint32(balance)
doAckSimpleSucceed(s, pkt.AckHandle, bf.Data()) doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())
@@ -668,9 +668,9 @@ func handleMsgMhfExchangeItem2Fpoint(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfExchangeItem2Fpoint) pkt := p.(*mhfpacket.MsgMhfExchangeItem2Fpoint)
var balance uint32 var balance uint32
var itemValue, quantity int var itemValue, quantity int
s.server.db.QueryRow("SELECT quantity, fpoints FROM fpoint_items WHERE id=$1", pkt.TradeID).Scan(&quantity, &itemValue) _ = s.server.db.QueryRow("SELECT quantity, fpoints FROM fpoint_items WHERE id=$1", pkt.TradeID).Scan(&quantity, &itemValue)
cost := (int(pkt.Quantity) / quantity) * itemValue cost := (int(pkt.Quantity) / quantity) * itemValue
s.server.db.QueryRow("UPDATE users u SET frontier_points=COALESCE(frontier_points::int + $1, $1) WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2) RETURNING frontier_points", cost, s.charID).Scan(&balance) _ = s.server.db.QueryRow("UPDATE users u SET frontier_points=COALESCE(frontier_points::int + $1, $1) WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2) RETURNING frontier_points", cost, s.charID).Scan(&balance)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint32(balance) bf.WriteUint32(balance)
doAckSimpleSucceed(s, pkt.AckHandle, bf.Data()) doAckSimpleSucceed(s, pkt.AckHandle, bf.Data())

8
server/channelserver/handlers_stage.go
View File

@@ -89,14 +89,14 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
for _, session := range sessionList { for _, session := range sessionList {
temp = &mhfpacket.MsgSysInsertUser{CharID: session.charID} temp = &mhfpacket.MsgSysInsertUser{CharID: session.charID}
newNotif.WriteUint16(uint16(temp.Opcode())) newNotif.WriteUint16(uint16(temp.Opcode()))
temp.Build(newNotif, s.clientContext) _ = temp.Build(newNotif, s.clientContext)
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
temp = &mhfpacket.MsgSysNotifyUserBinary{ temp = &mhfpacket.MsgSysNotifyUserBinary{
CharID: session.charID, CharID: session.charID,
BinaryType: uint8(i + 1), BinaryType: uint8(i + 1),
} }
newNotif.WriteUint16(uint16(temp.Opcode())) newNotif.WriteUint16(uint16(temp.Opcode()))
temp.Build(newNotif, s.clientContext) _ = temp.Build(newNotif, s.clientContext)
} }
} }
} }
@@ -129,7 +129,7 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
OwnerCharID: obj.ownerCharID, OwnerCharID: obj.ownerCharID,
} }
newNotif.WriteUint16(uint16(temp.Opcode())) newNotif.WriteUint16(uint16(temp.Opcode()))
temp.Build(newNotif, s.clientContext) _ = temp.Build(newNotif, s.clientContext)
} }
} }
@@ -482,7 +482,7 @@ func handleMsgSysEnumerateStage(s *Session, p mhfpacket.MHFPacket) {
ps.Uint8(bf, sid, false) ps.Uint8(bf, sid, false)
stage.RUnlock() stage.RUnlock()
} }
bf.Seek(0, 0) _, _ = bf.Seek(0, 0)
bf.WriteUint16(joinable) bf.WriteUint16(joinable)
doAckBufSucceed(s, pkt.AckHandle, bf.Data()) doAckBufSucceed(s, pkt.AckHandle, bf.Data())

28
server/channelserver/handlers_tower.go
View File

@@ -65,7 +65,7 @@ func handleMsgMhfGetTowerInfo(s *Session, p mhfpacket.MHFPacket) {
err := s.server.db.QueryRow(`SELECT COALESCE(tr, 0), COALESCE(trp, 0), COALESCE(tsp, 0), COALESCE(block1, 0), COALESCE(block2, 0), COALESCE(skills, $1) FROM tower WHERE char_id=$2 err := s.server.db.QueryRow(`SELECT COALESCE(tr, 0), COALESCE(trp, 0), COALESCE(tsp, 0), COALESCE(block1, 0), COALESCE(block2, 0), COALESCE(skills, $1) FROM tower WHERE char_id=$2
`, EmptyTowerCSV(64), s.charID).Scan(&towerInfo.TRP[0].TR, &towerInfo.TRP[0].TRP, &towerInfo.Skill[0].TSP, &towerInfo.Level[0].Floors, &towerInfo.Level[1].Floors, &tempSkills) `, EmptyTowerCSV(64), s.charID).Scan(&towerInfo.TRP[0].TR, &towerInfo.TRP[0].TRP, &towerInfo.Skill[0].TSP, &towerInfo.Level[0].Floors, &towerInfo.Level[1].Floors, &tempSkills)
if err != nil { if err != nil {
s.server.db.Exec(`INSERT INTO tower (char_id) VALUES ($1)`, s.charID) _, _ = s.server.db.Exec(`INSERT INTO tower (char_id) VALUES ($1)`, s.charID)
} }
if _config.ErupeConfig.RealClientMode <= _config.G7 { if _config.ErupeConfig.RealClientMode <= _config.G7 {
@@ -142,11 +142,11 @@ func handleMsgMhfPostTowerInfo(s *Session, p mhfpacket.MHFPacket) {
switch pkt.InfoType { switch pkt.InfoType {
case 2: case 2:
var skills string var skills string
s.server.db.QueryRow(`SELECT COALESCE(skills, $1) FROM tower WHERE char_id=$2`, EmptyTowerCSV(64), s.charID).Scan(&skills) _ = s.server.db.QueryRow(`SELECT COALESCE(skills, $1) FROM tower WHERE char_id=$2`, EmptyTowerCSV(64), s.charID).Scan(&skills)
s.server.db.Exec(`UPDATE tower SET skills=$1, tsp=tsp-$2 WHERE char_id=$3`, stringsupport.CSVSetIndex(skills, int(pkt.Skill), stringsupport.CSVGetIndex(skills, int(pkt.Skill))+1), pkt.Cost, s.charID) _, _ = s.server.db.Exec(`UPDATE tower SET skills=$1, tsp=tsp-$2 WHERE char_id=$3`, stringsupport.CSVSetIndex(skills, int(pkt.Skill), stringsupport.CSVGetIndex(skills, int(pkt.Skill))+1), pkt.Cost, s.charID)
case 1, 7: case 1, 7:
// This might give too much TSP? No idea what the rate is supposed to be // This might give too much TSP? No idea what the rate is supposed to be
s.server.db.Exec(`UPDATE tower SET tr=$1, trp=COALESCE(trp, 0)+$2, tsp=COALESCE(tsp, 0)+$3, block1=COALESCE(block1, 0)+$4 WHERE char_id=$5`, pkt.TR, pkt.TRP, pkt.Cost, pkt.Block1, s.charID) _, _ = s.server.db.Exec(`UPDATE tower SET tr=$1, trp=COALESCE(trp, 0)+$2, tsp=COALESCE(tsp, 0)+$3, block1=COALESCE(block1, 0)+$4 WHERE char_id=$5`, pkt.TR, pkt.TRP, pkt.Cost, pkt.Block1, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }
@@ -288,8 +288,8 @@ func handleMsgMhfGetTenrouirai(s *Session, p mhfpacket.MHFPacket) {
data = append(data, bf) data = append(data, bf)
} }
case 4: case 4:
s.server.db.QueryRow(`SELECT tower_mission_page FROM guilds WHERE id=$1`, pkt.GuildID).Scan(&tenrouirai.Progress[0].Page) _ = s.server.db.QueryRow(`SELECT tower_mission_page FROM guilds WHERE id=$1`, pkt.GuildID).Scan(&tenrouirai.Progress[0].Page)
s.server.db.QueryRow(`SELECT SUM(tower_mission_1) AS _, SUM(tower_mission_2) AS _, SUM(tower_mission_3) AS _ FROM guild_characters WHERE guild_id=$1 _ = s.server.db.QueryRow(`SELECT SUM(tower_mission_1) AS _, SUM(tower_mission_2) AS _, SUM(tower_mission_3) AS _ FROM guild_characters WHERE guild_id=$1
`, pkt.GuildID).Scan(&tenrouirai.Progress[0].Mission1, &tenrouirai.Progress[0].Mission2, &tenrouirai.Progress[0].Mission3) `, pkt.GuildID).Scan(&tenrouirai.Progress[0].Mission1, &tenrouirai.Progress[0].Mission2, &tenrouirai.Progress[0].Mission3)
if tenrouirai.Progress[0].Mission1 > tenrouiraiData[(tenrouirai.Progress[0].Page*3)-3].Goal { if tenrouirai.Progress[0].Mission1 > tenrouiraiData[(tenrouirai.Progress[0].Page*3)-3].Goal {
@@ -335,7 +335,7 @@ func handleMsgMhfGetTenrouirai(s *Session, p mhfpacket.MHFPacket) {
data = append(data, bf) data = append(data, bf)
} }
case 6: case 6:
s.server.db.QueryRow(`SELECT tower_rp FROM guilds WHERE id=$1`, pkt.GuildID).Scan(&tenrouirai.Ticket[0].RP) _ = s.server.db.QueryRow(`SELECT tower_rp FROM guilds WHERE id=$1`, pkt.GuildID).Scan(&tenrouirai.Ticket[0].RP)
for _, ticket := range tenrouirai.Ticket { for _, ticket := range tenrouirai.Ticket {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint8(ticket.Unk0) bf.WriteUint8(ticket.Unk0)
@@ -369,7 +369,7 @@ func handleMsgMhfPostTenrouirai(s *Session, p mhfpacket.MHFPacket) {
if pkt.Op == 2 { if pkt.Op == 2 {
var page, requirement, donated int var page, requirement, donated int
s.server.db.QueryRow(`SELECT tower_mission_page, tower_rp FROM guilds WHERE id=$1`, pkt.GuildID).Scan(&page, &donated) _ = s.server.db.QueryRow(`SELECT tower_mission_page, tower_rp FROM guilds WHERE id=$1`, pkt.GuildID).Scan(&page, &donated)
for i := 0; i < (page*3)+1; i++ { for i := 0; i < (page*3)+1; i++ {
requirement += int(tenrouiraiData[i].Cost) requirement += int(tenrouiraiData[i].Cost)
@@ -382,12 +382,12 @@ func handleMsgMhfPostTenrouirai(s *Session, p mhfpacket.MHFPacket) {
sd.RP -= pkt.DonatedRP sd.RP -= pkt.DonatedRP
sd.Save(s) sd.Save(s)
if donated+int(pkt.DonatedRP) >= requirement { if donated+int(pkt.DonatedRP) >= requirement {
s.server.db.Exec(`UPDATE guilds SET tower_mission_page=tower_mission_page+1 WHERE id=$1`, pkt.GuildID) _, _ = s.server.db.Exec(`UPDATE guilds SET tower_mission_page=tower_mission_page+1 WHERE id=$1`, pkt.GuildID)
s.server.db.Exec(`UPDATE guild_characters SET tower_mission_1=NULL, tower_mission_2=NULL, tower_mission_3=NULL WHERE guild_id=$1`, pkt.GuildID) _, _ = s.server.db.Exec(`UPDATE guild_characters SET tower_mission_1=NULL, tower_mission_2=NULL, tower_mission_3=NULL WHERE guild_id=$1`, pkt.GuildID)
pkt.DonatedRP = uint16(requirement - donated) pkt.DonatedRP = uint16(requirement - donated)
} }
bf.WriteUint32(uint32(pkt.DonatedRP)) bf.WriteUint32(uint32(pkt.DonatedRP))
s.server.db.Exec(`UPDATE guilds SET tower_rp=tower_rp+$1 WHERE id=$2`, pkt.DonatedRP, pkt.GuildID) _, _ = s.server.db.Exec(`UPDATE guilds SET tower_rp=tower_rp+$1 WHERE id=$2`, pkt.DonatedRP, pkt.GuildID)
} else { } else {
bf.WriteUint32(0) bf.WriteUint32(0)
} }
@@ -436,7 +436,7 @@ func handleMsgMhfGetGemInfo(s *Session, p mhfpacket.MHFPacket) {
gemHistory := []GemHistory{} gemHistory := []GemHistory{}
var tempGems string var tempGems string
s.server.db.QueryRow(`SELECT COALESCE(gems, $1) FROM tower WHERE char_id=$2`, EmptyTowerCSV(30), s.charID).Scan(&tempGems) _ = s.server.db.QueryRow(`SELECT COALESCE(gems, $1) FROM tower WHERE char_id=$2`, EmptyTowerCSV(30), s.charID).Scan(&tempGems)
for i, v := range stringsupport.CSVElems(tempGems) { for i, v := range stringsupport.CSVElems(tempGems) {
if v < 0 || v > math.MaxUint16 { if v < 0 || v > math.MaxUint16 {
continue continue
@@ -482,11 +482,11 @@ func handleMsgMhfPostGemInfo(s *Session, p mhfpacket.MHFPacket) {
} }
var gems string var gems string
s.server.db.QueryRow(`SELECT COALESCE(gems, $1) FROM tower WHERE char_id=$2`, EmptyTowerCSV(30), s.charID).Scan(&gems) _ = s.server.db.QueryRow(`SELECT COALESCE(gems, $1) FROM tower WHERE char_id=$2`, EmptyTowerCSV(30), s.charID).Scan(&gems)
switch pkt.Op { switch pkt.Op {
case 1: // Add gem case 1: // Add gem
i := int((pkt.Gem >> 8 * 5) + (pkt.Gem - pkt.Gem&0xFF00 - 1%5)) i := int((pkt.Gem >> 8 * 5) + (pkt.Gem - pkt.Gem&0xFF00 - 1%5))
s.server.db.Exec(`UPDATE tower SET gems=$1 WHERE char_id=$2`, stringsupport.CSVSetIndex(gems, i, stringsupport.CSVGetIndex(gems, i)+int(pkt.Quantity)), s.charID) _, _ = s.server.db.Exec(`UPDATE tower SET gems=$1 WHERE char_id=$2`, stringsupport.CSVSetIndex(gems, i, stringsupport.CSVGetIndex(gems, i)+int(pkt.Quantity)), s.charID)
case 2: // Transfer gem case 2: // Transfer gem
// no way im doing this for now // no way im doing this for now
} }

4
server/channelserver/handlers_users.go
View File

@@ -19,10 +19,10 @@ func handleMsgSysSetUserBinary(s *Session, p mhfpacket.MHFPacket) {
var exists []byte var exists []byte
err := s.server.db.QueryRow("SELECT type2 FROM user_binary WHERE id=$1", s.charID).Scan(&exists) err := s.server.db.QueryRow("SELECT type2 FROM user_binary WHERE id=$1", s.charID).Scan(&exists)
if err != nil { if err != nil {
s.server.db.Exec("INSERT INTO user_binary (id) VALUES ($1)", s.charID) _, _ = s.server.db.Exec("INSERT INTO user_binary (id) VALUES ($1)", s.charID)
} }
s.server.db.Exec(fmt.Sprintf("UPDATE user_binary SET type%d=$1 WHERE id=$2", pkt.BinaryType), pkt.RawDataPayload, s.charID) _, _ = s.server.db.Exec(fmt.Sprintf("UPDATE user_binary SET type%d=$1 WHERE id=$2", pkt.BinaryType), pkt.RawDataPayload, s.charID)
msg := &mhfpacket.MsgSysNotifyUserBinary{ msg := &mhfpacket.MsgSysNotifyUserBinary{
CharID: s.charID, CharID: s.charID,

2
server/channelserver/savedata_lifecycle_monitoring_test.go
View File

@@ -384,7 +384,7 @@ func TestSequential_RepeatedLogoutLoginCycles(t *testing.T) {
// Verify data after each cycle // Verify data after each cycle
var savedCompressed []byte var savedCompressed []byte
db.QueryRow("SELECT savedata FROM characters WHERE id = $1", charID).Scan(&savedCompressed) _ = db.QueryRow("SELECT savedata FROM characters WHERE id = $1", charID).Scan(&savedCompressed)
if len(savedCompressed) > 0 { if len(savedCompressed) > 0 {
decompressed, err := nullcomp.Decompress(savedCompressed) decompressed, err := nullcomp.Decompress(savedCompressed)

10
server/channelserver/session_lifecycle_integration_test.go
View File

@@ -367,7 +367,7 @@ func TestSessionLifecycle_MultipleDataTypesPersistence(t *testing.T) {
// Verify 1: Road Points // Verify 1: Road Points
var loadedRdP uint32 var loadedRdP uint32
db.QueryRow("SELECT frontier_points FROM characters WHERE id = $1", charID).Scan(&loadedRdP) _ = db.QueryRow("SELECT frontier_points FROM characters WHERE id = $1", charID).Scan(&loadedRdP)
if loadedRdP != rdpPoints { if loadedRdP != rdpPoints {
t.Errorf("❌ RdP not persisted: got %d, want %d", loadedRdP, rdpPoints) t.Errorf("❌ RdP not persisted: got %d, want %d", loadedRdP, rdpPoints)
allPassed = false allPassed = false
@@ -377,7 +377,7 @@ func TestSessionLifecycle_MultipleDataTypesPersistence(t *testing.T) {
// Verify 2: Koryo Points // Verify 2: Koryo Points
var loadedKoryo uint32 var loadedKoryo uint32
db.QueryRow("SELECT COALESCE(kouryou_point, 0) FROM characters WHERE id = $1", charID).Scan(&loadedKoryo) _ = db.QueryRow("SELECT COALESCE(kouryou_point, 0) FROM characters WHERE id = $1", charID).Scan(&loadedKoryo)
if loadedKoryo != koryoPoints { if loadedKoryo != koryoPoints {
t.Errorf("❌ Koryo points not persisted: got %d, want %d", loadedKoryo, koryoPoints) t.Errorf("❌ Koryo points not persisted: got %d, want %d", loadedKoryo, koryoPoints)
allPassed = false allPassed = false
@@ -387,7 +387,7 @@ func TestSessionLifecycle_MultipleDataTypesPersistence(t *testing.T) {
// Verify 3: Hunter Navi // Verify 3: Hunter Navi
var loadedNavi []byte var loadedNavi []byte
db.QueryRow("SELECT hunternavi FROM characters WHERE id = $1", charID).Scan(&loadedNavi) _ = db.QueryRow("SELECT hunternavi FROM characters WHERE id = $1", charID).Scan(&loadedNavi)
if len(loadedNavi) == 0 { if len(loadedNavi) == 0 {
t.Error("❌ Hunter Navi not saved") t.Error("❌ Hunter Navi not saved")
allPassed = false allPassed = false
@@ -400,7 +400,7 @@ func TestSessionLifecycle_MultipleDataTypesPersistence(t *testing.T) {
// Verify 4: Savedata // Verify 4: Savedata
var savedCompressed []byte var savedCompressed []byte
db.QueryRow("SELECT savedata FROM characters WHERE id = $1", charID).Scan(&savedCompressed) _ = db.QueryRow("SELECT savedata FROM characters WHERE id = $1", charID).Scan(&savedCompressed)
if len(savedCompressed) == 0 { if len(savedCompressed) == 0 {
t.Error("❌ Savedata not saved") t.Error("❌ Savedata not saved")
allPassed = false allPassed = false
@@ -551,7 +551,7 @@ func TestSessionLifecycle_RapidReconnect(t *testing.T) {
// Verify points persisted // Verify points persisted
var loadedPoints uint32 var loadedPoints uint32
db.QueryRow("SELECT frontier_points FROM characters WHERE id = $1", charID).Scan(&loadedPoints) _ = db.QueryRow("SELECT frontier_points FROM characters WHERE id = $1", charID).Scan(&loadedPoints)
if loadedPoints != points { if loadedPoints != points {
t.Errorf("❌ Cycle %d: Points not persisted: got %d, want %d", cycle, loadedPoints, points) t.Errorf("❌ Cycle %d: Points not persisted: got %d, want %d", cycle, loadedPoints, points)
} else { } else {

4
server/channelserver/sys_session.go
View File

@@ -144,7 +144,7 @@ func (s *Session) QueueSendMHFNonBlocking(pkt mhfpacket.MHFPacket) {
bf.WriteUint16(uint16(pkt.Opcode())) bf.WriteUint16(uint16(pkt.Opcode()))
// Build the packet onto the byteframe. // Build the packet onto the byteframe.
pkt.Build(bf, s.clientContext) _ = pkt.Build(bf, s.clientContext)
// Queue it. // Queue it.
s.QueueSendNonBlocking(bf.Data()) s.QueueSendNonBlocking(bf.Data())
@@ -225,7 +225,7 @@ func (s *Session) handlePacketGroup(pktGroup []byte) {
opcodeUint16 := bf.ReadUint16() opcodeUint16 := bf.ReadUint16()
if len(bf.Data()) >= 6 { if len(bf.Data()) >= 6 {
s.ackStart[bf.ReadUint32()] = time.Now() s.ackStart[bf.ReadUint32()] = time.Now()
bf.Seek(2, io.SeekStart) _, _ = bf.Seek(2, io.SeekStart)
} }
opcode := network.PacketID(opcodeUint16) opcode := network.PacketID(opcodeUint16)

2
server/channelserver/sys_stage.go
View File

@@ -78,7 +78,7 @@ func (s *Stage) BroadcastMHF(pkt mhfpacket.MHFPacket, ignoredSession *Session) {
bf.WriteUint16(uint16(pkt.Opcode())) bf.WriteUint16(uint16(pkt.Opcode()))
// Build the packet onto the byteframe. // Build the packet onto the byteframe.
pkt.Build(bf, session.clientContext) _ = pkt.Build(bf, session.clientContext)
// Enqueue in a non-blocking way that drops the packet if the connections send buffer channel is full. // Enqueue in a non-blocking way that drops the packet if the connections send buffer channel is full.
session.QueueSendNonBlocking(bf.Data()) session.QueueSendNonBlocking(bf.Data())