9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 20:19:06 +00:00

Fixes Season 2

- Fixed double sided connectors not working properly
- Fixed skulls not being able to be rotated when they are placed on an angle that isn't perfectly straight (north, south, east, west)
This commit is contained in:
StrangeOne101
2021-06-22 17:34:21 +12:00
committed by DanLT
parent 900510e7f2
commit d6ddb2b247
2 changed files with 45 additions and 13 deletions

View File

@@ -21,7 +21,7 @@ public class PlannedPiece {
private IrisJigsawPiece piece;
private IrisObjectRotation rotation;
private IrisDataManager data;
private KList<IrisPosition> connected;
private KList<IrisJigsawPieceConnector> connected;
private boolean dead = false;
private int rotationKey;
private AxisAlignedBB box;
@@ -95,7 +95,7 @@ public class PlannedPiece {
for(IrisJigsawPieceConnector i : piece.getConnectors())
{
if(!connected.contains(i.getPosition()))
if(!connected.contains(i))
{
c.add(i);
}
@@ -108,17 +108,12 @@ public class PlannedPiece {
{
if(piece.getConnectors().contains(c))
{
return connect(c.getPosition());
return connected.addIfMissing(c);
}
return false;
}
private boolean connect(IrisPosition p)
{
return connected.addIfMissing(p);
}
public IrisPosition getWorldPosition(IrisJigsawPieceConnector c)
{
return getWorldPosition(c.getPosition());