From e38344ceae1924749b37352c7227744c08b620d6 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Wed, 2 Oct 2024 06:54:55 +0200
Subject: [PATCH] Refactor BanService#ban

---
 src/main/java/service/BanService.java | 44 ++++++++++++++++++---------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/service/BanService.java b/src/main/java/service/BanService.java
index 24c96bb806..2da009b894 100644
--- a/src/main/java/service/BanService.java
+++ b/src/main/java/service/BanService.java
@@ -91,29 +91,43 @@ public class BanService {
     private void ban(Client c, String victimName, Duration duration, byte reason, String description) {
         Character victim = c.getChannelServer().getPlayerStorage().getCharacterByName(victimName);
 
+        boolean success;
         if (victim == null) {
-            Optional<Integer> foundAccountId = accountService.getAccountIdByChrName(victimName);
-            if (foundAccountId.isEmpty()) {
-                c.sendPacket(PacketCreator.getGMEffect(6, (byte) 1));
-                return;
-            }
-
-            saveBan(foundAccountId.get(), duration, reason, description);
+            success = banOfflineChr(victimName, duration, reason, description);
         } else {
-            victim.setBanned();
-            String readableName = Character.makeMapleReadable(victimName);
-            String ip = victim.getClient().getRemoteAddress();
-            String enrichedDescription = "[%s] %s (IP: %s)".formatted(description, readableName, ip);
-            saveBan(victim.getAccountID(), duration, reason, enrichedDescription);
-            victim.sendPacket(PacketCreator.sendPolice("You have been banned by %s.".formatted(c.getPlayer().getName())));
-            TimerManager.getInstance().schedule(() -> transitionService.disconnect(c, false),
-                    TimeUnit.SECONDS.toMillis(5));
+            success = banOnlineChr(c, victim, duration, reason, description);
         }
 
+        if (!success) {
+            c.sendPacket(PacketCreator.getGMEffect(6, (byte) 1));
+            return;
+        }
         c.sendPacket(PacketCreator.getGMEffect(4, (byte) 0));
         Server.getInstance().broadcastMessage(c.getWorld(), PacketCreator.serverNotice(6, "%s has been banned.".formatted(victimName)));
     }
 
+    private boolean banOfflineChr(String victimName, Duration duration, byte reason, String description) {
+        Optional<Integer> foundAccountId = accountService.getAccountIdByChrName(victimName);
+        if (foundAccountId.isEmpty()) {
+            return false;
+        }
+
+        saveBan(foundAccountId.get(), duration, reason, description);
+        return true;
+    }
+
+    private boolean banOnlineChr(Client c, Character victim, Duration duration, byte reason, String description) {
+        victim.setBanned();
+        String readableName = Character.makeMapleReadable(victim.getName());
+        String ip = victim.getClient().getRemoteAddress();
+        String enrichedDescription = "[%s] %s (IP: %s)".formatted(description, readableName, ip);
+        saveBan(victim.getAccountID(), duration, reason, enrichedDescription);
+        victim.sendPacket(PacketCreator.sendPolice("You have been banned by %s.".formatted(c.getPlayer().getName())));
+        TimerManager.getInstance().schedule(() -> transitionService.disconnect(c, false),
+                TimeUnit.SECONDS.toMillis(5));
+        return true;
+    }
+
     private void saveBan(int accountId, Duration duration, byte reason, String description) {
         final Instant bannedUntil;
         if (duration != null) {