fix: patch out line of sight checks

Fixes #1072
klikli-dev · Mar 14, 2024 · ec4952f · ec4952f
1 parent 8729a3b
commit ec4952f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java
@@ -161,17 +161,17 @@ public void tick() {
 
     public boolean canSeeTarget() {
 
-        ClipContext context = new ClipContext(this.entity.position(),
-                Math3DUtil.center(this.targetBlock), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE,
-                this.entity);
-        BlockHitResult result = this.entity.level().clip(context);
-
-        if (result.getType() != BlockHitResult.Type.MISS) {
-            BlockPos sidePos = result.getBlockPos();
-            BlockPos pos = BlockPos.containing(result.getLocation());
-            return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) ||
-                    this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.targetBlock);
-        }
+//        ClipContext context = new ClipContext(this.entity.position(),
+//                Math3DUtil.center(this.targetBlock), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE,
+//                this.entity);
+//        BlockHitResult result = this.entity.level().clip(context);
+//
+//        if (result.getType() != BlockHitResult.Type.MISS) {
+//            BlockPos sidePos = result.getBlockPos();
+//            BlockPos pos = BlockPos.containing(result.getLocation());
+//            return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) ||
+//                    this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.targetBlock);
+//        }
 
         return true;
     }

diff --git a/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java
@@ -200,18 +200,18 @@ public void tick() {
     }
 
     public boolean canSeeTarget() {
-        BlockState targetBlockState = this.entity.level().getBlockState(this.targetBlock);
-        ClipContext context = new ClipContext(this.entity.getEyePosition(0),
-                Math3DUtil.center(this.targetBlock), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE,
-                this.entity);
-        BlockHitResult rayTrace = this.entity.level().clip(context);
-
-        if (rayTrace.getType() != BlockHitResult.Type.MISS) {
-            BlockPos sidePos = rayTrace.getBlockPos();
-            BlockPos pos = BlockPos.containing(rayTrace.getLocation());
-            return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) ||
-                    this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.targetBlock);
-        }
+//        BlockState targetBlockState = this.entity.level().getBlockState(this.targetBlock);
+//        ClipContext context = new ClipContext(this.entity.getEyePosition(0),
+//                Math3DUtil.center(this.targetBlock), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE,
+//                this.entity);
+//        BlockHitResult rayTrace = this.entity.level().clip(context);
+//
+//        if (rayTrace.getType() != BlockHitResult.Type.MISS) {
+//            BlockPos sidePos = rayTrace.getBlockPos();
+//            BlockPos pos = BlockPos.containing(rayTrace.getLocation());
+//            return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) ||
+//                    this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.targetBlock);
+//        }
 
         return true;
     }