Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/WorldNBTStorage.java
+++ b/net/minecraft/server/WorldNBTStorage.java
@@ -14,6 +14,11 @@
@@ -13,6 +13,11 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -9,10 +9,10 @@
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+// CraftBukkit end
+
public class WorldNBTStorage implements IDataManager, IPlayerFileData {
public class WorldNBTStorage implements IPlayerFileData {
private static final Logger b = LogManager.getLogger();
@@ -23,6 +28,7 @@
@@ -22,6 +27,7 @@
private final String f;
private final DefinedStructureManager g;
protected final DataFixer a;
@@ -20,7 +20,7 @@
public WorldNBTStorage(File file, String s, @Nullable MinecraftServer minecraftserver, DataFixer datafixer) {
this.a = datafixer;
@@ -167,6 +173,16 @@
@@ -165,6 +171,16 @@
}
if (nbttagcompound != null) {
@@ -37,7 +37,7 @@
int i = nbttagcompound.hasKeyOfType("DataVersion", 3) ? nbttagcompound.getInt("DataVersion") : -1;
entityhuman.f(GameProfileSerializer.a(this.a, DataFixTypes.PLAYER, nbttagcompound, i));
@@ -175,6 +191,22 @@
@@ -173,6 +189,22 @@
return nbttagcompound;
}
@@ -57,11 +57,11 @@
+ }
+ // CraftBukkit end
+
public IPlayerFileData getPlayerFileData() {
return this;
}
@@ -211,4 +243,50 @@
public DataFixer i() {
public String[] getSeenPlayers() {
String[] astring = this.playerDir.list();
@@ -196,4 +228,50 @@
public DataFixer getDataFixer() {
return this.a;
}
+