Robot
/
node-gamedig
mirror of https://github.com/gamedig/node-gamedig.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prefer bedrock strings, since Geyser's gamespy implementation has invalid character encoding Fixes #269

This commit is contained in:
Michael Morrison 2022-04-17 20:33:46 -05:00
parent 44c9815265
commit 84f8601b6d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocols/minecraft.js
View File

@ -57,11 +57,7 @@ class Minecraft extends Core {
// Ordered from least worth to most worth (player names / etc)
if (bedrockState) {
if (bedrockState.name) state.name = bedrockState.name;
if (bedrockState.maxplayers) state.maxplayers = bedrockState.maxplayers;
if (bedrockState.players.length) state.players = bedrockState.players;
if (bedrockState.map) state.map = bedrockState.map;
if (bedrockState.ping) state.ping = bedrockState.ping;
}
if (vanillaState) {
try {
@ -89,6 +85,12 @@ class Minecraft extends Core {
else if (gamespyState.raw.numplayers) state.players.setNum(parseInt(gamespyState.raw.numplayers));
if (gamespyState.ping) state.ping = gamespyState.ping;
}
if (bedrockState) {
if (bedrockState.name) state.name = bedrockState.name;
if (bedrockState.maxplayers) state.maxplayers = bedrockState.maxplayers;
if (bedrockState.map) state.map = bedrockState.map;
if (bedrockState.ping) state.ping = bedrockState.ping;
}
// remove dupe spaces from name
state.name = state.name.replace(/\s+/g, ' ');
// remove color codes from name