9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-30 20:39:21 +00:00
- Fixed NPE occuring when Jigsaw fails to find Object in pool. Now just produces a warning in the console like it should
- Fixed pointless copies of lists being created within PlannedStructure
- Fixed mobs spawning within other blocks and suffocating on spawn
- Fixed creating a jigsaw with a non existent object causing jigsaw commands to lock up (#377)
- Fixed editing a non existent jigsaw just not doing anything
This commit is contained in:
StrangeOne101
2021-06-19 19:34:46 +12:00
committed by DanLT
parent 82161c10f8
commit b6bc269505
4 changed files with 13 additions and 5 deletions

View File

@@ -179,7 +179,7 @@ public class PlannedStructure {
}
private void generateOutwards() {
for(PlannedPiece i : getPiecesWithAvailableConnectors().shuffleCopy(rng))
for(PlannedPiece i : getPiecesWithAvailableConnectors().shuffle(rng))
{
if(!generatePieceOutwards(i))
{
@@ -317,7 +317,7 @@ public class PlannedStructure {
{
IrisJigsawPiece pi = getData().getJigsawPieceLoader().load(j);
if(terminating && !pi.isTerminal())
if (pi == null || (terminating && !pi.isTerminal()))
{
continue;
}
@@ -325,8 +325,7 @@ public class PlannedStructure {
p.addIfMissing(pi);
}
}
return p.shuffleCopy(rng);
return p.shuffle(rng);
}
private void generateStartPiece() {