Merge branch 'master' of https://github.com/Cryptkeeper/Minetrack into uplot

lib/ping.js

@@ -12,10 +12,10 @@ const config = require('../config')
 function ping (serverRegistration, timeout, callback, version) {
   switch (serverRegistration.data.type) {
     case 'PC':
-      serverRegistration.unfurlSrv((host, port) => {
+      serverRegistration.dnsResolver.unfurlSrv((host, port, remainingTimeout) => {
         const server = new minecraftJavaPing.MinecraftServer(host, port || 25565)
 
-        server.ping(timeout, version, (err, res) => {
+        server.resolve(remainingTimeout, version, (err, res) => {
           if (err) {
             callback(err)
           } else {