Update to Minecraft 1.14

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-25 12:00:00 +10:00
parent 5ea2a0e8e4
commit badc255efc
34 changed files with 172 additions and 167 deletions

View File

@@ -11,7 +11,7 @@
+
public class WorldNBTStorage implements IPlayerFileData {
private static final Logger b = LogManager.getLogger();
private static final Logger LOGGER = LogManager.getLogger();
@@ -22,6 +27,7 @@
private final String f;
private final DefinedStructureManager g;
@@ -50,7 +50,7 @@
+ return NBTCompressedStreamTools.a((InputStream) (new FileInputStream(file1)));
+ }
+ } catch (Exception exception) {
+ b.warn("Failed to load player data for " + s);
+ LOGGER.warn("Failed to load player data for " + s);
+ }
+
+ return null;
@@ -75,7 +75,7 @@
+ dis = new DataInputStream(new FileInputStream(file1));
+ return uuid = new UUID(dis.readLong(), dis.readLong());
+ } catch (IOException ex) {
+ b.warn("Failed to read " + file1 + ", generating new random UUID", ex);
+ LOGGER.warn("Failed to read " + file1 + ", generating new random UUID", ex);
+ } finally {
+ if (dis != null) {
+ try {
@@ -93,7 +93,7 @@
+ dos.writeLong(uuid.getMostSignificantBits());
+ dos.writeLong(uuid.getLeastSignificantBits());
+ } catch (IOException ex) {
+ b.warn("Failed to write " + file1, ex);
+ LOGGER.warn("Failed to write " + file1, ex);
+ } finally {
+ if (dos != null) {
+ try {