Paper/nms-patches/WorldNBTStorage.patch

113 lines
3.6 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/WorldNBTStorage.java
+++ b/net/minecraft/server/WorldNBTStorage.java
2016-02-29 22:32:46 +01:00
@@ -11,6 +11,11 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import java.util.UUID;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+// CraftBukkit end
+
public class WorldNBTStorage implements IDataManager, IPlayerFileData {
2016-02-29 22:32:46 +01:00
private static final Logger b = LogManager.getLogger();
@@ -21,6 +26,7 @@
private final String g;
private final DefinedStructureManager h;
protected final DataConverterManager a;
+ private UUID uuid = null; // CraftBukkit
2016-02-29 22:32:46 +01:00
public WorldNBTStorage(File file, String s, boolean flag, DataConverterManager dataconvertermanager) {
this.a = dataconvertermanager;
@@ -167,12 +173,38 @@
}
if (nbttagcompound != null) {
+ // CraftBukkit start
+ if (entityhuman instanceof EntityPlayer) {
+ CraftPlayer player = (CraftPlayer) entityhuman.getBukkitEntity();
+ // Only update first played if it is older than the one we have
+ long modified = new File(this.playerDir, entityhuman.getUniqueID().toString() + ".dat").lastModified();
+ if (modified < player.getFirstPlayed()) {
+ player.setFirstPlayed(modified);
+ }
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
entityhuman.f(this.a.a((DataConverterType) DataConverterTypes.PLAYER, nbttagcompound));
}
return nbttagcompound;
}
+ // CraftBukkit start
+ public NBTTagCompound getPlayerData(String s) {
+ try {
+ File file1 = new File(this.playerDir, s + ".dat");
+
+ if (file1.exists()) {
+ return NBTCompressedStreamTools.a((InputStream) (new FileInputStream(file1)));
+ }
+ } catch (Exception exception) {
2016-02-29 22:32:46 +01:00
+ b.warn("Failed to load player data for " + s);
+ }
+
+ return null;
+ }
+ // CraftBukkit end
+
public IPlayerFileData getPlayerFileData() {
return this;
}
2016-02-29 22:32:46 +01:00
@@ -202,4 +234,50 @@
public DefinedStructureManager h() {
return this.h;
}
+
+ // CraftBukkit start
+ public UUID getUUID() {
+ if (uuid != null) return uuid;
+ File file1 = new File(this.baseDir, "uid.dat");
+ if (file1.exists()) {
+ DataInputStream dis = null;
+ try {
+ dis = new DataInputStream(new FileInputStream(file1));
+ return uuid = new UUID(dis.readLong(), dis.readLong());
+ } catch (IOException ex) {
2016-02-29 22:32:46 +01:00
+ b.warn("Failed to read " + file1 + ", generating new random UUID", ex);
+ } finally {
+ if (dis != null) {
+ try {
+ dis.close();
+ } catch (IOException ex) {
+ // NOOP
+ }
+ }
+ }
+ }
+ uuid = UUID.randomUUID();
+ DataOutputStream dos = null;
+ try {
+ dos = new DataOutputStream(new FileOutputStream(file1));
+ dos.writeLong(uuid.getMostSignificantBits());
+ dos.writeLong(uuid.getLeastSignificantBits());
+ } catch (IOException ex) {
2016-02-29 22:32:46 +01:00
+ b.warn("Failed to write " + file1, ex);
+ } finally {
+ if (dos != null) {
+ try {
+ dos.close();
+ } catch (IOException ex) {
+ // NOOP
+ }
+ }
+ }
+ return uuid;
+ }
+
+ public File getPlayerDir() {
+ return playerDir;
+ }
+ // CraftBukkit end
}