fix: safely handle duplicate entries when punishing alts (#994)

BanManagement · Sep 8, 2024 · 1a73048 · 1a73048
1 parent 282acee
commit 1a73048
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/common/src/main/java/me/confuser/banmanager/common/listeners/CommonJoinListener.java b/common/src/main/java/me/confuser/banmanager/common/listeners/CommonJoinListener.java
@@ -13,6 +13,7 @@
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.sql.SQLIntegrityConstraintViolationException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -541,7 +542,12 @@ private void punishAlts(List<PlayerData> duplicates, UUID uuid) throws SQLExcept
             ban.isSilent(),
             ban.getExpires());
 
-        plugin.getPlayerBanStorage().ban(newBan);
+        try {
+            plugin.getPlayerBanStorage().ban(newBan);
+        } catch (SQLIntegrityConstraintViolationException e) {
+          // Ignore duplicate entry errors
+          plugin.getPlayerBanStorage().addBan(newBan);
+        }
 
         plugin.getScheduler().runSync(() -> {
           CommonPlayer bukkitPlayer = plugin.getServer().getPlayer(newBan.getPlayer().getUUID());
@@ -575,7 +581,12 @@ private void punishAlts(List<PlayerData> duplicates, UUID uuid) throws SQLExcept
             mute.isSoft(),
             mute.getExpires());
 
-        plugin.getPlayerMuteStorage().mute(newMute);
+        try {
+          plugin.getPlayerMuteStorage().mute(newMute);
+        } catch (SQLIntegrityConstraintViolationException e) {
+          // Ignore duplicate entry errors
+          plugin.getPlayerMuteStorage().addMute(newMute);
+        }
       }
     }
   }