From 24403dd39cb07ca96433948d4a6dbd06dc9d392a Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Thu, 17 Apr 2014 10:44:02 -0500
Subject: Revert changes to ban API from 1.7.8

---
 src/main/java/org/bukkit/BanList.java                      |  4 ----
 src/main/java/org/bukkit/command/defaults/BanCommand.java  | 11 ++---------
 .../java/org/bukkit/command/defaults/BanListCommand.java   | 14 +-------------
 .../java/org/bukkit/command/defaults/PardonCommand.java    |  3 +--
 4 files changed, 4 insertions(+), 28 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/bukkit/BanList.java b/src/main/java/org/bukkit/BanList.java
index 541bc773..c21b858e 100644
--- a/src/main/java/org/bukkit/BanList.java
+++ b/src/main/java/org/bukkit/BanList.java
@@ -20,10 +20,6 @@ public interface BanList {
          * Banned player IP addresses
          */
         IP,
-        /**
-         * Banned player UUID
-         */
-        UUID,
         ;
     }
 
diff --git a/src/main/java/org/bukkit/command/defaults/BanCommand.java b/src/main/java/org/bukkit/command/defaults/BanCommand.java
index 5ae95dae..df891b80 100644
--- a/src/main/java/org/bukkit/command/defaults/BanCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanCommand.java
@@ -29,17 +29,10 @@ public class BanCommand extends VanillaCommand {
             return false;
         }
 
-        Player player = Bukkit.getPlayer(args[0]);
-        String uuid;
-        if (player != null) {
-            uuid = player.getUniqueId().toString();
-        } else {
-            uuid = sender.getServer().getOfflinePlayer(args[0]).getUniqueId().toString();
-        }
-
         String reason = args.length > 0 ? StringUtils.join(args, ' ', 1, args.length) : null;
-        Bukkit.getBanList(BanList.Type.UUID).addBan(uuid, reason, null, sender.getName());
+        Bukkit.getBanList(BanList.Type.NAME).addBan(args[0], reason, null, sender.getName());
 
+        Player player = Bukkit.getPlayer(args[0]);
         if (player != null) {
             player.kickPlayer("Banned by admin.");
         }
diff --git a/src/main/java/org/bukkit/command/defaults/BanListCommand.java b/src/main/java/org/bukkit/command/defaults/BanListCommand.java
index 5f3a6f23..dfab7bc8 100644
--- a/src/main/java/org/bukkit/command/defaults/BanListCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/BanListCommand.java
@@ -29,7 +29,7 @@ public class BanListCommand extends VanillaCommand {
     public boolean execute(CommandSender sender, String currentAlias, String[] args) {
         if (!testPermission(sender)) return true;
 
-        BanList.Type banType = BanList.Type.UUID;
+        BanList.Type banType = BanList.Type.NAME;
         if (args.length > 0) {
             if (args[0].equalsIgnoreCase("ips")) {
                 banType = BanList.Type.IP;
@@ -51,18 +51,6 @@ public class BanListCommand extends VanillaCommand {
                 }
             }
 
-            String output = banlist[x].getTarget();
-            if (banType == BanList.Type.UUID) {
-                try {
-                    OfflinePlayer player = sender.getServer().getOfflinePlayer(UUID.fromString(output));
-                    if (player.getName() != null) {
-                        output = player.getName();
-                    }
-                } catch (IllegalArgumentException ex) {
-                    // We seem to have an invalid UUID, what do?
-                }
-            }
-
             message.append(banlist[x].getTarget());
         }
 
diff --git a/src/main/java/org/bukkit/command/defaults/PardonCommand.java b/src/main/java/org/bukkit/command/defaults/PardonCommand.java
index 97c65c5e..82c7a954 100644
--- a/src/main/java/org/bukkit/command/defaults/PardonCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/PardonCommand.java
@@ -30,8 +30,7 @@ public class PardonCommand extends VanillaCommand {
             return false;
         }
 
-        String uuid = sender.getServer().getOfflinePlayer(args[0]).getUniqueId().toString();
-        Bukkit.getBanList(BanList.Type.UUID).pardon(uuid);
+        Bukkit.getBanList(BanList.Type.NAME).pardon(args[0]);
         Command.broadcastCommandMessage(sender, "Pardoned " + args[0]);
         return true;
     }
-- 
cgit v1.2.3