mirror of https://github.com/PaperMC/Paper.git
72 lines
3.5 KiB
Diff
72 lines
3.5 KiB
Diff
--- a/net/minecraft/server/players/OldUsersConverter.java
|
|
+++ b/net/minecraft/server/players/OldUsersConverter.java
|
|
@@ -85,7 +88,7 @@
|
|
try {
|
|
userbanlist.load();
|
|
} catch (IOException ioexception) {
|
|
- OldUsersConverter.LOGGER.warn("Could not load existing file {}", userbanlist.getFile().getName(), ioexception);
|
|
+ OldUsersConverter.LOGGER.warn("Could not load existing file {}", gameprofilebanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -145,7 +146,7 @@
|
|
try {
|
|
ipbanlist.load();
|
|
} catch (IOException ioexception) {
|
|
- OldUsersConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName(), ioexception);
|
|
+ OldUsersConverter.LOGGER.warn("Could not load existing file {}", ipbanlist.getFile().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -186,7 +187,7 @@
|
|
try {
|
|
serveroplist.load();
|
|
} catch (IOException ioexception) {
|
|
- OldUsersConverter.LOGGER.warn("Could not load existing file {}", serveroplist.getFile().getName(), ioexception);
|
|
+ OldUsersConverter.LOGGER.warn("Could not load existing file {}", oplist.getFile().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -232,7 +231,7 @@
|
|
try {
|
|
userwhitelist.load();
|
|
} catch (IOException ioexception) {
|
|
- OldUsersConverter.LOGGER.warn("Could not load existing file {}", userwhitelist.getFile().getName(), ioexception);
|
|
+ OldUsersConverter.LOGGER.warn("Could not load existing file {}", whitelist.getFile().getName()); // CraftBukkit - don't print stacktrace
|
|
}
|
|
}
|
|
|
|
@@ -357,7 +350,31 @@
|
|
File file5 = new File(file, s2 + ".dat");
|
|
File file6 = new File(file4, s3 + ".dat");
|
|
|
|
- OldUsersConverter.ensureDirectoryExists(file4);
|
|
+ // CraftBukkit start - Use old file name to seed lastKnownName
|
|
+ CompoundTag root = null;
|
|
+
|
|
+ try {
|
|
+ root = NbtIo.readCompressed(new java.io.FileInputStream(file5), NbtAccounter.unlimitedHeap());
|
|
+ } catch (Exception exception) {
|
|
+ exception.printStackTrace();
|
|
+ }
|
|
+
|
|
+ if (root != null) {
|
|
+ if (!root.contains("bukkit")) {
|
|
+ root.put("bukkit", new CompoundTag());
|
|
+ }
|
|
+ CompoundTag data = root.getCompound("bukkit");
|
|
+ data.putString("lastKnownName", oldFileName);
|
|
+
|
|
+ try {
|
|
+ NbtIo.writeCompressed(root, new java.io.FileOutputStream(file2));
|
|
+ } catch (Exception exception) {
|
|
+ exception.printStackTrace();
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
+ OldUsersConverter.ensureDirectoryExists(file);
|
|
if (!file5.renameTo(file6)) {
|
|
throw new OldUsersConverter.ConversionError("Could not convert file for " + s2);
|
|
}
|