NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-31 12:56:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/mc-ping-traceback' into 'dev'

Browse Source 
Wrap sock.recv in try/execpt to stop failure

See merge request crafty-controller/crafty-4!444
This commit is contained in:
Iain Powrie 2022-09-04 20:56:34 +00:00
commit 1ca34948cc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -7,10 +7,9 @@
- Fix performance issues on server metrics panels 'with metrics range' ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440)) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/448)) - Fix performance issues on server metrics panels 'with metrics range' ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/440)) ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/448))
- Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442)) - Fix no id on import3 servers ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/442))
- Fix functionality of bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/441)) - Fix functionality of bedrock update ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/441))
- Fix mc-ping Traceback ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/444))
### Tweaks ### Tweaks
- Flatten input on password resets ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/447)) - Flatten input on password resets ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/447))
### Lang
TBD
<br><br> <br><br>
## --- [4.0.11] - 2022/08/28 ## --- [4.0.11] - 2022/08/28

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

@ -121,8 +121,11 @@ def ping(ip, port):
i = 0 i = 0
j = 0 j = 0
while True: while True:
k = sock.recv(1) try:
if not k: k = sock.recv(1)
if not k:
raise Exception()
except:
return 0 return 0
k = k[0] k = k[0]
i |= (k & 0x7F) << (j * 7) i |= (k & 0x7F) << (j * 7)