From a2ca5fe3df1147b934cb80a376175a13c02c7b13 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 22 Mar 2021 15:18:24 +0300 Subject: [PATCH] Eternal portal structure fix --- src/main/java/ru/betterend/registry/EndTags.java | 2 +- .../structures/features/StructureEternalPortal.java | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/ru/betterend/registry/EndTags.java b/src/main/java/ru/betterend/registry/EndTags.java index c315e530..f73db438 100644 --- a/src/main/java/ru/betterend/registry/EndTags.java +++ b/src/main/java/ru/betterend/registry/EndTags.java @@ -125,7 +125,7 @@ public class EndTags { TagHelper.addTag(BlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK); TagHelper.addTag(ItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT); - TagHelper.addTag(EndTags.DRAGON_IMMUNE, EndBlocks.ENDER_ORE); + TagHelper.addTag(EndTags.DRAGON_IMMUNE, EndBlocks.ENDER_ORE, EndBlocks.ETERNAL_PEDESTAL, EndBlocks.FLAVOLITE_RUNED_ETERNAL, EndBlocks.FLAVOLITE_RUNED); } public static void addSurfaceBlock(Block block) { diff --git a/src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java b/src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java index d0f4e6b7..8d52e33c 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java +++ b/src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java @@ -27,13 +27,12 @@ public class StructureEternalPortal extends StructureFeatureBase { @Override protected boolean shouldStartAt(ChunkGenerator chunkGenerator, BiomeSource biomeSource, long worldSeed, ChunkRandom chunkRandom, int chunkX, int chunkZ, Biome biome, ChunkPos chunkPos, DefaultFeatureConfig featureConfig) { - long x = chunkPos.x * chunkPos.x; - long z = chunkPos.z * chunkPos.z; - long d = x * x + z * z; - if (d < 1024) { + long x = chunkPos.x; + long z = chunkPos.z; + if (x * x + z * z < 10000) { return false; } - if (chunkGenerator.getHeight((chunkX << 4) | 8, (chunkZ << 4) | 8, Heightmap.Type.WORLD_SURFACE_WG) < 58) { + if (chunkGenerator.getHeight((chunkX << 4) | 8, (chunkZ << 4) | 8, Heightmap.Type.WORLD_SURFACE_WG) < 10) { return false; } return super.shouldStartAt(chunkGenerator, biomeSource, worldSeed, chunkRandom, chunkX, chunkZ, biome, chunkPos, featureConfig); @@ -54,7 +53,7 @@ public class StructureEternalPortal extends StructureFeatureBase { int x = (chunkX << 4) | MHelper.randRange(4, 12, random); int z = (chunkZ << 4) | MHelper.randRange(4, 12, random); int y = chunkGenerator.getHeight(x, z, Type.WORLD_SURFACE_WG); - if (y > 10) { + if (y > 4) { this.children.add(new NBTPiece(STRUCTURE_ID, STRUCTURE, new BlockPos(x, y - 4, z), random.nextInt(5), true, random)); } this.setBoundingBoxFromChildren();