From a40731624a309a8a2e64f0ebb5b8e79e014a487f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=82=A4=EC=97=90=EB=A5=B4?=
 <44261958+Kieaer@users.noreply.github.com>
Date: Wed, 24 Mar 2021 23:02:21 +0900
Subject: [PATCH] Add uuid return to PlayerBanEvent (#4982)

* Update EventType.java

* Update Administration.java
---
 core/src/mindustry/game/EventType.java     | 8 ++++++--
 core/src/mindustry/net/Administration.java | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java
index 1055634d20..975a9baf1e 100644
--- a/core/src/mindustry/game/EventType.java
+++ b/core/src/mindustry/game/EventType.java
@@ -421,18 +421,22 @@ public class EventType{
     public static class PlayerBanEvent{
         @Nullable
         public final Player player;
+        public final String uuid;
 
-        public PlayerBanEvent(Player player){
+        public PlayerBanEvent(Player player, String uuid){
             this.player = player;
+            this.uuid = uuid;
         }
     }
     
     public static class PlayerUnbanEvent{
         @Nullable
         public final Player player;
+        public final String uuid;
 
-        public PlayerUnbanEvent(Player player){
+        public PlayerUnbanEvent(Player player, String uuid){
             this.player = player;
+            this.uuid = uuid;
         }
     }
     
diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
index 3ef4784dda..5f78270421 100644
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -220,7 +220,7 @@ public class Administration{
         getCreateInfo(id).banned = true;
 
         save();
-        Events.fire(new PlayerBanEvent(Groups.player.find(p -> id.equals(p.uuid()))));
+        Events.fire(new PlayerBanEvent(Groups.player.find(p -> id.equals(p.uuid())), id));
         return true;
     }
 
@@ -259,7 +259,7 @@ public class Administration{
         info.banned = false;
         bannedIPs.removeAll(info.ips, false);
         save();
-        Events.fire(new PlayerUnbanEvent(Groups.player.find(p -> id.equals(p.uuid()))));
+        Events.fire(new PlayerUnbanEvent(Groups.player.find(p -> id.equals(p.uuid())), id));
         return true;
     }