diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-04-17 03:31:49 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-04-17 03:31:49 -0500 |
commit | 6ad36f09e5173baa3b8f464bae4d0d20411080ec (patch) | |
tree | 8e998312dd5ba3c293aaa9a8889390fc65289097 /src/main/java/net/minecraft/server/NameReferencingFileConverter.java | |
parent | 5cbbcae9a92da70de89469c31d63d145b8b86f8b (diff) | |
download | craftbukkit-6ad36f09e5173baa3b8f464bae4d0d20411080ec.tar craftbukkit-6ad36f09e5173baa3b8f464bae4d0d20411080ec.tar.gz craftbukkit-6ad36f09e5173baa3b8f464bae4d0d20411080ec.tar.lz craftbukkit-6ad36f09e5173baa3b8f464bae4d0d20411080ec.tar.xz craftbukkit-6ad36f09e5173baa3b8f464bae4d0d20411080ec.zip |
Fix getting white list, ban list, and op list. Fixes BUKKIT-5538
The getEntries methods on these return player names instead of UUIDs.
As we need the UUIDs for our API we add a getValues method to get at
the data we need. To further ensure we get the most data possible we
also add a way to get at the stored GameProfile to ensure we always
have both the UUID and the name from the list.
Diffstat (limited to 'src/main/java/net/minecraft/server/NameReferencingFileConverter.java')
-rw-r--r-- | src/main/java/net/minecraft/server/NameReferencingFileConverter.java | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java index 45561e9b..a4724312 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -77,14 +77,12 @@ public class NameReferencingFileConverter { if (b.exists() && b.isFile()) { if (gameprofilebanlist.c().exists()) { - /* CraftBukkit start - Exception is never thrown try { gameprofilebanlist.load(); - } catch (FileNotFoundException filenotfoundexception) { - e.warn("Could not load existing file " + gameprofilebanlist.c().getName(), filenotfoundexception); + // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace + } catch (IOException filenotfoundexception) { + e.warn("Could not load existing file " + gameprofilebanlist.c().getName() + ", " + filenotfoundexception.getMessage()); } - */ - gameprofilebanlist.load(); // CraftBukkit end } @@ -115,14 +113,12 @@ public class NameReferencingFileConverter { if (a.exists() && a.isFile()) { if (ipbanlist.c().exists()) { - /* CraftBukkit start - Exception is never thrown try { ipbanlist.load(); - } catch (FileNotFoundException filenotfoundexception) { - e.warn("Could not load existing file " + ipbanlist.c().getName(), filenotfoundexception); + // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace + } catch (IOException filenotfoundexception) { + e.warn("Could not load existing file " + ipbanlist.c().getName() + ", " + filenotfoundexception.getMessage()); } - */ - ipbanlist.load(); // CraftBukkit end } @@ -160,14 +156,12 @@ public class NameReferencingFileConverter { if (c.exists() && c.isFile()) { if (oplist.c().exists()) { - /* CraftBukkit start - Exception is never thrown try { oplist.load(); - } catch (FileNotFoundException filenotfoundexception) { - e.warn("Could not load existing file " + oplist.c().getName(), filenotfoundexception); + // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace + } catch (IOException filenotfoundexception) { + e.warn("Could not load existing file " + oplist.c().getName() + ", " + filenotfoundexception.getMessage()); } - */ - oplist.load(); // CraftBukkit end } @@ -196,14 +190,12 @@ public class NameReferencingFileConverter { if (d.exists() && d.isFile()) { if (whitelist.c().exists()) { - /* CraftBukkit start - Exception is never thrown try { whitelist.load(); - } catch (FileNotFoundException filenotfoundexception) { - e.warn("Could not load existing file " + whitelist.c().getName(), filenotfoundexception); + // CraftBukkit start - FileNotFoundException -> IOException, don't print stacetrace + } catch (IOException filenotfoundexception) { + e.warn("Could not load existing file " + whitelist.c().getName() + ", " + filenotfoundexception.getMessage()); } - */ - whitelist.load(); // CraftBukkit end } |