diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/WorldNBTStorage.java')
-rw-r--r-- | src/main/java/net/minecraft/server/WorldNBTStorage.java | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java index 321f65b9..c7ec2fdc 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -9,6 +9,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + // CraftBukkit start import java.util.UUID; @@ -17,11 +20,12 @@ import org.bukkit.craftbukkit.entity.CraftPlayer; public class WorldNBTStorage implements IDataManager, IPlayerFileData { + private static final Logger a = LogManager.getLogger(); private final File baseDir; private final File playerDir; private final File dataDir; - private final long sessionId = MinecraftServer.aq(); - private final String e; + private final long sessionId = MinecraftServer.ap(); + private final String f; private UUID uuid = null; // CraftBukkit public WorldNBTStorage(File file1, String s, boolean flag) { @@ -30,7 +34,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { this.playerDir = new File(this.baseDir, "players"); this.dataDir = new File(this.baseDir, "data"); this.dataDir.mkdirs(); - this.e = s; + this.f = s; if (flag) { this.playerDir.mkdirs(); } @@ -54,7 +58,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { } } - public File getDirectory() { // CraftBukkit - protected to public + public File getDirectory() { return this.baseDir; } @@ -183,7 +187,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { file1.renameTo(file2); } catch (Exception exception) { - MinecraftServer.getServer().getLogger().warning("Failed to save player data for " + entityhuman.getName()); + a.warn("Failed to save player data for " + entityhuman.getName()); } } @@ -194,7 +198,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { // CraftBukkit start if (entityhuman instanceof EntityPlayer) { CraftPlayer player = (CraftPlayer) entityhuman.bukkitEntity; - player.setFirstPlayed(new File(playerDir, entityhuman.name + ".dat").lastModified()); + player.setFirstPlayed(new File(playerDir, entityhuman.getName() + ".dat").lastModified()); } // CraftBukkit end entityhuman.f(nbttagcompound); @@ -211,7 +215,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { return NBTCompressedStreamTools.a((InputStream) (new FileInputStream(file1))); } } catch (Exception exception) { - MinecraftServer.getServer().getLogger().warning("Failed to load player data for " + s); + a.warn("Failed to load player data for " + s); } return null; @@ -240,7 +244,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { } public String g() { - return this.e; + return this.f; } // CraftBukkit start @@ -253,7 +257,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { dis = new DataInputStream(new FileInputStream(file1)); return uuid = new UUID(dis.readLong(), dis.readLong()); } catch (IOException ex) { - MinecraftServer.getServer().getLogger().severe("Failed to read " + file1 + ", generating new random UUID", ex); + a.warn("Failed to read " + file1 + ", generating new random UUID", ex); } finally { if (dis != null) { try { @@ -271,7 +275,7 @@ public class WorldNBTStorage implements IDataManager, IPlayerFileData { dos.writeLong(uuid.getMostSignificantBits()); dos.writeLong(uuid.getLeastSignificantBits()); } catch (IOException ex) { - MinecraftServer.getServer().getLogger().severe("Failed to write " + file1, ex); + a.warn("Failed to write " + file1, ex); } finally { if (dos != null) { try { |