From 7e0391a8a0cbead24566d5e3d242c8bc3bc53a4c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 17 Aug 2020 23:47:39 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/core/NetServer.java        | 3 +++
 core/src/mindustry/game/EventType.java        | 9 +++++++++
 core/src/mindustry/logic/LCanvas.java         | 1 -
 core/src/mindustry/ui/dialogs/JoinDialog.java | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index e63b1a5657..8374c4d609 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -612,6 +612,9 @@ public class NetServer implements ApplicationListener{
             unit.vel.set(xVelocity, yVelocity).limit(unit.type().speed);
             long elapsed = Time.timeSinceMillis(con.lastReceivedClientTime);
             float maxSpeed = (boosting ? player.unit().type().boostMultiplier : 1f) * player.unit().type().speed;
+            if(unit.isGrounded()){
+                maxSpeed *= unit.floorSpeedMultiplier();
+            }
             float maxMove = elapsed / 1000f * 60f * maxSpeed * 1.1f;
 
             if(con.lastUnit != unit){
diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index e3915e4b45..8f19756096 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -5,6 +5,7 @@ import mindustry.core.GameState.*;
 import mindustry.ctype.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
+import mindustry.net.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
@@ -87,6 +88,14 @@ public class EventType{
         }
     }
 
+    public static class ClientPreConnectEvent{
+        public final Host host;
+
+        public ClientPreConnectEvent(Host host){
+            this.host = host;
+        }
+    }
+
     public static class PlayerChatEvent{
         public final Player player;
         public final String message;
diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java
index 54b88b98d7..dab1f46a6d 100644
--- a/core/src/mindustry/logic/LCanvas.java
+++ b/core/src/mindustry/logic/LCanvas.java
@@ -59,7 +59,6 @@ public class LCanvas extends Table{
             pane.setScrollPercentY(s);
             pane.updateVisualScroll();
             pane.requestScroll();
-            Core.app.post(() -> pane.requestScroll());
         });
 
         if(toLoad != null){
diff --git a/core/src/mindustry/ui/dialogs/JoinDialog.java b/core/src/mindustry/ui/dialogs/JoinDialog.java
index 02fd664c91..9b02b7413e 100644
--- a/core/src/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/mindustry/ui/dialogs/JoinDialog.java
@@ -10,6 +10,7 @@ import arc.util.*;
 import arc.util.serialization.*;
 import mindustry.*;
 import mindustry.core.*;
+import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.io.legacy.*;
@@ -108,6 +109,7 @@ public class JoinDialog extends BaseDialog{
             TextButton button = buttons[0] = remote.button("[accent]" + server.displayIP(), Styles.cleart, () -> {
                 if(!buttons[0].childrenPressed()){
                     if(server.lastHost != null){
+                        Events.fire(new ClientPreConnectEvent(server.lastHost));
                         safeConnect(server.ip, server.port, server.lastHost.version);
                     }else{
                         connect(server.ip, server.port);