Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Make bans pretend to use names like before 1.7.8.

Browse Source 
Bans require a name and UUID but our API only allows for a single string
identifier for a ban entry. Until this is sorted out go back to the old
name based setup since we can always get a UUID given a name.
This commit is contained in:
Travis Watkins 2014-04-17 10:45:10 -05:00
parent a8d5c1224f
commit 3e911dba54
5 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
View File

@ -90,14 +90,22 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
}
public boolean isBanned() {
return server.getBanList(BanList.Type.UUID).isBanned(getUniqueId().toString());
if (getName() == null) {
return false;
}
return server.getBanList(BanList.Type.NAME).isBanned(getName());
}
public void setBanned(boolean value) {
if (getName() == null) {
return;
}
if (value) {
server.getBanList(BanList.Type.UUID).addBan(getUniqueId().toString(), null, null, null);
server.getBanList(BanList.Type.NAME).addBan(getName(), null, null, null);
} else {
server.getBanList(BanList.Type.UUID).pardon(getUniqueId().toString());
server.getBanList(BanList.Type.NAME).pardon(getName());
}
}

2
src/main/java/org/bukkit/craftbukkit/CraftProfileBanEntry.java
View File

@ -27,7 +27,7 @@ public final class CraftProfileBanEntry implements org.bukkit.BanEntry {
@Override
public String getTarget() {
return this.profile.getId().toString();
return this.profile.getName();
}
@Override

23
src/main/java/org/bukkit/craftbukkit/CraftProfileBanList.java
View File

@ -3,7 +3,6 @@ package org.bukkit.craftbukkit;
import java.io.IOException;
import java.util.Date;
import java.util.Set;
import java.util.UUID;
import net.minecraft.server.GameProfileBanEntry;
import net.minecraft.server.GameProfileBanList;
@ -27,8 +26,10 @@ public class CraftProfileBanList implements org.bukkit.BanList {
public org.bukkit.BanEntry getBanEntry(String target) {
Validate.notNull(target, "Target cannot be null");
UUID id = UUID.fromString(target);
GameProfile profile = new GameProfile(id, null);
GameProfile profile = MinecraftServer.getServer().getUserCache().a(target);
if (profile == null) {
return null;
}
GameProfileBanEntry entry = (GameProfileBanEntry) list.get(profile);
if (entry == null) {
@ -42,8 +43,10 @@ public class CraftProfileBanList implements org.bukkit.BanList {
public org.bukkit.BanEntry addBan(String target, String reason, Date expires, String source) {
Validate.notNull(target, "Ban target cannot be null");
UUID id = UUID.fromString(target);
GameProfile profile = new GameProfile(id, null);
GameProfile profile = MinecraftServer.getServer().getUserCache().a(target);
if (profile == null) {
return null;
}
GameProfileBanEntry entry = new GameProfileBanEntry(profile, new Date(),
StringUtils.isBlank(source) ? null : source, expires,
@ -75,8 +78,10 @@ public class CraftProfileBanList implements org.bukkit.BanList {
public boolean isBanned(String target) {
Validate.notNull(target, "Target cannot be null");
UUID id = UUID.fromString(target);
GameProfile profile = new GameProfile(id, null);
GameProfile profile = MinecraftServer.getServer().getUserCache().a(target);
if (profile == null) {
return false;
}
return list.isBanned(profile);
}
@ -85,9 +90,7 @@ public class CraftProfileBanList implements org.bukkit.BanList {
public void pardon(String target) {
Validate.notNull(target, "Target cannot be null");
UUID id = UUID.fromString(target);
GameProfile profile = new GameProfile(id, null);
GameProfile profile = MinecraftServer.getServer().getUserCache().a(target);
list.remove(profile);
}
}

2
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -1356,8 +1356,6 @@ public final class CraftServer implements Server {
case IP:
return new CraftIpBanList(playerList.getIPBans());
case NAME:
return null;
case UUID:
default:
return new CraftProfileBanList(playerList.getProfileBans());
}

6
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -738,15 +738,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean isBanned() {
return server.getBanList(BanList.Type.UUID).isBanned(getUniqueId().toString());
return server.getBanList(BanList.Type.NAME).isBanned(getName());
}
@Override
public void setBanned(boolean value) {
if (value) {
server.getBanList(BanList.Type.UUID).addBan(getUniqueId().toString(), null, null, null);
server.getBanList(BanList.Type.NAME).addBan(getName(), null, null, null);
} else {
server.getBanList(BanList.Type.UUID).pardon(getUniqueId().toString());
server.getBanList(BanList.Type.NAME).pardon(getName());
}
}