f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
50 lines
3.0 KiB
Diff
50 lines
3.0 KiB
Diff
--- a/net/minecraft/world/level/StructureManager.java
|
|
+++ b/net/minecraft/world/level/StructureManager.java
|
|
@@ -48,7 +_,13 @@
|
|
}
|
|
|
|
public List<StructureStart> startsForStructure(ChunkPos chunkPos, Predicate<Structure> structurePredicate) {
|
|
- Map<Structure, LongSet> allReferences = this.level.getChunk(chunkPos.x, chunkPos.z, ChunkStatus.STRUCTURE_REFERENCES).getAllReferences();
|
|
+ // Paper start - Fix swamp hut cat generation deadlock
|
|
+ return this.startsForStructure(chunkPos, structurePredicate, null);
|
|
+ }
|
|
+
|
|
+ public List<StructureStart> startsForStructure(ChunkPos chunkPos, Predicate<Structure> structurePredicate, @Nullable ServerLevelAccessor levelAccessor) {
|
|
+ Map<Structure, LongSet> allReferences = (levelAccessor == null ? this.level : levelAccessor).getChunk(chunkPos.x, chunkPos.z, ChunkStatus.STRUCTURE_REFERENCES).getAllReferences();
|
|
+ // Paper end - Fix swamp hut cat generation deadlock
|
|
Builder<StructureStart> builder = ImmutableList.builder();
|
|
|
|
for (Entry<Structure, LongSet> entry : allReferences.entrySet()) {
|
|
@@ -114,14 +_,29 @@
|
|
}
|
|
|
|
public StructureStart getStructureWithPieceAt(BlockPos pos, HolderSet<Structure> structures) {
|
|
- return this.getStructureWithPieceAt(pos, structures::contains);
|
|
+ // Paper start - Fix swamp hut cat generation deadlock
|
|
+ return this.getStructureWithPieceAt(pos, structures, null);
|
|
+ }
|
|
+ public StructureStart getStructureWithPieceAt(BlockPos pos, HolderSet<Structure> structures, final @Nullable ServerLevelAccessor levelAccessor) {
|
|
+ return this.getStructureWithPieceAt(pos, structures::contains, levelAccessor);
|
|
+ // Paper end - Fix swamp hut cat generation deadlock
|
|
}
|
|
|
|
public StructureStart getStructureWithPieceAt(BlockPos pos, Predicate<Holder<Structure>> predicate) {
|
|
+ // Paper start - Fix swamp hut cat generation deadlock
|
|
+ return this.getStructureWithPieceAt(pos, predicate, null);
|
|
+ }
|
|
+
|
|
+ public StructureStart getStructureWithPieceAt(BlockPos pos, TagKey<Structure> tag, @Nullable ServerLevelAccessor levelAccessor) {
|
|
+ return this.getStructureWithPieceAt(pos, structure -> structure.is(tag), levelAccessor);
|
|
+ }
|
|
+
|
|
+ public StructureStart getStructureWithPieceAt(BlockPos pos, Predicate<Holder<Structure>> predicate, @Nullable ServerLevelAccessor levelAccessor) {
|
|
+ // Paper end - Fix swamp hut cat generation deadlock
|
|
Registry<Structure> registry = this.registryAccess().lookupOrThrow(Registries.STRUCTURE);
|
|
|
|
for (StructureStart structureStart : this.startsForStructure(
|
|
- new ChunkPos(pos), structure -> registry.get(registry.getId(structure)).map(predicate::test).orElse(false)
|
|
+ new ChunkPos(pos), structure -> registry.get(registry.getId(structure)).map(predicate::test).orElse(false), levelAccessor // Paper - Fix swamp hut cat generation deadlock
|
|
)) {
|
|
if (this.structureHasPieceAt(pos, structureStart)) {
|
|
return structureStart;
|