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

Resolved Merge Conflicts Again

Browse Source 
...
This commit is contained in:
SenseiKiwi
2014-01-19 01:51:21 -04:00
parent 15cfe6fc33
commit 37a10e5795
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java
View File

@@ -158,7 +158,7 @@ public abstract class BaseGateway
{ {
return !this.isBiomeSpecific || this.biomeNames.contains(biome.biomeName.toLowerCase()); return !this.isBiomeSpecific || this.biomeNames.contains(biome.biomeName.toLowerCase());
} }
public boolean hasSchematic() public boolean hasSchematic()
{ {
return this.schematicPaths != null && !this.schematicPaths.isEmpty(); return this.schematicPaths != null && !this.schematicPaths.isEmpty();

1
src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayBlockFilter.java
View File

@@ -15,7 +15,6 @@ public class GatewayBlockFilter extends SchematicFilter {
private Schematic schematic; private Schematic schematic;
private Point3D entranceDoorLocation; private Point3D entranceDoorLocation;
public GatewayBlockFilter(short dimensionalDoorID, short transientDoorID, short warpDoorID) public GatewayBlockFilter(short dimensionalDoorID, short transientDoorID, short warpDoorID)
{ {
super("GatewayEntranceFinder"); super("GatewayEntranceFinder");