Merge branch 'trunk/1.18' of github.com:Lothrazar/Cyclic into trunk/1…

….19.2
Lothrazar · Nov 10, 2024 · 20db4a1 · 20db4a1
2 parents 15d468a + 3c99568
commit 20db4a1
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/com/lothrazar/cyclic/event/EventRender.java b/src/main/java/com/lothrazar/cyclic/event/EventRender.java
@@ -215,12 +215,9 @@ else if (!stHere.isAir()) {
           if (distance < LaserItem.RANGE_MAX) {
             //first vector is FROM, second is TO
             BlockHitResult miss = mc.level.clip(new ClipContext(cameraEyePosition, entityHitResultLocation, ClipContext.Block.VISUAL, ClipContext.Fluid.NONE, mc.player));
-            //              BlockHitResult miss = BlockHitResult.miss(entityHitResultLocation, Direction.getNearest(cameraViewVector.x, cameraViewVector.y, cameraViewVector.z),                new BlockPos(entityHitResultLocation));
-            if (miss.getType() == HitResult.Type.BLOCK) {
-              //we hit a wall, dont shoot thru walls
-            }
-            else {
-              //Render and Shoot
+            //Render and Shoot
+            if (miss.getType() != HitResult.Type.BLOCK) {
+              //dont shoot thru walls
               RenderMiningLaser.renderLaser(event, player, mc.getFrameTime(), stack, InteractionHand.MAIN_HAND);
               if (world.getGameTime() % 4 == 0) {
                 PacketRegistry.INSTANCE.sendToServer(new PacketEntityLaser(ehr.getEntity().getId(), false));
@@ -229,6 +226,10 @@ else if (!stHere.isAir()) {
             }
           }
         }
+        else {
+          //we missed
+          RenderMiningLaser.renderLaser(event, player, mc.getFrameTime(), stack, InteractionHand.MAIN_HAND);
+        }
       }
     }
   }