From c3fb6aa821fcb67e9267b96650750c619d87f5b9 Mon Sep 17 00:00:00 2001 From: Matthe815 Date: Mon, 3 Jul 2023 02:58:10 -0400 Subject: [PATCH] refactor: Remove more debug code --- common/decryption/jpk.go | 8 -------- server/channelserver/handlers_quest.go | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/common/decryption/jpk.go b/common/decryption/jpk.go index e40c97a43..08f756d28 100644 --- a/common/decryption/jpk.go +++ b/common/decryption/jpk.go @@ -21,12 +21,9 @@ func UnpackSimple(data []byte) []byte { bf.SetLE() header := bf.ReadUint32() - println("Decrypting") - if header == 0x1A524B4A { bf.Seek(0x2, io.SeekCurrent) jpkType := bf.ReadUint16() - println("JPK Type: ", jpkType) switch jpkType { case 3: @@ -40,8 +37,6 @@ func UnpackSimple(data []byte) []byte { } } - println("Skipping") - return data } @@ -110,8 +105,5 @@ func JPKCopy(outBuffer []byte, offset int, length int, index *int) { func ReadByte(bf *byteframe.ByteFrame) byte { value := bf.ReadUint8() - if value < 0 { - println("Not implemented") - } return byte(value) } diff --git a/server/channelserver/handlers_quest.go b/server/channelserver/handlers_quest.go index 42868577c..fe7eef115 100644 --- a/server/channelserver/handlers_quest.go +++ b/server/channelserver/handlers_quest.go @@ -95,7 +95,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { quest_failure_pointer := file_bytes.ReadInt32() quest_contractor_pointer := file_bytes.ReadInt32() quest_description_pointer := file_bytes.ReadInt32() - //Use String header pointers to seek to string and then read null terminated string + file_bytes.Seek(int64(quest_name_pointer), io.SeekStart) quest_name_string := file_bytes.ReadNullTerminatedBytes() file_bytes.Seek(int64(quest_main_pointer), io.SeekStart) @@ -134,6 +134,7 @@ func readOriginalPointers(string_pointer int32, quest []byte) []byte { new_pointers.WriteNullTerminatedBytes(quest_failure_string) new_pointers.WriteNullTerminatedBytes(quest_contractor_string) new_pointers.WriteNullTerminatedBytes(quest_description_string) + new_pointers.WriteUint8(18) new_pointers.WriteBytes([]byte{0x83, 0x59, 0x89, 0x5B, 0x83, 0x3A, 0x58, 0xB6, 0x8E, 0x59, 0x82, 0xCC, 0x83, 0x58, 0x83, 0x58, 0x83, 0x81})