mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-12 19:57:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Ban player ID before IP

Browse Source
This commit is contained in:
Anuken 2021-03-18 12:57:27 -04:00
parent aa7936100e
commit bfa9d65314
5 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/NetServer.java
View File

@ -736,8 +736,8 @@ public class NetServer implements ApplicationListener{
logic.skipWave(); logic.skipWave();
info("&lc@ has skipped the wave.", player.name); info("&lc@ has skipped the wave.", player.name);
}else if(action == AdminAction.ban){ }else if(action == AdminAction.ban){
netServer.admins.banPlayerIP(other.con.address);
netServer.admins.banPlayerID(other.con.uuid); netServer.admins.banPlayerID(other.con.uuid);
netServer.admins.banPlayerIP(other.con.address);
other.kick(KickReason.banned); other.kick(KickReason.banned);
info("&lc@ has banned @.", player.name, other.name); info("&lc@ has banned @.", player.name, other.name);
}else if(action == AdminAction.kick){ }else if(action == AdminAction.kick){

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

@ -419,6 +419,7 @@ public class EventType{
} }
public static class PlayerBanEvent{ public static class PlayerBanEvent{
@Nullable
public final Player player; public final Player player;
public PlayerBanEvent(Player player){ public PlayerBanEvent(Player player){
@ -427,6 +428,7 @@ public class EventType{
} }
public static class PlayerUnbanEvent{ public static class PlayerUnbanEvent{
@Nullable
public final Player player; public final Player player;
public PlayerUnbanEvent(Player player){ public PlayerUnbanEvent(Player player){

1
core/src/mindustry/graphics/CubemapMesh.java
View File

@ -3,7 +3,6 @@ package mindustry.graphics;
import arc.*; import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.Texture.*; import arc.graphics.Texture.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import arc.math.geom.*; import arc.math.geom.*;
import arc.util.*; import arc.util.*;

1
core/src/mindustry/graphics/IndexedRenderer.java
View File

@ -1,7 +1,6 @@
package mindustry.graphics; package mindustry.graphics;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import arc.math.*; import arc.math.*;

1
core/src/mindustry/graphics/g3d/MeshBuilder.java
View File

@ -1,7 +1,6 @@
package mindustry.graphics.g3d; package mindustry.graphics.g3d;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.VertexAttributes.*;
import arc.graphics.gl.*; import arc.graphics.gl.*;
import arc.math.geom.*; import arc.math.geom.*;
import mindustry.graphics.g3d.PlanetGrid.*; import mindustry.graphics.g3d.PlanetGrid.*;