From fd093318c64ad8973d93b96fa27ebc9ba3d4c086 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 4 Apr 2021 12:16:00 +0300 Subject: [PATCH] More fixes --- .../ru/betterend/world/features/CrashedShipFeature.java | 7 ++++++- .../java/ru/betterend/world/generator/IslandLayer.java | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/ru/betterend/world/features/CrashedShipFeature.java b/src/main/java/ru/betterend/world/features/CrashedShipFeature.java index 457cef56..12f17db3 100644 --- a/src/main/java/ru/betterend/world/features/CrashedShipFeature.java +++ b/src/main/java/ru/betterend/world/features/CrashedShipFeature.java @@ -43,7 +43,12 @@ public class CrashedShipFeature extends NBTStructureFeature { @Override protected boolean canSpawn(StructureWorldAccess world, BlockPos pos, Random random) { - return pos.getY() > 58 && world.getBlockState(pos.down()).isIn(EndTags.GEN_TERRAIN); + long x = pos.getX() >> 4; + long z = pos.getX() >> 4; + if (x * x + z * z < 3600) { + return false; + } + return pos.getY() > 5 && world.getBlockState(pos.down()).isIn(EndTags.GEN_TERRAIN); } @Override diff --git a/src/main/java/ru/betterend/world/generator/IslandLayer.java b/src/main/java/ru/betterend/world/generator/IslandLayer.java index 26858fe9..82a7513f 100644 --- a/src/main/java/ru/betterend/world/generator/IslandLayer.java +++ b/src/main/java/ru/betterend/world/generator/IslandLayer.java @@ -63,9 +63,11 @@ public class IslandLayer { positions.clear(); for (int pox = -1; pox < 2; pox++) { int px = pox + ix; + long px2 = px; for (int poz = -1; poz < 2; poz++) { int pz = poz + iz; - if (GeneratorOptions.noRingVoid() || (long) px + (long) pz > options.centerDist) { + long pz2 = pz; + if (GeneratorOptions.noRingVoid() || px2 * px2 + pz2 * pz2 > options.centerDist) { RANDOM.setSeed(getSeed(px, pz)); double posX = (px + RANDOM.nextFloat()) * options.distance; double posY = MHelper.randRange(options.minY, options.maxY, RANDOM);