mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-04 00:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix creation deadlock (#1154)

Browse Source
This commit is contained in:
Julian Krings 2025-01-25 14:54:21 +01:00 committed by GitHub
parent 474e033c2b
commit ce0092c52a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java
View File

@ -113,7 +113,6 @@ public class IrisJigsawStructure extends IrisRegistrant {
} }
} }
} }
pieces.addIfMissing(p);
} }
public int getMaxDimension() { public int getMaxDimension() {
@ -140,6 +139,14 @@ public class IrisJigsawStructure extends IrisRegistrant {
loadPiece(i, pools, pieces); loadPiece(i, pools, pieces);
} }
if (pieces.isEmpty()) {
int max = 0;
for (String i : getPieces()) {
max = Math.max(max, getLoader().getJigsawPieceLoader().load(i).getMax2dDimension());
}
return max;
}
int avg = 0; int avg = 0;
for (String i : pieces) { for (String i : pieces) {

10
core/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java
View File

@ -26,7 +26,6 @@ import com.volmit.iris.util.matter.IrisMatter;
import com.volmit.iris.util.matter.Matter; import com.volmit.iris.util.matter.Matter;
import com.volmit.iris.util.matter.MatterSlice; import com.volmit.iris.util.matter.MatterSlice;
import lombok.Getter; import lombok.Getter;
import lombok.Synchronized;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
@ -117,17 +116,16 @@ public class MantleChunk {
ref.decrementAndGet(); ref.decrementAndGet();
} }
@Synchronized
public void flag(MantleFlag flag, boolean f) { public void flag(MantleFlag flag, boolean f) {
flags.set(flag.ordinal(), f ? 1 : 0); flags.set(flag.ordinal(), f ? 1 : 0);
} }
@Synchronized
public void raiseFlag(MantleFlag flag, Runnable r) { public void raiseFlag(MantleFlag flag, Runnable r) {
if (!isFlagged(flag)) { synchronized (this) {
flag(flag, true); if (!isFlagged(flag)) flag(flag, true);
r.run(); else return;
} }
r.run();
} }
public boolean isFlagged(MantleFlag flag) { public boolean isFlagged(MantleFlag flag) {