geforkt von Mirrors/Paper
100 Zeilen
5.0 KiB
Diff
100 Zeilen
5.0 KiB
Diff
--- a/net/minecraft/server/NameReferencingFileConverter.java
|
|
+++ b/net/minecraft/server/NameReferencingFileConverter.java
|
|
@@ -83,8 +83,9 @@
|
|
if (gameprofilebanlist.c().exists()) {
|
|
try {
|
|
gameprofilebanlist.load();
|
|
- } catch (FileNotFoundException filenotfoundexception) {
|
|
- NameReferencingFileConverter.e.warn("Could not load existing file {}", gameprofilebanlist.c().getName(), filenotfoundexception);
|
|
+ // CraftBukkit start - FileNotFoundException -> IOException, don't print stacktrace
|
|
+ } catch (IOException filenotfoundexception) {
|
|
+ NameReferencingFileConverter.e.warn("Could not load existing file {}", gameprofilebanlist.c().getName());
|
|
}
|
|
}
|
|
|
|
@@ -141,8 +142,9 @@
|
|
if (ipbanlist.c().exists()) {
|
|
try {
|
|
ipbanlist.load();
|
|
- } catch (FileNotFoundException filenotfoundexception) {
|
|
- NameReferencingFileConverter.e.warn("Could not load existing file {}", ipbanlist.c().getName(), filenotfoundexception);
|
|
+ // CraftBukkit start - FileNotFoundException -> IOException, don't print stacktrace
|
|
+ } catch (IOException filenotfoundexception) {
|
|
+ NameReferencingFileConverter.e.warn("Could not load existing file {}", ipbanlist.c().getName());
|
|
}
|
|
}
|
|
|
|
@@ -182,8 +184,9 @@
|
|
if (oplist.c().exists()) {
|
|
try {
|
|
oplist.load();
|
|
- } catch (FileNotFoundException filenotfoundexception) {
|
|
- NameReferencingFileConverter.e.warn("Could not load existing file {}", oplist.c().getName(), filenotfoundexception);
|
|
+ // CraftBukkit start - FileNotFoundException -> IOException, don't print stacktrace
|
|
+ } catch (IOException filenotfoundexception) {
|
|
+ NameReferencingFileConverter.e.warn("Could not load existing file {}", oplist.c().getName());
|
|
}
|
|
}
|
|
|
|
@@ -226,8 +229,9 @@
|
|
if (whitelist.c().exists()) {
|
|
try {
|
|
whitelist.load();
|
|
- } catch (FileNotFoundException filenotfoundexception) {
|
|
- NameReferencingFileConverter.e.warn("Could not load existing file {}", whitelist.c().getName(), filenotfoundexception);
|
|
+ // CraftBukkit start - FileNotFoundException -> IOException, don't print stacktrace
|
|
+ } catch (IOException filenotfoundexception) {
|
|
+ NameReferencingFileConverter.e.warn("Could not load existing file {}", whitelist.c().getName());
|
|
}
|
|
}
|
|
|
|
@@ -345,6 +349,30 @@
|
|
File file1 = new File(file2, s + ".dat");
|
|
File file3 = new File(file, s1 + ".dat");
|
|
|
|
+ // CraftBukkit start - Use old file name to seed lastKnownName
|
|
+ NBTTagCompound root = null;
|
|
+
|
|
+ try {
|
|
+ root = NBTCompressedStreamTools.a(new java.io.FileInputStream(file1));
|
|
+ } catch (Exception exception) {
|
|
+ exception.printStackTrace();
|
|
+ }
|
|
+
|
|
+ if (root != null) {
|
|
+ if (!root.hasKey("bukkit")) {
|
|
+ root.set("bukkit", new NBTTagCompound());
|
|
+ }
|
|
+ NBTTagCompound data = root.getCompound("bukkit");
|
|
+ data.setString("lastKnownName", s);
|
|
+
|
|
+ try {
|
|
+ NBTCompressedStreamTools.a(root, new java.io.FileOutputStream(file2));
|
|
+ } catch (Exception exception) {
|
|
+ exception.printStackTrace();
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
NameReferencingFileConverter.b(file);
|
|
if (!file1.renameTo(file3)) {
|
|
throw new NameReferencingFileConverter.FileConversionException("Could not convert file for " + s, null);
|
|
@@ -353,7 +381,7 @@
|
|
|
|
private String a(GameProfile gameprofile) {
|
|
String s = null;
|
|
- String[] astring = astring1;
|
|
+ // String[] astring = astring1; // CraftBukkit - decompile error
|
|
int i = astring.length;
|
|
|
|
for (int j = 0; j < i; ++j) {
|
|
@@ -466,7 +494,7 @@
|
|
|
|
private static File d(PropertyManager propertymanager) {
|
|
String s = propertymanager.getString("level-name", "world");
|
|
- File file = new File(s);
|
|
+ File file = new File(MinecraftServer.getServer().server.getWorldContainer(), s); // CraftBukkit - Respect container setting
|
|
|
|
return new File(file, "players");
|
|
}
|