papermc/CraftBukkit-Patches/0093-Fix-Player-Banning.patch

50 lines
1.9 KiB
Diff
Raw Normal View History

2016-03-01 00:23:45 +00:00
From 2e56c863ba5d4ae0afee8be802e7b05ee8108458 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 15 Apr 2014 10:32:48 +1000
Subject: [PATCH] Fix Player Banning
This issue stems from the fact that Bukkit's API only allows a UUID to be banned, but Minecraft requires both a UUID and name. To fix this we modify the code to require a UUID or a name, or both. The correct fix would be expanding the API to be able to provide a name, however this would require plugin changes.
diff --git a/src/main/java/net/minecraft/server/GameProfileBanEntry.java b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
2015-02-28 11:36:22 +00:00
index 27ce9d9..e68d2b3 100644
--- a/src/main/java/net/minecraft/server/GameProfileBanEntry.java
+++ b/src/main/java/net/minecraft/server/GameProfileBanEntry.java
2015-02-28 11:36:22 +00:00
@@ -28,20 +28,29 @@ public class GameProfileBanEntry extends ExpirableListEntry<GameProfile> {
}
private static GameProfile b(JsonObject jsonobject) {
- if (jsonobject.has("uuid") && jsonobject.has("name")) {
+ // Spigot start
+ // this whole method has to be reworked to account for the fact Bukkit only accepts UUID bans and gives no way for usernames to be stored!
+ UUID uuid = null;
+ String name = null;
+ if (jsonobject.has("uuid")) {
String s = jsonobject.get("uuid").getAsString();
- UUID uuid;
-
try {
uuid = UUID.fromString(s);
} catch (Throwable throwable) {
- return null;
}
- return new GameProfile(uuid, jsonobject.get("name").getAsString());
+ }
+ if ( jsonobject.has("name"))
+ {
+ name = jsonobject.get("name").getAsString();
+ }
+ if ( uuid != null || name != null )
+ {
+ return new GameProfile( uuid, name );
} else {
return null;
}
+ // Spigot End
}
}
--
2016-02-29 21:33:06 +00:00
2.5.0