AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 19:56:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

adding angle upgrade support to drones

Browse Source 
closes #985
only for 1.12
This commit is contained in:
payonel 2019-08-23 15:07:23 -07:00
parent c892929325
commit 3f2757ad93
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/li/cil/oc/server/component/Agent.scala
View File

@ -14,6 +14,8 @@ import li.cil.oc.util.BlockPosition
import li.cil.oc.util.ExtendedArguments._ import li.cil.oc.util.ExtendedArguments._
import li.cil.oc.util.ExtendedWorld._ import li.cil.oc.util.ExtendedWorld._
import li.cil.oc.util.InventoryUtils import li.cil.oc.util.InventoryUtils
import net.minecraft.block.Block
import net.minecraft.block.state.IBlockState
import net.minecraft.entity.Entity import net.minecraft.entity.Entity
import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.EntityLivingBase
import net.minecraft.entity.item.EntityMinecart import net.minecraft.entity.item.EntityMinecart
@ -279,8 +281,16 @@ trait Agent extends traits.WorldControl with traits.InventoryControl with traits
// but for a drone, the block at its position is air, which is replaceable, and thus // but for a drone, the block at its position is air, which is replaceable, and thus
// ItemBlock does not offset the position. We can do it here to correct that, and the code // ItemBlock does not offset the position. We can do it here to correct that, and the code
// here is still correct for the robot's use case // here is still correct for the robot's use case
val adjustedPos = blockPos.offset(facing) val adjustedPos: BlockPos = blockPos.offset(facing)
// adjustedPos is the position we want to place the block
// but onItemUse will try to adjust the placement if the target position is not replaceable
// we don't want that
val block: Block = world.getBlockState(adjustedPos).getBlock
if (block.isReplaceable(world, adjustedPos)) {
player.placeBlock(agent.selectedSlot, adjustedPos, facing, hx, hy, hz) player.placeBlock(agent.selectedSlot, adjustedPos, facing, hx, hy, hz)
} else {
false
}
case _ => false case _ => false
} }
player.setSneaking(false) player.setSneaking(false)