Prevent banme packet from banning multiple times (#680)

pxlsspace · Sep 24, 2023 · d312e1c · d312e1c
1 parent a509644
commit d312e1c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/space/pxls/server/PacketHandler.java b/src/main/java/space/pxls/server/PacketHandler.java
@@ -168,9 +168,11 @@ private void handleShadowBanMe(WebSocketChannel channel, User user, ClientShadow
     }
 
     private void handleBanMe(WebSocketChannel channel, User user, ClientBanMe obj) {
-        String app = obj.getReason();
-        App.getDatabase().insertAdminLog(user.getId(), String.format("permaban %s with reason: auto-ban via script; %s", user.getName(), app));
-        user.ban(0, String.format("auto-ban via script; %s", app), 0, user);
+        if (!user.isBanned() && !user.isShadowBanned()) {
+            String app = obj.getReason();
+            App.getDatabase().insertAdminLog(user.getId(), String.format("permaban %s with reason: auto-ban via script; %s", user.getName(), app));
+            user.ban(0, String.format("auto-ban via script; %s", app), 0, user);
+        }
     }
 
     private void handlePlacementOverrides(WebSocketChannel channel, User user, ClientAdminPlacementOverrides obj) {