next commit

1 files changed, 15 insertions, 15 deletions

diff --git a/packets/login_server_login_success_packet.gd b/packets/login_server_login_success_packet.gd
index fd7dbf1..1f95bae 100644
--- a/packets/login_server_login_success_packet.gd
+++ b/packets/login_server_login_success_packet.gd
@@ -2,9 +2,14 @@ class_name LoginServerLoginSuccessPacket
 extends Packet
 
 
-static var header := 0x0ac4
+const HEADER := 0x0ac4
+const BYTE_LENGTH := 0
 
 
+## Byte Type: u16
+## Byte Length: 2
+var packet_length: int
+
 ## Byte Type: u32
 ## Byte Length: 4
 var login_id1: int
@@ -41,19 +46,14 @@ var character_server_information: Array
 static func from_bytes(bytes: PackedByteArray):
 	var packet = LoginServerLoginSuccessPacket.new()
 	
-	packet.login_id1 = bytes.decode_u32(0)
-	packet.account_id = bytes.decode_u32(4)
-	packet.login_id2 = bytes.decode_u32(8)
-	packet.ip_address = bytes.slice(12, 16)
-	packet.last_login = bytes.slice(16, 16 + 26)
-	packet.gender = bytes[42]
-	packet.auth_token = bytes.slice(43, 43 + 17).get_string_from_utf8()
-	packet.character_server_information = CharacterServerInformation.array_from_bytes(bytes.slice(60))
+	packet.packet_length = bytes.decode_u16(2)
+	packet.login_id1 = bytes.decode_u32(4)
+	packet.account_id = bytes.decode_u32(8)
+	packet.login_id2 = bytes.decode_u32(12)
+	packet.ip_address = bytes.slice(16, 20)
+	packet.last_login = bytes.slice(20, 20 + 26)
+	packet.gender = bytes[46]
+	packet.auth_token = bytes.slice(47, 47 + 17).get_string_from_utf8()
+	packet.character_server_information = CharacterServerInformation.array_from_bytes(bytes.slice(64))
 	
 	return packet
-
-static func from_bytes_via_peer(peer: StreamPeer):
-	var _header = peer.get_data(4) # 2 = header, 2 = packet_size
-	var remaining_bytes = peer.get_data(peer.get_available_bytes())
-	
-	return from_bytes(remaining_bytes[1])