From d585fc0e21109fe57b1c4454a4a70953285f6e8b Mon Sep 17 00:00:00 2001
From: Zelophed <zefren1@googlemail.com>
Date: Sat, 17 Oct 2020 04:15:51 +0200
Subject: [PATCH] ForgeCraft Playtesting, Part III-a

- fix chromatic compound needing line of sight to the sky to convert even when the beacon is active
---
 .../curiosities/ChromaticCompoundItem.java    | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
index 4777a2730..3213a7964 100644
--- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
+++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java
@@ -1,15 +1,11 @@
 package com.simibubi.create.content.curiosities;
 
-import java.util.List;
-import java.util.Random;
-
 import com.simibubi.create.AllItems;
 import com.simibubi.create.foundation.advancement.AllTriggers;
 import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.config.CRecipes;
 import com.simibubi.create.foundation.utility.ColorHelper;
 import com.simibubi.create.foundation.utility.VecHelper;
-
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.item.ItemEntity;
@@ -21,16 +17,15 @@ import net.minecraft.particles.ParticleTypes;
 import net.minecraft.tileentity.BeaconTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceContext;
+import net.minecraft.util.math.*;
 import net.minecraft.util.math.RayTraceContext.BlockMode;
 import net.minecraft.util.math.RayTraceContext.FluidMode;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.Heightmap;
 
+import java.util.List;
+import java.util.Random;
+
 public class ChromaticCompoundItem extends Item {
 
 	public ChromaticCompoundItem(Properties properties) {
@@ -122,22 +117,27 @@ public class ChromaticCompoundItem extends Item {
 		int entityX = MathHelper.floor(entity.getX());
 		int entityZ = MathHelper.floor(entity.getZ());
 		int localWorldHeight = world.getHeight(Heightmap.Type.WORLD_SURFACE, entityX, entityZ);
-		if (entity.getY() > localWorldHeight) {
-			BlockPos.Mutable testPos = new BlockPos.Mutable(entityX, localWorldHeight, entityZ);
-			while (testPos.getY() > 0) {
-				testPos.move(Direction.DOWN);
-				BlockState state = world.getBlockState(testPos);
-				if (state.getOpacity(world, testPos) >= 15 && state.getBlock() != Blocks.BEDROCK)
-					break;
-				if (state.getBlock() == Blocks.BEACON) {
-					TileEntity te = world.getTileEntity(testPos);
-					if (!(te instanceof BeaconTileEntity))
-						break;
-					BeaconTileEntity bte = (BeaconTileEntity) te;
-					if (bte.getLevels() != 0)
-						isOverBeacon = true;
-					break;
-				}
+
+		BlockPos.Mutable testPos = new BlockPos.Mutable(
+				entityX,
+				Math.min(MathHelper.floor(entity.getY()), localWorldHeight),
+				entityZ);
+
+		while (testPos.getY() > 0) {
+			testPos.move(Direction.DOWN);
+			BlockState state = world.getBlockState(testPos);
+			if (state.getOpacity(world, testPos) >= 15 && state.getBlock() != Blocks.BEDROCK)
+				break;
+			if (state.getBlock() == Blocks.BEACON) {
+				TileEntity te = world.getTileEntity(testPos);
+				
+				if (!(te instanceof BeaconTileEntity)) break;
+
+				BeaconTileEntity bte = (BeaconTileEntity) te;
+
+				if (!bte.getBeamSegments().isEmpty()) isOverBeacon = true;
+
+				break;
 			}
 		}