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

fixed collision

Browse Source
This commit is contained in:
StevenRS11
2013-09-30 00:57:27 -04:00
parent 2203239c81
commit 94bbc2d658
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
StevenDimDoors/mod_pocketDim/core/DimLink.java
View File

@@ -15,16 +15,13 @@ public abstract class DimLink
protected DimLink(Point4D source, DimLink parent, int orientation) protected DimLink(Point4D source, DimLink parent, int orientation)
{ {
<<<<<<< HEAD
this.orientation=orientation;
=======
if (parent.source.getDimension() != source.getDimension()) if (parent.source.getDimension() != source.getDimension())
{ {
// Ban having children in other dimensions to avoid serialization issues with cross-dimensional tails // Ban having children in other dimensions to avoid serialization issues with cross-dimensional tails
throw new IllegalArgumentException("source and parent.source must have the same dimension."); throw new IllegalArgumentException("source and parent.source must have the same dimension.");
} }
>>>>>>> 25446453cba6f491cc0745803f448dd000d453cc
this.parent = parent; this.parent = parent;
this.source = source; this.source = source;
this.tail = parent.tail; this.tail = parent.tail;