Merge pull request TeamWizardry#63 from ZengineeringTeam/master

Fix infinite loop in beam raytracing
Mysticpasta1 · Jan 24, 2019 · 2b260b3 · 2b260b3
2 parents 587ad3d + 3411528
commit 2b260b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/com/teamwizardry/refraction/api/beam/Beam.java b/src/main/java/com/teamwizardry/refraction/api/beam/Beam.java
@@ -311,6 +311,7 @@ public void spawn() {
 		if (world.isRemote) return;
 		if (this.getAlpha() <= 1) return;
 		if (bouncedTimes > allowedBounceTimes) return;
+		if (initLoc.squareDistanceTo(finalLoc) < 0.1) return;
 
 		trace = new RayTrace(world, slope, initLoc, range)
 				.setEntityFilter( entity -> {

diff --git a/src/main/java/com/teamwizardry/refraction/common/tile/TileReflectionChamber.java b/src/main/java/com/teamwizardry/refraction/common/tile/TileReflectionChamber.java
@@ -29,6 +29,7 @@ public AxisAlignedBB getRenderBoundingBox() {
 
 	@Override
 	public void update() {
+		if (world.isRemote) return;
 		super.update();
 		Beam beam = outputBeam;
 		if (beam == null || world.getTileEntity(pos) != this) return;