From 3079e546a1914b632e4950e7a0da73ce6be52996 Mon Sep 17 00:00:00 2001 From: SenseiKiwi Date: Wed, 22 Jan 2014 17:12:06 -0400 Subject: [PATCH] Fixed Gateway Crash (for real) Fixed a bug in BaseGateway that would cause it to still crash servers during world generation. The import filters must be applied before searching for doors because GatewayBlockFilter uses Forge-provided block IDs and not the standard export values. Also fixed a comment in yCoordHelper that cut off strangely. --- .../java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java | 2 +- .../mod_pocketDim/world/gateways/BaseGateway.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java index 34e8b8d..355a328 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java @@ -74,7 +74,7 @@ public class yCoordHelper public static Point3D findSafeCubeUp(World world, int x, int startY, int z) { // Search for a 3x3x3 cube of air with blocks underneath - // We can also match against a 3x2x3 box with + // We can also match against a 3x2x3 box with replaceable blocks underneath // We shift the search area into the bounds of a chunk for the sake of simplicity, // so that we don't need to worry about working across chunks. diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java index 3c76203..ac687ce 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java @@ -82,8 +82,8 @@ public abstract class BaseGateway DungeonSchematic schematic = this.getSchematicToBuild(world, x, y, z); //apply filters - schematic.applyFilter(filter); schematic.applyImportFilters(properties); + schematic.applyFilter(filter); Point3D doorLocation = filter.getEntranceDoorLocation(); orientation = filter.getEntranceOrientation();