From 52f9cd5d229d3658e38e6744e9370c0c7c32c24f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 20 Jan 2018 16:24:36 -0500
Subject: [PATCH] Testing Github/Discord integration

---
 android/AndroidManifest.xml                             | 4 ++--
 core/src/io/anuke/mindustry/core/NetClient.java         | 2 ++
 core/src/io/anuke/mindustry/core/NetServer.java         | 3 ++-
 core/src/io/anuke/mindustry/core/Renderer.java          | 3 ---
 html/src/io/anuke/mindustry/client/WebsocketClient.java | 4 ++--
 kryonet/src/io/anuke/kryonet/KryoServer.java            | 2 --
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 20eb73e3a7..6a140d3103 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.anuke.mindustry"
-    android:versionCode="57"
-    android:versionName="3.3b8" >
+    android:versionCode="58"
+    android:versionName="3.3b9" >
 
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java
index 4132a44aef..792e8bbfbc 100644
--- a/core/src/io/anuke/mindustry/core/NetClient.java
+++ b/core/src/io/anuke/mindustry/core/NetClient.java
@@ -87,6 +87,8 @@ public class NetClient extends Module {
 
             Vars.ui.showError("$text.disconnect");
             connecting = false;
+
+            Mindustry.platforms.updateRPC();
         });
 
         Net.handle(WorldData.class, data -> {
diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index 014e63fb2d..f587ea80ff 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -68,7 +68,6 @@ public class NetServer extends Module{
             Net.sendStream(id, data);
 
             Mindustry.platforms.updateRPC();
-
         });
 
         Net.handleServer(ConnectConfirmPacket.class, (id, packet) -> {
@@ -95,6 +94,8 @@ public class NetServer extends Module{
             dc.playerid = player.id;
 
             Net.send(dc, SendMode.tcp);
+
+            Mindustry.platforms.updateRPC();
         });
 
         Net.handleServer(PositionPacket.class, (id, packet) -> {
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index f898e9aa17..c239fbba9e 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -432,9 +432,6 @@ public class Renderer extends RendererModule{
 
 		Draw.thickness(3f);
 		Draw.color(Color.SLATE);
-		Draw.line(x - len + 1, y, x + len + 1.5f, y);
-		Draw.thickness(1f);
-		Draw.color(Color.BLACK);
 		Draw.line(x - len + 1, y, x + len + 0.5f, y);
 		Draw.color(color);
 		if(w >= 1)
diff --git a/html/src/io/anuke/mindustry/client/WebsocketClient.java b/html/src/io/anuke/mindustry/client/WebsocketClient.java
index 52234ad0c2..62bbb31d95 100644
--- a/html/src/io/anuke/mindustry/client/WebsocketClient.java
+++ b/html/src/io/anuke/mindustry/client/WebsocketClient.java
@@ -28,7 +28,7 @@ public class WebsocketClient implements ClientProvider {
 
     @Override
     public void connect(String ip, int port) throws IOException {
-        socket = new Websocket("wss://" + ip + ":" + Vars.webPort);
+        socket = new Websocket("ws://" + ip + ":" + Vars.webPort);
         socket.addListener(new WebsocketListener() {
             public void onMessage(byte[] bytes) {
                 try {
@@ -105,7 +105,7 @@ public class WebsocketClient implements ClientProvider {
     @Override
     public void pingHost(String address, int port, Consumer<Host> valid, Consumer<IOException> failed) {
         failed.accept(new IOException());
-        Websocket socket = new Websocket("wss://" + address + ":" + Vars.webPort);
+        Websocket socket = new Websocket("ws://" + address + ":" + Vars.webPort);
         final boolean[] accepted = {false};
         socket.addListener(new WebsocketListener() {
             @Override
diff --git a/kryonet/src/io/anuke/kryonet/KryoServer.java b/kryonet/src/io/anuke/kryonet/KryoServer.java
index e779a77c21..7e3ffcf8b9 100644
--- a/kryonet/src/io/anuke/kryonet/KryoServer.java
+++ b/kryonet/src/io/anuke/kryonet/KryoServer.java
@@ -25,7 +25,6 @@ import io.anuke.mindustry.net.Streamable.StreamChunk;
 import io.anuke.ucore.UCore;
 import io.anuke.ucore.core.Timers;
 import org.java_websocket.WebSocket;
-import org.java_websocket.WebSocketServerFactory;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.server.WebSocketServer;
 
@@ -43,7 +42,6 @@ public class KryoServer implements ServerProvider {
     final ByteBuffer buffer = ByteBuffer.allocate(4096);
     final CopyOnWriteArrayList<KryoConnection> connections = new CopyOnWriteArrayList<>();
     final Array<KryoConnection> array = new Array<>();
-    final WebSocketServerFactory factory = SSLGen.getFactory();
     SocketServer webServer;
 
     int lastconnection = 0;