Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch issue where guid was a string trying to be made into bytes

Browse Source
This commit is contained in:
Andrew 2022-03-01 12:58:39 -05:00
parent d760fcb010
commit bbddbbf646
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/classes/minecraft/mc_ping.py
View File

@ -3,8 +3,10 @@ import socket
import base64 import base64
import json import json
import os import os
import sys import re
import logging.config import logging.config
import uuid
import random
from app.classes.shared.console import console from app.classes.shared.console import console
from app.classes.minecraft.bedrock_ping import BedrockPing from app.classes.minecraft.bedrock_ping import BedrockPing
@ -170,11 +172,15 @@ def ping(ip, port):
# For the rest of requests see wiki.vg/Protocol # For the rest of requests see wiki.vg/Protocol
def ping_bedrock(ip, port): def ping_bedrock(ip, port):
if len(sys.argv) > 3: rd = random.Random()
client_guid = sys.argv[3]
else:
client_guid = 0
try: try:
rd.seed(''.join(re.findall('..', '%012x' % uuid.getnode())))
client_guid = uuid.UUID(int=rd.getrandbits(32)).int
except:
client_guid = 0
print(client_guid)
try:
print(client_guid)
brp = BedrockPing(ip, port, client_guid) brp = BedrockPing(ip, port, client_guid)
return brp.ping() return brp.ping()
except socket.timeout: except socket.timeout: