Skip to content

Fix shared static variables in structure generation #14175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lisolaris wants to merge 1 commit into
base: main
Choose a base branch
from
+212 −0
Draft

Fix shared static variables in structure generation #14175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...s/net/minecraft/world/level/levelgen/structure/structures/NetherFortressPieces.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,24 @@
}
}

@@ -1678,15 +_,16 @@
public StartPiece(final RandomSource random, final int west, final int north) {
super(west, north, getRandomHorizontalDirection(random));

+ // Paper start - structure starts can be generated in parallel; the static weight
+ // arrays must never be mutated, so every StartPiece gets its own weight objects.
for (NetherFortressPieces.PieceWeight piece : NetherFortressPieces.BRIDGE_PIECE_WEIGHTS) {
- piece.placeCount = 0;
- this.availableBridgePieces.add(piece);
+ this.availableBridgePieces.add(new NetherFortressPieces.PieceWeight(piece.pieceClass, piece.weight, piece.maxPlaceCount, piece.allowInRow));
}

for (NetherFortressPieces.PieceWeight piece : NetherFortressPieces.CASTLE_PIECE_WEIGHTS) {
- piece.placeCount = 0;
- this.availableCastlePieces.add(piece);
+ this.availableCastlePieces.add(new NetherFortressPieces.PieceWeight(piece.pieceClass, piece.weight, piece.maxPlaceCount, piece.allowInRow));
}
+ // Paper end
}

public StartPiece(final CompoundTag tag) {
178 changes: 178 additions & 0 deletions ...urces/net/minecraft/world/level/levelgen/structure/structures/StrongholdPieces.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,152 @@
--- a/net/minecraft/world/level/levelgen/structure/structures/StrongholdPieces.java
+++ b/net/minecraft/world/level/levelgen/structure/structures/StrongholdPieces.java
@@ -53,49 +_,28 @@
new StrongholdPieces.PieceWeight(StrongholdPieces.StairsDown.class, 5, 5),
new StrongholdPieces.PieceWeight(StrongholdPieces.FiveCrossing.class, 5, 4),
new StrongholdPieces.PieceWeight(StrongholdPieces.ChestCorridor.class, 5, 4),
- new StrongholdPieces.PieceWeight(StrongholdPieces.Library.class, 10, 2) {
- @Override
- public boolean doPlace(final int depth) {
- return super.doPlace(depth) && depth > 4;
- }
- },
- new StrongholdPieces.PieceWeight(StrongholdPieces.PortalRoom.class, 20, 1) {
- @Override
- public boolean doPlace(final int depth) {
- return super.doPlace(depth) && depth > 5;
- }
- }
+ new StrongholdPieces.PieceWeight(StrongholdPieces.Library.class, 10, 2, 4),
+ new StrongholdPieces.PieceWeight(StrongholdPieces.PortalRoom.class, 20, 1, 5)
};
- private static List<StrongholdPieces.PieceWeight> currentPieces;
- private static @Nullable Class<? extends StrongholdPieces.StrongholdPiece> imposedPiece;
- private static int totalWeight;
private static final StrongholdPieces.SmoothStoneSelector SMOOTH_STONE_SELECTOR = new StrongholdPieces.SmoothStoneSelector();

