mirror of
https://github.com/gamedig/node-gamedig.git
synced 2024-09-27 21:01:34 +02:00
Prefer bedrock strings, since Geyser's gamespy implementation has invalid character encoding Fixes #269
This commit is contained in:
parent
44c9815265
commit
84f8601b6d
@ -57,11 +57,7 @@ class Minecraft extends Core {
|
|||||||
|
|
||||||
// Ordered from least worth to most worth (player names / etc)
|
// Ordered from least worth to most worth (player names / etc)
|
||||||
if (bedrockState) {
|
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.players.length) state.players = bedrockState.players;
|
||||||
if (bedrockState.map) state.map = bedrockState.map;
|
|
||||||
if (bedrockState.ping) state.ping = bedrockState.ping;
|
|
||||||
}
|
}
|
||||||
if (vanillaState) {
|
if (vanillaState) {
|
||||||
try {
|
try {
|
||||||
@ -89,6 +85,12 @@ class Minecraft extends Core {
|
|||||||
else if (gamespyState.raw.numplayers) state.players.setNum(parseInt(gamespyState.raw.numplayers));
|
else if (gamespyState.raw.numplayers) state.players.setNum(parseInt(gamespyState.raw.numplayers));
|
||||||
if (gamespyState.ping) state.ping = gamespyState.ping;
|
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
|
// remove dupe spaces from name
|
||||||
state.name = state.name.replace(/\s+/g, ' ');
|
state.name = state.name.replace(/\s+/g, ' ');
|
||||||
// remove color codes from name
|
// remove color codes from name
|
||||||
|
Loading…
Reference in New Issue
Block a user