mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-07 19:12:22 +01:00
78 lines
3.4 KiB
Diff
78 lines
3.4 KiB
Diff
--- a/net/minecraft/server/level/WorldGenRegion.java
|
|
+++ b/net/minecraft/server/level/WorldGenRegion.java
|
|
@@ -169,7 +169,27 @@
|
|
return k < this.generatingStep.directDependencies().size();
|
|
}
|
|
|
|
+ // Paper start - if loaded util
|
|
+ @Nullable
|
|
@Override
|
|
+ public ChunkAccess getChunkIfLoadedImmediately(int x, int z) {
|
|
+ return this.getChunk(x, z, ChunkStatus.FULL, false);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final BlockState getBlockStateIfLoaded(BlockPos blockposition) {
|
|
+ ChunkAccess chunk = this.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4);
|
|
+ return chunk == null ? null : chunk.getBlockState(blockposition);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public final FluidState getFluidIfLoaded(BlockPos blockposition) {
|
|
+ ChunkAccess chunk = this.getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4);
|
|
+ return chunk == null ? null : chunk.getFluidState(blockposition);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
+ @Override
|
|
public BlockState getBlockState(BlockPos pos) {
|
|
return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos);
|
|
}
|
|
@@ -217,7 +237,8 @@
|
|
if (iblockdata.isAir()) {
|
|
return false;
|
|
} else {
|
|
- if (drop) {
|
|
+ if (drop) LOGGER.warn("Potential async entity add during worldgen", new Throwable()); // Paper - Fix async entity add due to fungus trees; log when this happens
|
|
+ if (false) { // CraftBukkit - SPIGOT-6833: Do not drop during world generation
|
|
BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
|
|
|
|
Block.dropResources(iblockdata, this.level, pos, tileentity, breakingEntity, ItemStack.EMPTY);
|
|
@@ -264,6 +285,7 @@
|
|
}
|
|
}
|
|
|
|
+ private boolean hasSetFarWarned = false; // Paper - Buffer OOB setBlock calls
|
|
@Override
|
|
public boolean ensureCanWrite(BlockPos pos) {
|
|
int i = SectionPos.blockToSectionCoord(pos.getX());
|
|
@@ -283,7 +305,15 @@
|
|
|
|
return true;
|
|
} else {
|
|
+ // Paper start - Buffer OOB setBlock calls
|
|
+ if (!hasSetFarWarned) {
|
|
Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + String.valueOf(pos) + ", status: " + String.valueOf(this.generatingStep.targetStatus()) + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
|
|
+ hasSetFarWarned = true;
|
|
+ if (this.getServer() != null && this.getServer().isDebugging()) {
|
|
+ io.papermc.paper.util.TraceUtil.dumpTraceForThread("far setBlock call");
|
|
+ }
|
|
+ }
|
|
+ // Paper end - Buffer OOB setBlock calls
|
|
return false;
|
|
}
|
|
}
|
|
@@ -336,6 +366,13 @@
|
|
|
|
@Override
|
|
public boolean addFreshEntity(Entity entity) {
|
|
+ // CraftBukkit start
|
|
+ return this.addFreshEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean addFreshEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
|
|
+ // CraftBukkit end
|
|
int i = SectionPos.blockToSectionCoord(entity.getBlockX());
|
|
int j = SectionPos.blockToSectionCoord(entity.getBlockZ());
|
|
|