Fascinated/Minetrack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix remaining merge errors

Browse Source
This commit is contained in:
Nick Krecklow 2020-05-14 21:03:14 -05:00
parent 5c346b3dd6
commit f4dadd9805
No known key found for this signature in database
GPG Key ID: 5F149FDE156FFA94
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/CHANGELOG.md
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
**5.5.0** *(May 11 2020)* **5.5.0** *(May 11 2020)*
**IMPORTANT** **IMPORTANT**
@ -15,14 +14,13 @@ This update moves ping timestamps to a shared timestamp per round. Meaning that
- Removes the mobile browser detection/manual historical graph load request. It is now automatically loaded given its smaller size. - Removes the mobile browser detection/manual historical graph load request. It is now automatically loaded given its smaller size.
Faster, smaller, more features. Faster, smaller, more features.
=======
**5.4.3** *(May 14 2020)* **5.4.3** *(May 14 2020)*
- Added support for the optional field `config->skipSrvTimeout` in `config.json`. If a configured server does not return a valid response when unfurling potential SRV records, it will avoid re-unfurling SRV records for this duration in milliseconds. Use a value of `0` to disable this feature altogether. - Added support for the optional field `config->skipSrvTimeout` in `config.json`. If a configured server does not return a valid response when unfurling potential SRV records, it will avoid re-unfurling SRV records for this duration in milliseconds. Use a value of `0` to disable this feature altogether.
- Removes support for the `config->performance->skipUnfurlSrv` and `config->performance->unfurlSrvCacheTtl` fields in `config.json - Removes support for the `config->performance->skipUnfurlSrv` and `config->performance->unfurlSrvCacheTtl` fields in `config.json
**5.4.2** *(May 13 2020)* **5.4.2** *(May 13 2020)*
- Fixes a typo causing `_minecraft._tcp.*` SRV records to not resolve. - Fixes a typo causing `_minecraft._tcp.*` SRV records to not resolve.
>>>>>>> 0e5859a82953b9d67ea759a3235080eaf7dbe74c
**5.4.1** *(May 10 2020)* **5.4.1** *(May 10 2020)*
- Adds warnings when the system is pinging more frequently than it is getting replies. - Adds warnings when the system is pinging more frequently than it is getting replies.

2
lib/ping.js
View File

@ -15,7 +15,7 @@ function ping (serverRegistration, timeout, callback, version) {
serverRegistration.dnsResolver.resolve((host, port, remainingTimeout) => { serverRegistration.dnsResolver.resolve((host, port, remainingTimeout) => {
const server = new minecraftJavaPing.MinecraftServer(host, port || 25565) const server = new minecraftJavaPing.MinecraftServer(host, port || 25565)
server.resolve(remainingTimeout, version, (err, res) => { server.ping(remainingTimeout, version, (err, res) => {
if (err) { if (err) {
callback(err) callback(err)
} else { } else {