server=ip:port in param

Author: michaljaz

src/scripts/UrlParams.js

@@ -6,7 +6,6 @@ function UrlParams (game) {
     const finalName = nameList[Math.floor(Math.random() * nameList.length)]
     game.nick = new URL(document.location).searchParams.get('nick')
     game.server = new URL(document.location).searchParams.get('server')
-    game.serverPort = new URL(document.location).searchParams.get('port')
     game.premium = new URL(document.location).searchParams.get('premium')
     game.proxy = new URL(document.location).searchParams.get('proxy')
     let reload = false
@@ -16,15 +15,7 @@ function UrlParams (game) {
     }
     if (game.server === '' || game.server === null) {
       reload = true
-      game.server = game.production
-        ? game.servers.production[0]
-        : game.servers.development[0]
-    }
-    if (game.serverPort === '' || game.serverPort === null) {
-      reload = true
-      game.serverPort = game.production
-        ? game.servers.production[1]
-        : game.servers.development[1]
+      game.server = game.production ? game.servers.production : game.servers.development
     }
     if (game.premium === '' || game.premium === null) {
       reload = true
@@ -43,7 +34,7 @@ function UrlParams (game) {
       }
     }
     if (reload) {
-      document.location.href = `?server=${game.server}&port=${game.serverPort}&nick=${game.nick}&premium=${game.premium}&proxy=${game.proxy}`
+      document.location.href = `?server=${game.server}&nick=${game.nick}&premium=${game.premium}&proxy=${game.proxy}`
     } else {
       if (game.premium === 'true') {
         swal({

src/scripts/index.js

@@ -14,8 +14,8 @@ class Game {
       console.log('Running in development mode')
     }
     this.servers = {
-      production: ['185.228.139.97', '25564'],
-      development: ['localhost', '25565']
+      production: '185.228.139.97:25564',
+      development: 'localhost:25565'
     }
     this.fov = {
       normal: 70,

src/scripts/proxy/Socket.js

@@ -16,13 +16,14 @@ class Socket {
       hostname = pars[1]
       port = pars[2]
     }
+    const server = this.game.server.split(':')
     this.emit('init', {
       connection,
       hostname,
       port,
       nick: this.game.nick,
-      server: this.game.server,
-      serverPort: this.game.serverPort,
+      server: server[0],
+      serverPort: server[1],
       password: this.game.password
     })
     this.worker.onmessage = (msg) => {