fix remaining merge errors

2020-05-14 21:03:14 -05:00
parent 5c346b3dd6
commit f4dadd9805
2 changed files with 2 additions and 4 deletions
--- a/lib/ping.js
+++ b/lib/ping.js
@ -15,7 +15,7 @@ function ping (serverRegistration, timeout, callback, version) {
      serverRegistration.dnsResolver.resolve((host, port, remainingTimeout) => {
        const server = new minecraftJavaPing.MinecraftServer(host, port || 25565)

-        server.resolve(remainingTimeout, version, (err, res) => {
+        server.ping(remainingTimeout, version, (err, res) => {
          if (err) {
            callback(err)
          } else {