From 37daf0a8719e057f5255f5782bff2221edaacd01 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 3 Jun 2023 00:58:22 -0400
Subject: [PATCH] Ignore processing players kicked in event

---
 core/src/mindustry/core/NetServer.java           | 2 +-
 core/src/mindustry/entities/comp/PlayerComp.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 1436c3c1e4..f3bcb26310 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -138,7 +138,7 @@ public class NetServer implements ApplicationListener{
 
             String uuid = packet.uuid;
 
-            if(admins.isIPBanned(con.address) || admins.isSubnetBanned(con.address)) return;
+            if(admins.isIPBanned(con.address) || admins.isSubnetBanned(con.address) || con.kicked) return;
 
             if(con.hasBegunConnecting){
                 con.kick(KickReason.idInUse);
diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
index a28a293c16..c995d3d9f0 100644
--- a/core/src/mindustry/entities/comp/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -275,6 +275,9 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
     public void draw(){
         if(unit != null && unit.inFogTo(Vars.player.team())) return;
 
+        //??????
+        if(name == null) return;
+
         Draw.z(Layer.playerName);
         float z = Drawf.text();