apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Completed Changes to Stabilized Rift Signature

Browse Source 
Completed the change to Stabilized Rift Signatures so that overwriting
links that already belonged to an SRS is done for free.
This commit is contained in:
SenseiKiwi
2014-06-26 04:52:03 -04:00
parent fe035f6677
commit 448890207f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
View File

@@ -219,6 +219,7 @@ public class ItemRiftSignature extends Item
{ {
private Point4D point; private Point4D point;
private int orientation; private int orientation;
Point4DOrientation(int x, int y, int z, int orientation, int dimID) Point4DOrientation(int x, int y, int z, int orientation, int dimID)
{ {
this.point = new Point4D(x, y, z, dimID); this.point = new Point4D(x, y, z, dimID);
@@ -244,10 +245,16 @@ public class ItemRiftSignature extends Item
{ {
return point.getDimension(); return point.getDimension();
} }
int getOrientation() int getOrientation()
{ {
return orientation; return orientation;
} }
Point4D getPoint()
{
return point;
}
} }
} }

6
src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
View File

@@ -52,10 +52,10 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
if (source != null) if (source != null)
{ {
// Yes, it's initialized. // Yes, it's initialized.
DimLink link;
DimLink reverse;
NewDimData sourceDimension = PocketManager.getDimensionData(source.getDimension()); NewDimData sourceDimension = PocketManager.getDimensionData(source.getDimension());
NewDimData destinationDimension = PocketManager.getDimensionData(world); NewDimData destinationDimension = PocketManager.getDimensionData(world);
DimLink reverse = destinationDimension.getLink(x, adjustedY, z);
DimLink link;
// Check whether the SRS is being used to restore one of its previous // Check whether the SRS is being used to restore one of its previous
// link pairs. In other words, the SRS is being used on a location // link pairs. In other words, the SRS is being used on a location
@@ -63,7 +63,7 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
// intention of overwriting the source-side link to point there. // intention of overwriting the source-side link to point there.
// Those benign redirection operations will be handled for free. // Those benign redirection operations will be handled for free.
if (false) //TODO Add proper check! if (reverse != null && source.getPoint().equals(reverse.destination()))
{ {
// Only the source-to-destination link is needed. // Only the source-to-destination link is needed.
link = sourceDimension.createLink(source.getX(), source.getY(), source.getZ(), LinkTypes.NORMAL, source.getOrientation()); link = sourceDimension.createLink(source.getX(), source.getY(), source.getZ(), LinkTypes.NORMAL, source.getOrientation());