Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats 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());
}
public boolean hasSchematic()
{
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 Point3D entranceDoorLocation;
public GatewayBlockFilter(short dimensionalDoorID, short transientDoorID, short warpDoorID)
{
super("GatewayEntranceFinder");