OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-24 01:06:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert changes to ban API from 1.7.8

Browse source 
By: Travis Watkins <amaranth@ubuntu.com>
This commit is contained in:
Bukkit/Spigot 2014-04-17 10:44:02 -05:00
parent 22428bb2fc
commit 328f4ee7c8
4 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-api/src/main/java/org/bukkit/BanList.java
View file

@ -20,10 +20,6 @@ public interface BanList {
* Banned player IP addresses * Banned player IP addresses
*/ */
IP, IP,
/**
* Banned player UUID
*/
UUID,
; ;
} }

11
paper-api/src/main/java/org/bukkit/command/defaults/BanCommand.java
View file

@ -29,17 +29,10 @@ public class BanCommand extends VanillaCommand {
return false; 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; 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) { if (player != null) {
player.kickPlayer("Banned by admin."); player.kickPlayer("Banned by admin.");
} }

14
paper-api/src/main/java/org/bukkit/command/defaults/BanListCommand.java
View file

@ -29,7 +29,7 @@ public class BanListCommand extends VanillaCommand {
public boolean execute(CommandSender sender, String currentAlias, String[] args) { public boolean execute(CommandSender sender, String currentAlias, String[] args) {
if (!testPermission(sender)) return true; if (!testPermission(sender)) return true;
BanList.Type banType = BanList.Type.UUID; BanList.Type banType = BanList.Type.NAME;
if (args.length > 0) { if (args.length > 0) {
if (args[0].equalsIgnoreCase("ips")) { if (args[0].equalsIgnoreCase("ips")) {
banType = BanList.Type.IP; 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()); message.append(banlist[x].getTarget());
} }

3
paper-api/src/main/java/org/bukkit/command/defaults/PardonCommand.java
View file

@ -30,8 +30,7 @@ public class PardonCommand extends VanillaCommand {
return false; return false;
} }
String uuid = sender.getServer().getOfflinePlayer(args[0]).getUniqueId().toString(); Bukkit.getBanList(BanList.Type.NAME).pardon(args[0]);
Bukkit.getBanList(BanList.Type.UUID).pardon(uuid);
Command.broadcastCommandMessage(sender, "Pardoned " + args[0]); Command.broadcastCommandMessage(sender, "Pardoned " + args[0]);
return true; return true;
} }