From 2a9541ecb9fcec6b6a1efb2d08678e5711fd5f93 Mon Sep 17 00:00:00 2001 From: Chicken-Bones Date: Tue, 24 Jun 2014 19:31:42 +1000 Subject: [PATCH] Fix duplicate block activated events when holding multipart vanilla blocks (torches) Fix torch placement logic --- src/codechicken/multipart/minecraft/EventHandler.java | 5 +++-- src/codechicken/multipart/minecraft/TorchPart.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/codechicken/multipart/minecraft/EventHandler.java b/src/codechicken/multipart/minecraft/EventHandler.java index 83fddfe..791b42d 100644 --- a/src/codechicken/multipart/minecraft/EventHandler.java +++ b/src/codechicken/multipart/minecraft/EventHandler.java @@ -5,6 +5,7 @@ import codechicken.lib.raytracer.RayTracer; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Vector3; import codechicken.multipart.TileMultipart; +import cpw.mods.fml.common.eventhandler.EventPriority; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +24,7 @@ public class EventHandler { private ThreadLocal placing = new ThreadLocal(); - @SubscribeEvent + @SubscribeEvent(priority = EventPriority.LOW) public void playerInteract(PlayerInteractEvent event) { if(event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer.worldObj.isRemote) @@ -78,7 +79,7 @@ public class EventHandler hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, player.inventory.getCurrentItem(), (float)f.x, (float)f.y, (float)f.z)); - return false; + return true; } } diff --git a/src/codechicken/multipart/minecraft/TorchPart.java b/src/codechicken/multipart/minecraft/TorchPart.java index 0d3df63..425896f 100644 --- a/src/codechicken/multipart/minecraft/TorchPart.java +++ b/src/codechicken/multipart/minecraft/TorchPart.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import codechicken.multipart.IRandomDisplayTick; import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.Cuboid6; +import net.minecraftforge.common.util.ForgeDirection; public class TorchPart extends McSidedMetaPart implements IRandomDisplayTick { @@ -77,7 +78,7 @@ public class TorchPart extends McSidedMetaPart implements IRandomDisplayTick return null; pos = pos.copy().offset(side^1); Block block = world.getBlock(pos.x, pos.y, pos.z); - if(!block.isBlockSolid(world, pos.x, pos.y, pos.z, side) && (side != 1 || block.canPlaceTorchOnTop(world, pos.x, pos.y, pos.z))) + if(!block.isSideSolid(world, pos.x, pos.y, pos.z, ForgeDirection.getOrientation(side)) && (side != 1 || block.canPlaceTorchOnTop(world, pos.x, pos.y, pos.z))) return null; return new TorchPart(sideMetaMap[side^1]);