Update to Minecraft 1.14.2

This commit is contained in:
md_5
2019-05-28 06:30:00 +10:00
parent fcb9f90bf3
commit cb3d14c5a7
57 changed files with 385 additions and 394 deletions

View File

@@ -70,7 +70,7 @@
if (tileentity == null) {
NBTTagCompound nbttagcompound = (NBTTagCompound) this.e.remove(blockposition);
@@ -429,6 +454,13 @@
tileentity1.m();
tileentity1.W_();
}
+ // CraftBukkit start
@@ -83,7 +83,7 @@
}
}
@@ -457,6 +489,50 @@
@@ -478,6 +510,50 @@
}
@@ -134,7 +134,7 @@
public void markDirty() {
this.s = true;
}
@@ -531,7 +607,7 @@
@@ -552,7 +628,7 @@
Iterator iterator = this.entitySlices[k].a(oclass).iterator();
while (iterator.hasNext()) {
@@ -143,7 +143,7 @@
if (t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) {
list.add(t0);
@@ -605,7 +681,7 @@
@@ -626,7 +702,7 @@
@Override
public boolean isNeedsSaving() {
@@ -152,7 +152,7 @@
}
public void d(boolean flag) {
@@ -746,7 +822,7 @@
@@ -767,7 +843,7 @@
public void B() {
if (this.o instanceof ProtoChunkTickList) {
@@ -161,7 +161,7 @@
return this.getType(blockposition).getBlock();
});
this.o = TickListEmpty.a();
@@ -756,7 +832,7 @@
@@ -777,7 +853,7 @@
}
if (this.p instanceof ProtoChunkTickList) {
@@ -170,18 +170,18 @@
return this.getFluid(blockposition).getType();
});
this.p = TickListEmpty.a();
@@ -768,12 +844,12 @@
@@ -789,12 +865,12 @@
}
public void a(WorldServer worldserver) {
- if (this.o == TickListEmpty.a()) {
+ if (this.o == TickListEmpty.<Block>a()) { // CraftBukkit - decompile error
this.o = new TickListChunk<>(IRegistry.BLOCK::getKey, worldserver.getBlockTickList().a(true, this.loc));
this.o = new TickListChunk<>(IRegistry.BLOCK::getKey, worldserver.getBlockTickList().a(this.loc, true, false));
this.setNeedsSaving(true);
}
- if (this.p == TickListEmpty.a()) {
+ if (this.p == TickListEmpty.<FluidType>a()) { // CraftBukkit - decompile error
this.p = new TickListChunk<>(IRegistry.FLUID::getKey, worldserver.getFluidTickList().a(true, this.loc));
this.p = new TickListChunk<>(IRegistry.FLUID::getKey, worldserver.getFluidTickList().a(this.loc, true, false));
this.setNeedsSaving(true);
}