Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-10-21 12:11:59 -04:00
2 changed files with 14 additions and 1 deletions
+2
View File
@@ -724,6 +724,8 @@ public class NetServer implements ApplicationListener{
return; return;
} }
Events.fire(new EventType.AdminRequestEvent(player, other, action));
if(action == AdminAction.wave){ if(action == AdminAction.wave){
//no verification is done, so admins can hypothetically spam waves //no verification is done, so admins can hypothetically spam waves
//not a real issue, because server owners may want to do just that //not a real issue, because server owners may want to do just that
+11
View File
@@ -544,4 +544,15 @@ public class EventType{
} }
} }
public static class AdminRequestEvent{
public final Player player;
public final @Nullable Player other;
public final AdminAction action;
public AdminRequestEvent(Player player, Player other, AdminAction action){
this.player = player;
this.other = other;
this.action = action;
}
}
} }