Skip to content

Commit aad6939

Browse files
committed
Remove hardcoded overrides
1 parent 30c0b98 commit aad6939

1 file changed

Lines changed: 0 additions & 63 deletions

File tree

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,11 +2673,6 @@ private Direction[] getBlockedDirections(BlockVector3 position) {
26732673
return NO_DIRECTIONS;
26742674
}
26752675

2676-
Direction[] blockedDirections = BLOCKED_DIRECTIONS_OVERRIDE.get(blockType);
2677-
if (blockedDirections != null) {
2678-
return blockedDirections;
2679-
}
2680-
26812676
if (material.isFullCube(ShapeType.VISUAL_SHAPE)) {
26822677
return CARDINAL_UPRIGHT_DIRECTIONS;
26832678
}
@@ -3315,64 +3310,6 @@ public int morph(BlockVector3 position, double brushSize, int minErodeFaces, int
33153310
.map(Direction::toBlockVector)
33163311
.toArray(BlockVector3[]::new);
33173312

3318-
/**
3319-
* Some blocks need a special case for one reason or another.
3320-
*/
3321-
private static final Map<BlockType, Direction[]> BLOCKED_DIRECTIONS_OVERRIDE = new HashMap<>();
3322-
3323-
static {
3324-
Arrays.asList(
3325-
// fullcubes that you can see through on all 6 sides
3326-
BlockTypes.SPAWNER,
3327-
BlockTypes.BEACON,
3328-
BlockTypes.MANGROVE_ROOTS,
3329-
BlockTypes.ICE,
3330-
3331-
// You can see through some of the doors/trapdoors, which is not reflected in their visual shape
3332-
// Commented lines are opaque and kept for reference
3333-
BlockTypes.OAK_DOOR,
3334-
BlockTypes.OAK_TRAPDOOR,
3335-
// BlockTypes.SPRUCE_DOOR,
3336-
// BlockTypes.SPRUCE_TRAPDOOR,
3337-
// BlockTypes.BIRCH_DOOR,
3338-
// BlockTypes.BIRCH_TRAPDOOR,
3339-
BlockTypes.JUNGLE_DOOR,
3340-
BlockTypes.JUNGLE_TRAPDOOR,
3341-
BlockTypes.ACACIA_DOOR,
3342-
BlockTypes.ACACIA_TRAPDOOR,
3343-
// BlockTypes.DARK_OAK_DOOR,
3344-
// BlockTypes.DARK_OAK_TRAPDOOR,
3345-
// BlockTypes.MANGROVE_DOOR,
3346-
BlockTypes.MANGROVE_TRAPDOOR,
3347-
BlockTypes.CHERRY_DOOR,
3348-
BlockTypes.CHERRY_TRAPDOOR,
3349-
// BlockTypes.PALE_OAK_DOOR,
3350-
// BlockTypes.PALE_OAK_TRAPDOOR,
3351-
BlockTypes.BAMBOO_DOOR,
3352-
BlockTypes.BAMBOO_TRAPDOOR,
3353-
BlockTypes.CRIMSON_DOOR,
3354-
BlockTypes.CRIMSON_TRAPDOOR,
3355-
BlockTypes.WARPED_DOOR,
3356-
BlockTypes.WARPED_TRAPDOOR,
3357-
BlockTypes.IRON_DOOR,
3358-
BlockTypes.IRON_TRAPDOOR
3359-
).forEach(blockType -> {
3360-
BLOCKED_DIRECTIONS_OVERRIDE.put(blockType, NO_DIRECTIONS);
3361-
});
3362-
3363-
// The copper doors/trapdoors are too many to list individually
3364-
java.util.regex.Pattern pattern = java.util.regex.Pattern.compile("^.*:(?:.*_)?(?:copper_door|copper_trapdoor)(?:_.*)?$");
3365-
for (BlockType blockType : BlockType.REGISTRY) {
3366-
if (pattern.matcher(blockType.id()).matches()) {
3367-
BLOCKED_DIRECTIONS_OVERRIDE.put(blockType, NO_DIRECTIONS);
3368-
}
3369-
}
3370-
3371-
// These are visual fullcubes, but they're mostly open:
3372-
BLOCKED_DIRECTIONS_OVERRIDE.put(BlockTypes.TRIAL_SPAWNER, new Direction[] { Direction.UP });
3373-
BLOCKED_DIRECTIONS_OVERRIDE.put(BlockTypes.VAULT, new Direction[] { Direction.UP, Direction.DOWN });
3374-
}
3375-
33763313
private static double lengthSq(double x, double y, double z) {
33773314
return (x * x) + (y * y) + (z * z);
33783315
}

0 commit comments

Comments
 (0)