Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getting white list, ban list, and op list. Fixes BUKKIT-5538

Browse Source 
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.
This commit is contained in:
Travis Watkins
2014-04-17 03:31:49 -05:00
parent 5cbbcae9a9
commit 6ad36f09e5
9 changed files with 78 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/net/minecraft/server/NameReferencingFileConverter.java
View File

@@ -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
}