From aeb6e6498e77b9a354249def45a2642f07ca47e0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 10 Dec 2019 17:00:49 -0500
Subject: [PATCH] Minor server tweaks

---
 core/src/io/anuke/mindustry/core/NetServer.java          | 4 ++++
 core/src/io/anuke/mindustry/game/EventType.java          | 4 ++++
 server/build.gradle                                      | 3 +++
 server/src/io/anuke/mindustry/server/ServerLauncher.java | 5 ++++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index 8d42dcaed7..72d141576b 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -66,6 +66,10 @@ public class NetServer implements ApplicationListener{
         });
 
         net.handleServer(ConnectPacket.class, (con, packet) -> {
+            if(con.address.startsWith("steam:")){
+                packet.uuid = con.address.substring("steam:".length());
+            }
+
             String uuid = packet.uuid;
 
             if(admins.isIPBanned(con.address)) return;
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index a5319c18e5..f631019729 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -95,6 +95,10 @@ public class EventType{
 
     }
 
+    public static class ServerLoadEvent{
+
+    }
+
     public static class ContentReloadEvent{
 
     }
diff --git a/server/build.gradle b/server/build.gradle
index 31f6d57dc5..09299943fa 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -46,6 +46,9 @@ task dist(type: Jar){
     exclude("com/badlogic/gdx/**")
     exclude("icons/**")
     exclude("bundles/**")
+    if(!versionModifier.contains("steam")){
+        exclude("**.dll", "**.so", "**.dylib")
+    }
 
     manifest{
         attributes 'Main-Class': project.mainClassName
diff --git a/server/src/io/anuke/mindustry/server/ServerLauncher.java b/server/src/io/anuke/mindustry/server/ServerLauncher.java
index 549746fc83..bd584ab4d1 100644
--- a/server/src/io/anuke/mindustry/server/ServerLauncher.java
+++ b/server/src/io/anuke/mindustry/server/ServerLauncher.java
@@ -7,13 +7,14 @@ import io.anuke.arc.files.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.*;
 import io.anuke.mindustry.core.*;
+import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.mod.*;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.net.*;
 
 import java.time.*;
 
-import static io.anuke.arc.util.Log.*;
+import static io.anuke.arc.util.Log.format;
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.mindustry.server.ServerControl.*;
 
@@ -63,5 +64,7 @@ public class ServerLauncher implements ApplicationListener{
         Core.app.addListener(new ServerControl(args));
 
         mods.each(Mod::init);
+
+        Events.fire(new ServerLoadEvent());
     }
 }
\ No newline at end of file