1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-15 03:05:39 +01:00
PaperMC/nms-patches/Chunk.patch

178 lines
6.9 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/Chunk.java
+++ b/net/minecraft/server/Chunk.java
2019-04-23 04:00:00 +02:00
@@ -22,6 +22,13 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import com.google.common.collect.Lists;
+import java.util.LinkedList;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+// CraftBukkit end
+
2018-07-15 02:00:00 +02:00
public class Chunk implements IChunkAccess {
2019-04-25 04:00:00 +02:00
private static final Logger LOGGER = LogManager.getLogger();
2019-04-23 04:00:00 +02:00
@@ -91,8 +98,19 @@
}
}
+ // CraftBukkit start
2016-02-29 22:32:46 +01:00
+ this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this);
2019-04-23 04:00:00 +02:00
+ }
+
+ public org.bukkit.Chunk bukkitChunk;
+ public org.bukkit.Chunk getBukkitChunk() {
+ return bukkitChunk;
}
2019-04-23 04:00:00 +02:00
+ public boolean mustNotSave;
+ public boolean needsDecoration;
+ // CraftBukkit end
+
2019-04-23 04:00:00 +02:00
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 @@
2018-07-15 02:00:00 +02:00
2019-04-23 04:00:00 +02:00
this.b(protochunk.r());
this.s = true;
+ this.needsDecoration = true; // CraftBukkit
2018-07-15 02:00:00 +02:00
}
2019-04-23 04:00:00 +02:00
@Override
@@ -224,9 +243,16 @@
}
}
+ // CraftBukkit start
@Nullable
2019-04-23 04:00:00 +02:00
@Override
2018-10-22 21:00:00 +02:00
public IBlockData setType(BlockPosition blockposition, IBlockData iblockdata, boolean flag) {
+ return this.setType(blockposition, iblockdata, flag, true);
+ }
+
+ @Nullable
2018-10-22 21:00:00 +02:00
+ public IBlockData setType(BlockPosition blockposition, IBlockData iblockdata, boolean flag, boolean doPlace) {
+ // CraftBukkit end
int i = blockposition.getX() & 15;
int j = blockposition.getY();
int k = blockposition.getZ() & 15;
2019-04-23 04:00:00 +02:00
@@ -278,7 +304,8 @@
}
}
2018-07-15 02:00:00 +02:00
- if (!this.world.isClientSide) {
+ // CraftBukkit - Don't place while processing the BlockPlaceEvent, unless it's a BlockContainer. Prevents blocks such as TNT from activating when cancelled.
+ if (!this.world.isClientSide && doPlace && (!this.world.captureBlockStates || block instanceof BlockTileEntity)) {
2019-04-23 04:00:00 +02:00
iblockdata.onPlace(this.world, blockposition, iblockdata1, flag);
}
2019-04-23 04:00:00 +02:00
@@ -378,7 +405,12 @@
2016-05-10 13:47:39 +02:00
@Nullable
public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
- TileEntity tileentity = (TileEntity) this.tileEntities.get(blockposition);
+ // CraftBukkit start
+ TileEntity tileentity = world.capturedTileEntities.get(blockposition);
+ if (tileentity == null) {
+ tileentity = (TileEntity) this.tileEntities.get(blockposition);
+ }
+ // CraftBukkit end
if (tileentity == null) {
2019-04-23 04:00:00 +02:00
NBTTagCompound nbttagcompound = (NBTTagCompound) this.e.remove(blockposition);
@@ -425,6 +457,13 @@
tileentity1.m();
}
+ // CraftBukkit start
+ } else {
+ System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
2018-07-15 02:00:00 +02:00
+ + " (" + getType(blockposition) + ") where there was no entity tile!");
2019-04-23 04:00:00 +02:00
+ System.out.println("Chunk coordinates: " + (this.loc.x * 16) + "," + (this.loc.z * 16));
+ new Exception().printStackTrace();
+ // CraftBukkit end
}
}
2019-04-23 04:00:00 +02:00
@@ -453,6 +492,41 @@
2019-04-23 04:00:00 +02:00
}
2018-07-30 05:09:04 +02:00
2019-04-23 04:00:00 +02:00
+ // CraftBukkit start
+ public void loadCallback() {
2018-07-30 05:09:04 +02:00
+ org.bukkit.Server server = this.world.getServer();
+ if (server != null) {
+ /*
+ * If it's a new world, the first few chunks are generated inside
+ * the World constructor. We can't reliably alter that, so we have
+ * no way of creating a CraftWorld/CraftServer at that point.
+ */
+ server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(this.bukkitChunk, this.needsDecoration));
+
+ if (this.needsDecoration) {
+ java.util.Random random = new java.util.Random();
+ random.setSeed(world.getSeed());
+ long xRand = random.nextLong() / 2L * 2L + 1L;
+ long zRand = random.nextLong() / 2L * 2L + 1L;
2019-04-23 04:00:00 +02:00
+ random.setSeed((long) this.loc.x * xRand + (long) this.loc.z * zRand ^ world.getSeed());
+
+ org.bukkit.World world = this.world.getWorld();
+ if (world != null) {
+ this.world.populating = true;
+ try {
+ for (org.bukkit.generator.BlockPopulator populator : world.getPopulators()) {
+ populator.populate(world, random, bukkitChunk);
+ }
+ } finally {
+ this.world.populating = false;
+ }
+ }
+ server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
+ }
2018-07-30 05:09:04 +02:00
+ }
2019-04-23 04:00:00 +02:00
+ }
+ // CraftBukkit end
2018-10-22 21:00:00 +02:00
+
2019-04-23 04:00:00 +02:00
public void markDirty() {
this.s = true;
}
2019-04-23 04:00:00 +02:00
@@ -527,7 +601,7 @@
Iterator iterator = this.entitySlices[k].a(oclass).iterator();
2015-02-26 23:41:06 +01:00
2018-12-25 22:00:00 +01:00
while (iterator.hasNext()) {
- T t0 = (Entity) iterator.next();
+ T t0 = (T) iterator.next(); // CraftBukkit - decompile error
2018-12-25 22:00:00 +01:00
if (t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) {
list.add(t0);
2019-04-23 04:00:00 +02:00
@@ -601,7 +675,7 @@
2018-07-15 02:00:00 +02:00
2019-04-23 04:00:00 +02:00
@Override
public boolean isNeedsSaving() {
- return this.s || this.q && this.world.getTime() != this.lastSaved;
+ return (this.s || this.q && this.world.getTime() != this.lastSaved) && !this.mustNotSave; // CraftBukkit
}
2018-07-15 02:00:00 +02:00
2019-04-23 04:00:00 +02:00
public void d(boolean flag) {
@@ -691,7 +765,7 @@
}
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();
});
} else if (this.o instanceof TickListChunk) {
@@ -700,7 +774,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();
});
} else if (this.p instanceof TickListChunk) {