From 4e3665a661c17f2cf02813ceda4bd518b995dac3 Mon Sep 17 00:00:00 2001
From: Brianna <bri@songoda.com>
Date: Tue, 12 May 2020 15:29:36 -0400
Subject: [PATCH] Run ban command in async.

---
 .../commands/CommandBan.java                  | 19 +++++++++++--------
 .../commands/CommandUnBan.java                |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java b/src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java
index b3887e4..7bf14c9 100644
--- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java
+++ b/src/main/java/com/songoda/ultimatemoderation/commands/CommandBan.java
@@ -1,7 +1,6 @@
 package com.songoda.ultimatemoderation.commands;
 
 import com.songoda.core.commands.AbstractCommand;
-import com.songoda.core.utils.PlayerUtils;
 import com.songoda.ultimatemoderation.UltimateModeration;
 import com.songoda.ultimatemoderation.punish.Punishment;
 import com.songoda.ultimatemoderation.punish.PunishmentType;
@@ -11,6 +10,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.omg.CORBA.TypeCodePackage.BadKind;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,11 +55,6 @@ public class CommandBan extends AbstractCommand {
             return ReturnType.FAILURE;
         }
 
-        if (sender instanceof Player && VaultPermissions.hasPermission(Bukkit.getWorlds().get(0).getName(), player, "um.ban.exempt")) {
-            instance.getLocale().newMessage("You cannot ban this player.").sendPrefixedMessage(sender);
-            return ReturnType.FAILURE;
-        }
-
         if (instance.getPunishmentManager().getPlayer(player).getActivePunishments()
                 .stream().anyMatch(appliedPunishment -> appliedPunishment.getPunishmentType() == PunishmentType.BAN)) {
             instance.getLocale().newMessage("That player is already banned.").sendPrefixedMessage(sender);
@@ -71,8 +66,16 @@ public class CommandBan extends AbstractCommand {
             return ReturnType.FAILURE;
         }
 
-        new Punishment(PunishmentType.BAN, duration == 0 ? -1 : duration, reason.equals("") ? null : reason)
-                .execute(sender, player);
+        long durationFinal = duration;
+        Bukkit.getScheduler().runTaskAsynchronously(instance, () -> {
+            if (sender instanceof Player && VaultPermissions.hasPermission(Bukkit.getWorlds().get(0).getName(), player, "um.ban.exempt")) {
+                instance.getLocale().newMessage("You cannot ban this player.").sendPrefixedMessage(sender);
+                return;
+            }
+
+            new Punishment(PunishmentType.BAN, durationFinal == 0 ? -1 : durationFinal, reason.equals("") ? null : reason)
+                    .execute(sender, player);
+        });
 
         return ReturnType.SUCCESS;
     }
diff --git a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java b/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java
index c2ac1b4..191845c 100644
--- a/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java
+++ b/src/main/java/com/songoda/ultimatemoderation/commands/CommandUnBan.java
@@ -28,7 +28,7 @@ public class CommandUnBan extends AbstractCommand {
 
         OfflinePlayer player = Bukkit.getOfflinePlayer(args[0]);
 
-        if (player == null) {
+        if (!player.hasPlayedBefore()) {
             instance.getLocale().newMessage("That player does not exist.").sendPrefixedMessage(sender);
             return ReturnType.FAILURE;
         }