Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #152

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-07-02 22:56:45 -04:00
parent b0accc1bfc
commit 9d089a20a6
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt
View file

@ -10,6 +10,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota
import at.petrak.hexcasting.api.spell.iota.NullIota import at.petrak.hexcasting.api.spell.iota.NullIota
import net.minecraft.world.level.ClipContext import net.minecraft.world.level.ClipContext
import net.minecraft.world.phys.HitResult import net.minecraft.world.phys.HitResult
import net.minecraft.world.phys.Vec3
object OpBlockAxisRaycast : ConstManaAction { object OpBlockAxisRaycast : ConstManaAction {
override val argc = 2 override val argc = 2
@ -28,7 +29,7 @@ object OpBlockAxisRaycast : ConstManaAction {
) )
) )
return if (blockHitResult.type == HitResult.Type.BLOCK) { return if (blockHitResult.type == HitResult.Type.BLOCK && ctx.isVecInRange(Vec3.atCenterOf(blockHitResult.blockPos))) {
blockHitResult.direction.step().asActionResult blockHitResult.direction.step().asActionResult
} else { } else {
listOf(NullIota()) listOf(NullIota())

3
Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockRaycast.kt
View file

@ -10,6 +10,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota
import at.petrak.hexcasting.api.spell.iota.NullIota import at.petrak.hexcasting.api.spell.iota.NullIota
import net.minecraft.world.level.ClipContext import net.minecraft.world.level.ClipContext
import net.minecraft.world.phys.HitResult import net.minecraft.world.phys.HitResult
import net.minecraft.world.phys.Vec3
object OpBlockRaycast : ConstManaAction { object OpBlockRaycast : ConstManaAction {
override val argc = 2 override val argc = 2
@ -28,7 +29,7 @@ object OpBlockRaycast : ConstManaAction {
) )
) )
return if (blockHitResult.type == HitResult.Type.BLOCK) { return if (blockHitResult.type == HitResult.Type.BLOCK && ctx.isVecInRange(Vec3.atCenterOf(blockHitResult.blockPos))) {
// the position on the bhr is the position of the specific *hit point*, which is actually on the outside of the block // the position on the bhr is the position of the specific *hit point*, which is actually on the outside of the block
// this is weird (for example, casting OpBreakBlock at this position will not break the block we're looking at) // this is weird (for example, casting OpBreakBlock at this position will not break the block we're looking at)
// so we return the block pos instead // so we return the block pos instead