From bfa9d653147ca0094b1da3b94203320243c9ab9f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 18 Mar 2021 12:57:27 -0400
Subject: [PATCH] Ban player ID before IP

---
 core/src/mindustry/core/NetServer.java           | 2 +-
 core/src/mindustry/game/EventType.java           | 2 ++
 core/src/mindustry/graphics/CubemapMesh.java     | 1 -
 core/src/mindustry/graphics/IndexedRenderer.java | 1 -
 core/src/mindustry/graphics/g3d/MeshBuilder.java | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 1d97c9c63d..033dfd1e46 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -736,8 +736,8 @@ public class NetServer implements ApplicationListener{
             logic.skipWave();
             info("&lc@ has skipped the wave.", player.name);
         }else if(action == AdminAction.ban){
-            netServer.admins.banPlayerIP(other.con.address);
             netServer.admins.banPlayerID(other.con.uuid);
+            netServer.admins.banPlayerIP(other.con.address);
             other.kick(KickReason.banned);
             info("&lc@ has banned @.", player.name, other.name);
         }else if(action == AdminAction.kick){
diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index 46729b1baf..1055634d20 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -419,6 +419,7 @@ public class EventType{
     }
     
     public static class PlayerBanEvent{
+        @Nullable
         public final Player player;
 
         public PlayerBanEvent(Player player){
@@ -427,6 +428,7 @@ public class EventType{
     }
     
     public static class PlayerUnbanEvent{
+        @Nullable
         public final Player player;
 
         public PlayerUnbanEvent(Player player){
diff --git a/core/src/mindustry/graphics/CubemapMesh.java b/core/src/mindustry/graphics/CubemapMesh.java
index 7631c2bd2d..6b48600e86 100644
--- a/core/src/mindustry/graphics/CubemapMesh.java
+++ b/core/src/mindustry/graphics/CubemapMesh.java
@@ -3,7 +3,6 @@ package mindustry.graphics;
 import arc.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
-import arc.graphics.VertexAttributes.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
 import arc.util.*;
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index 46b9093a14..587ae59c84 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -1,7 +1,6 @@
 package mindustry.graphics;
 
 import arc.graphics.*;
-import arc.graphics.VertexAttributes.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
 import arc.math.*;
diff --git a/core/src/mindustry/graphics/g3d/MeshBuilder.java b/core/src/mindustry/graphics/g3d/MeshBuilder.java
index 89668e2858..8cc0c6805b 100644
--- a/core/src/mindustry/graphics/g3d/MeshBuilder.java
+++ b/core/src/mindustry/graphics/g3d/MeshBuilder.java
@@ -1,7 +1,6 @@
 package mindustry.graphics.g3d;
 
 import arc.graphics.*;
-import arc.graphics.VertexAttributes.*;
 import arc.graphics.gl.*;
 import arc.math.geom.*;
 import mindustry.graphics.g3d.PlanetGrid.*;