From b67a4f3c147b97154d0078456e707794d3213175 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 27 Feb 2018 20:30:55 -0500
Subject: [PATCH] Fixed dedicated server crashes

---
 core/assets/version.properties                          | 4 ++--
 server/src/io/anuke/mindustry/server/ServerControl.java | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index a98e97f755..bfcf5788e1 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Tue Feb 27 19:35:27 EST 2018
+#Tue Feb 27 20:28:50 EST 2018
 version=release
-androidBuildCode=313
+androidBuildCode=317
 name=Mindustry
 code=3.4
 build=29
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 2b3c172004..f420c6bc3d 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -291,7 +291,7 @@ public class ServerControl extends Module {
             }
 
             if(target != null){
-                String ip = Net.getConnection(player.clientid).address;
+                String ip = Net.getConnection(target.clientid).address;
                 netServer.admins.banPlayer(ip);
                 Net.kickConnection(target.clientid, KickReason.banned);
                 info("Banned player by IP: {0}", ip);
@@ -352,7 +352,7 @@ public class ServerControl extends Module {
             }
 
             if(target != null){
-                String ip = Net.getConnection(player.clientid).address;
+                String ip = Net.getConnection(target.clientid).address;
                 netServer.admins.adminPlayer(ip);
                 NetEvents.handleAdminSet(target, true);
                 info("Admin-ed player by IP: {0} / {1}", ip, arg[0]);
@@ -377,7 +377,7 @@ public class ServerControl extends Module {
             }
 
             if(target != null){
-                String ip = Net.getConnection(player.clientid).address;
+                String ip = Net.getConnection(target.clientid).address;
                 netServer.admins.unAdminPlayer(ip);
                 NetEvents.handleAdminSet(target, false);
                 info("Un-admin-ed player by IP: {0} / {1}", ip, arg[0]);