70 Zeilen
3.5 KiB
Diff
70 Zeilen
3.5 KiB
Diff
--- a/net/minecraft/server/NameReferencingFileConverter.java
|
|
+++ b/net/minecraft/server/NameReferencingFileConverter.java
|
|
@@ -80,7 +80,7 @@
|
|
try {
|
|
gameprofilebanlist.load();
|
|
} catch (IOException ioexception) {
|
|
- NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.b().getName(), ioexception);
|
|
+ NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.b().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -138,7 +138,7 @@
|
|
try {
|
|
ipbanlist.load();
|
|
} catch (IOException ioexception) {
|
|
- NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.b().getName(), ioexception);
|
|
+ NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.b().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -179,7 +179,7 @@
|
|
try {
|
|
oplist.load();
|
|
} catch (IOException ioexception) {
|
|
- NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.b().getName(), ioexception);
|
|
+ NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", oplist.b().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -223,7 +223,7 @@
|
|
try {
|
|
whitelist.load();
|
|
} catch (IOException ioexception) {
|
|
- NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.b().getName(), ioexception);
|
|
+ NameReferencingFileConverter.LOGGER.warn("Could not load existing file {}", whitelist.b().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -346,6 +346,30 @@
|
|
File file5 = new File(file, s2 + ".dat");
|
|
File file6 = new File(file4, s3 + ".dat");
|
|
|
|
+ // CraftBukkit start - Use old file name to seed lastKnownName
|
|
+ NBTTagCompound root = null;
|
|
+
|
|
+ try {
|
|
+ root = NBTCompressedStreamTools.a(new java.io.FileInputStream(file5));
|
|
+ } 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", s2);
|
|
+
|
|
+ try {
|
|
+ NBTCompressedStreamTools.a(root, new java.io.FileOutputStream(file2));
|
|
+ } catch (Exception exception) {
|
|
+ exception.printStackTrace();
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
NameReferencingFileConverter.b(file4);
|
|
if (!file5.renameTo(file6)) {
|
|
throw new NameReferencingFileConverter.FileConversionException("Could not convert file for " + s2);
|