SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-05-14 10:00:00 +10:00
parent 1825747f6d
commit 788fd7eedc
60 changed files with 322 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
paper-server/nms-patches/Chunk.patch
View File

@@ -14,7 +14,7 @@
public class Chunk implements IChunkAccess {
private static final Logger LOGGER = LogManager.getLogger();
@@ -91,8 +98,19 @@
@@ -95,8 +102,19 @@
}
}
@@ -34,7 +34,7 @@
public Chunk(World world, ProtoChunk protochunk) {
this(world, protochunk.getPos(), protochunk.getBiomeIndex(), protochunk.p(), protochunk.n(), protochunk.o(), protochunk.q(), protochunk.getSections(), (Consumer) null);
Iterator iterator = protochunk.y().iterator();
@@ -134,6 +152,7 @@
@@ -138,6 +156,7 @@
this.b(protochunk.r());
this.s = true;
@@ -42,7 +42,7 @@
}
@Override
@@ -224,9 +243,16 @@
@@ -228,9 +247,16 @@
}
}
@@ -59,7 +59,7 @@
int i = blockposition.getX() & 15;
int j = blockposition.getY();
int k = blockposition.getZ() & 15;
@@ -278,7 +304,8 @@
@@ -282,7 +308,8 @@
}
}
@@ -69,7 +69,7 @@
iblockdata.onPlace(this.world, blockposition, iblockdata1, flag);
}
@@ -378,7 +405,12 @@
@@ -382,7 +409,12 @@
@Nullable
public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
@@ -83,7 +83,7 @@
if (tileentity == null) {
NBTTagCompound nbttagcompound = (NBTTagCompound) this.e.remove(blockposition);
@@ -425,6 +457,13 @@
@@ -429,6 +461,13 @@
tileentity1.m();
}
@@ -97,7 +97,7 @@
}
}
@@ -453,6 +492,41 @@
@@ -457,6 +496,41 @@
}
@@ -139,7 +139,7 @@
public void markDirty() {
this.s = true;
}
@@ -527,7 +601,7 @@
@@ -531,7 +605,7 @@
Iterator iterator = this.entitySlices[k].a(oclass).iterator();
while (iterator.hasNext()) {
@@ -148,7 +148,7 @@
if (t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) {
list.add(t0);
@@ -601,7 +675,7 @@
@@ -605,7 +679,7 @@
@Override
public boolean isNeedsSaving() {
@@ -157,21 +157,36 @@
}
public void d(boolean flag) {
@@ -691,7 +765,7 @@
}
@@ -746,7 +820,7 @@
public void B() {
if (this.o instanceof ProtoChunkTickList) {
- ((ProtoChunkTickList) this.o).a(this.world.getBlockTickList(), (blockposition1) -> {
+ ((ProtoChunkTickList<Block>) this.o).a(this.world.getBlockTickList(), (blockposition1) -> { // CraftBukkit - decompile error
return this.getType(blockposition1).getBlock();
- ((ProtoChunkTickList) this.o).a(this.world.getBlockTickList(), (blockposition) -> {
+ ((ProtoChunkTickList<Block>) this.o).a(this.world.getBlockTickList(), (blockposition) -> { // CraftBukkit - decompile error
return this.getType(blockposition).getBlock();
});
} else if (this.o instanceof TickListChunk) {
@@ -700,7 +774,7 @@
this.o = TickListEmpty.a();
@@ -756,7 +830,7 @@
}
if (this.p instanceof ProtoChunkTickList) {
- ((ProtoChunkTickList) this.p).a(this.world.getFluidTickList(), (blockposition1) -> {
+ ((ProtoChunkTickList<FluidType>) this.p).a(this.world.getFluidTickList(), (blockposition1) -> { // CraftBukkit - decompile error
return this.getFluid(blockposition1).getType();
- ((ProtoChunkTickList) this.p).a(this.world.getFluidTickList(), (blockposition) -> {
+ ((ProtoChunkTickList<FluidType>) this.p).a(this.world.getFluidTickList(), (blockposition) -> { // CraftBukkit - decompile error
return this.getFluid(blockposition).getType();
});
} else if (this.p instanceof TickListChunk) {
this.p = TickListEmpty.a();
@@ -768,12 +842,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.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.setNeedsSaving(true);
}