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; }