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

@@ -9,7 +9,7 @@
public abstract class TileEntity {
private static final Logger a = LogManager.getLogger();
@@ -54,8 +56,15 @@
@@ -55,8 +57,15 @@
}
}
@@ -22,20 +22,20 @@
+ @Nullable
+ public static TileEntity create(NBTTagCompound nbttagcompound, @Nullable World world) {
+ // CraftBukkit end
TileEntity tileentity = null;
String s = nbttagcompound.getString("id");
@@ -67,6 +76,7 @@
if (tileentity != null) {
return (TileEntity) IRegistry.BLOCK_ENTITY_TYPE.getOptional(new MinecraftKey(s)).map((tileentitytypes) -> {
@@ -68,6 +77,7 @@
}
}).map((tileentity) -> {
try {
+ tileentity.setWorld(world); // CraftBukkit
tileentity.load(nbttagcompound);
} catch (Throwable throwable1) {
TileEntity.a.error("Failed to load data for block entity {}", s, throwable1);
@@ -156,4 +166,13 @@
public TileEntityTypes<?> C() {
return this.e;
return tileentity;
} catch (Throwable throwable) {
@@ -157,4 +167,13 @@
public TileEntityTypes<?> q() {
return this.b;
}
+
+ // CraftBukkit start - add method