- public static void resetPieces() {
- currentPieces = Lists.newArrayList();
-
- for (StrongholdPieces.PieceWeight piece : STRONGHOLD_PIECE_WEIGHTS) {
- piece.placeCount = 0;
- currentPieces.add(piece);
- }
-
- imposedPiece = null;
- }
-
- private static boolean updatePieceWeight() {
+ // Paper start - structure starts can be generated in parallel; the piece weight state
+ // must be per-StructureStart (StartPiece), not shared static state.
+ private static boolean updatePieceWeight(final StrongholdPieces.StartPiece startPiece) {
boolean hasAnyPieces = false;
- totalWeight = 0;
+ startPiece.totalWeight = 0;

- for (StrongholdPieces.PieceWeight piece : currentPieces) {
- if (piece.maxPlaceCount > 0 && piece.placeCount < piece.maxPlaceCount) {
+ for (StrongholdPieces.PieceWeight piece : startPiece.currentPieces) {
+ if (piece.maxPlaceCount > 0 && startPiece.placeCounts.getOrDefault(piece, 0) < piece.maxPlaceCount) {
hasAnyPieces = true;
}

- totalWeight = totalWeight + piece.weight;
+ startPiece.totalWeight = startPiece.totalWeight + piece.weight;
}

return hasAnyPieces;
}
+ // Paper end

private static StrongholdPieces.@Nullable StrongholdPiece findAndCreatePieceFactory(
final Class<? extends StrongholdPieces.StrongholdPiece> pieceClass,
@@ -145,15 +_,15 @@
final Direction direction,
final int depth
) {
- if (!updatePieceWeight()) {
+ if (!updatePieceWeight(startPiece)) {
return null;
}

- if (imposedPiece != null) {
+ if (startPiece.imposedPiece != null) {
StrongholdPieces.StrongholdPiece strongholdPiece = findAndCreatePieceFactory(
- imposedPiece, structurePieceAccessor, random, footX, footY, footZ, direction, depth
+ startPiece.imposedPiece, structurePieceAccessor, random, footX, footY, footZ, direction, depth
);
- imposedPiece = null;
+ startPiece.imposedPiece = null;
if (strongholdPiece != null) {
return strongholdPiece;
}
@@ -163,12 +_,13 @@

while (numAttempts < 5) {
numAttempts++;
- int weightSelection = random.nextInt(totalWeight);
+ int weightSelection = random.nextInt(startPiece.totalWeight);

- for (StrongholdPieces.PieceWeight piece : currentPieces) {
+ for (StrongholdPieces.PieceWeight piece : startPiece.currentPieces) {
weightSelection -= piece.weight;
if (weightSelection < 0) {
- if (!piece.doPlace(depth) || piece == startPiece.previousPiece) {
+ int placeCount = startPiece.placeCounts.getOrDefault(piece, 0);
+ if (!piece.doPlace(depth, placeCount) || piece == startPiece.previousPiece) {
break;
}

@@ -176,10 +_,10 @@
piece.pieceClass, structurePieceAccessor, random, footX, footY, footZ, direction, depth
);
if (strongholdPiece != null) {
- piece.placeCount++;
+ startPiece.placeCounts.put(piece, placeCount + 1);
startPiece.previousPiece = piece;
- if (!piece.isValid()) {
- currentPieces.remove(piece);
+ if (!piece.isValid(placeCount + 1)) {
+ startPiece.currentPieces.remove(piece);
}

return strongholdPiece;
@@ -754,21 +_,26 @@
private static class PieceWeight {
public final Class<? extends StrongholdPieces.StrongholdPiece> pieceClass;
public final int weight;
- public int placeCount;
public final int maxPlaceCount;
+ public final int minDepth;

public PieceWeight(final Class<? extends StrongholdPieces.StrongholdPiece> pieceClass, final int weight, final int maxPlaceCount) {
+ this(pieceClass, weight, maxPlaceCount, 0);
+ }
+
+ public PieceWeight(final Class<? extends StrongholdPieces.StrongholdPiece> pieceClass, final int weight, final int maxPlaceCount, final int minDepth) {
this.pieceClass = pieceClass;
this.weight = weight;
this.maxPlaceCount = maxPlaceCount;
- }
-
- public boolean doPlace(final int depth) {
- return this.maxPlaceCount == 0 || this.placeCount < this.maxPlaceCount;
- }
-
- public boolean isValid() {
- return this.maxPlaceCount == 0 || this.placeCount < this.maxPlaceCount;
+ this.minDepth = minDepth;
+ }
+
+ public boolean doPlace(final int depth, final int placeCount) {
+ return (this.maxPlaceCount == 0 || placeCount < this.maxPlaceCount) && (this.minDepth == 0 || depth > this.minDepth);
+ }
+
+ public boolean isValid(final int placeCount) {
+ return this.maxPlaceCount == 0 || placeCount < this.maxPlaceCount;
}
}

@@ -900,10 +_,13 @@
BlockPos pos = this.getWorldPos(5, 3, 6);
if (chunkBB.isInside(pos)) {
Expand All @@ -18,3 +165,34 @@
}
}
}
@@ -1268,7 +_,7 @@
@Override
public void addChildren(final StructurePiece startPiece, final StructurePieceAccessor structurePieceAccessor, final RandomSource random) {
if (this.isSource) {
- StrongholdPieces.imposedPiece = StrongholdPieces.FiveCrossing.class;
+ ((StrongholdPieces.StartPiece)startPiece).imposedPiece = StrongholdPieces.FiveCrossing.class;
}

this.generateSmallDoorChildForward((StrongholdPieces.StartPiece)startPiece, structurePieceAccessor, random, 1, 1);
@@ -1327,8 +_,21 @@
public StrongholdPieces.@Nullable PortalRoom portalRoomPiece;
public final List<StructurePiece> pendingChildren = Lists.newArrayList();

+ // Paper start - per-structure piece weight state (see generatePieceFromSmallDoor)
+ // The weight objects in STRONGHOLD_PIECE_WEIGHTS are shared by every stronghold and cannot be
+ // copied per-StructureStart like the nether fortress weights: the Library and PortalRoom entries
+ // are anonymous subclasses overriding doPlace(depth), so copying the base class would silently
+ // drop their depth constraints. Keep the shared weights immutable (no more placeCount field) and
+ // track per-structure counts in this map instead.
+ final List<StrongholdPieces.PieceWeight> currentPieces = Lists.newArrayList();
+ final java.util.Map<StrongholdPieces.PieceWeight, Integer> placeCounts = new java.util.IdentityHashMap<>();
+ @Nullable Class<? extends StrongholdPieces.StrongholdPiece> imposedPiece;
+ int totalWeight;
+ // Paper end
+
public StartPiece(final RandomSource random, final int west, final int north) {
super(StructurePieceType.STRONGHOLD_START, 0, west, north, getRandomHorizontalDirection(random));
+ this.currentPieces.addAll(java.util.Arrays.asList(STRONGHOLD_PIECE_WEIGHTS));
}

public StartPiece(final CompoundTag tag) {
13 changes: 13 additions & 0 deletions ...es/net/minecraft/world/level/levelgen/structure/structures/StrongholdStructure.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- a/net/minecraft/world/level/levelgen/structure/structures/StrongholdStructure.java
+++ b/net/minecraft/world/level/levelgen/structure/structures/StrongholdStructure.java
@@ -27,7 +_,9 @@
do {
builder.clear();
context.random().setLargeFeatureSeed(context.seed() + tries++, context.chunkPos().x(), context.chunkPos().z());
- StrongholdPieces.resetPieces();
+ // Paper start - piece weight state is now per-StructureStart; the reset is done in the StartPiece constructor
+ // StrongholdPieces.resetPieces();
+ // Paper end
startRoom = new StrongholdPieces.StartPiece(context.random(), context.chunkPos().getBlockX(2), context.chunkPos().getBlockZ(2));
builder.addPiece(startRoom);
startRoom.addChildren(startRoom, builder, context.random());