twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update Bukkit for Minecraft 1.7.8

Browse Source 
By: Travis Watkins <amaranth@ubuntu.com>
This commit is contained in:
Bukkit/Spigot
2014-04-10 20:06:14 -05:00
parent 9581550637
commit 07c1670354
9 changed files with 86 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
paper-api/src/main/java/org/bukkit/command/defaults/BanCommand.java
View File

@@ -29,10 +29,17 @@ public class BanCommand extends VanillaCommand {
return false;
}
String reason = args.length > 0 ? StringUtils.join(args, ' ', 1, args.length) : null;
Bukkit.getBanList(BanList.Type.NAME).addBan(args[0], reason, null, sender.getName());
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());
if (player != null) {
player.kickPlayer("Banned by admin.");
}

17
paper-api/src/main/java/org/bukkit/command/defaults/BanListCommand.java
View File

@@ -2,12 +2,14 @@ package org.bukkit.command.defaults;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.commons.lang.Validate;
import org.bukkit.BanEntry;
import org.bukkit.BanList;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.util.StringUtil;
@@ -27,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.NAME;
BanList.Type banType = BanList.Type.UUID;
if (args.length > 0) {
if (args[0].equalsIgnoreCase("ips")) {
banType = BanList.Type.IP;
@@ -48,6 +50,19 @@ public class BanListCommand extends VanillaCommand {
message.append(", ");
}
}
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());
}

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

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