mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add uuid return to PlayerBanEvent (#4982)

Browse Source 
* Update EventType.java

* Update Administration.java
This commit is contained in:
키에르 2021-03-24 23:02:21 +09:00 committed by GitHub
parent 268672adb8
commit a40731624a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/game/EventType.java
View File

@ -421,18 +421,22 @@ public class EventType{
public static class PlayerBanEvent{ public static class PlayerBanEvent{
@Nullable @Nullable
public final Player player; public final Player player;
public final String uuid;
public PlayerBanEvent(Player player){ public PlayerBanEvent(Player player, String uuid){
this.player = player; this.player = player;
this.uuid = uuid;
} }
} }
public static class PlayerUnbanEvent{ public static class PlayerUnbanEvent{
@Nullable @Nullable
public final Player player; public final Player player;
public final String uuid;
public PlayerUnbanEvent(Player player){ public PlayerUnbanEvent(Player player, String uuid){
this.player = player; this.player = player;
this.uuid = uuid;
} }
} }

4
core/src/mindustry/net/Administration.java
View File

@ -220,7 +220,7 @@ public class Administration{
getCreateInfo(id).banned = true; getCreateInfo(id).banned = true;
save(); 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; return true;
} }
@ -259,7 +259,7 @@ public class Administration{
info.banned = false; info.banned = false;
bannedIPs.removeAll(info.ips, false); bannedIPs.removeAll(info.ips, false);
save(); 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; return true;
} }