diff --git a/exts/imports/guid.py b/exts/imports/guid.py index f7f193e..38c207b 100644 --- a/exts/imports/guid.py +++ b/exts/imports/guid.py @@ -33,11 +33,11 @@ class Guid: guid = s.pack(args[0], args[1], args[2], *args[3]) self.guid = s.unpack(guid) elif len(args) == 2 and all(isinstance(arg, int) for arg in args): - if all((self.bytes_needed(arg) <= 32) for arg in args): + if all((self.bytes_needed(arg) <= 4) for arg in args): int1, int2 = (args[0] << 32), (args[1] & 0xFFFFFFFF) id_int = int1 | int2 b = pack('Q8x', id_int) - elif all((self.bytes_needed(arg) <= 64) for arg in args): + elif all((self.bytes_needed(arg) <= 8) for arg in args): b = pack('QQ', args[0], args[1]) else: raise TypeError('Arguments don\'t match any allowed configuration') @@ -48,7 +48,7 @@ class Guid: ) self.guid = s.unpack(guid) elif len(args) == 1 and isinstance(args[0], int): - if self.bytes_needed(args[0]) <= 64: + if self.bytes_needed(args[0]) <= 8: b = pack('Q8x', args[0]) else: first = (args[0] >> 64) & MAXINT64 diff --git a/exts/imports/process_files.py b/exts/imports/process_files.py index 2e60d2b..b59d1ef 100644 --- a/exts/imports/process_files.py +++ b/exts/imports/process_files.py @@ -47,8 +47,6 @@ def rename_section(cfg, sec, sec_new): def get_server_guid(server_file): server_file = server_file.encode() - # p = s.pack((int.from_bytes(hash.encode(), byteorder='little') >> 64) & max_int, - # int.from_bytes(hash.encode(), byteorder='little') & max_int)