From 6ed71b4f1676e1a440507756c856552bd4ab5ac1 Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 22 Sep 2015 15:52:31 +0200
Subject: [PATCH] fix #3024

---
 common/buildcraft/transport/BlockGenericPipe.java        | 6 +-----
 common/buildcraft/transport/Pipe.java                    | 5 -----
 common/buildcraft/transport/pipes/PipeFluidsDiamond.java | 2 +-
 common/buildcraft/transport/pipes/PipeItemsDiamond.java  | 2 +-
 common/buildcraft/transport/pipes/PipeItemsLapis.java    | 2 +-
 common/buildcraft/transport/pipes/PipePowerIron.java     | 2 +-
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java
index f37c5833..f9116c3f 100644
--- a/common/buildcraft/transport/BlockGenericPipe.java
+++ b/common/buildcraft/transport/BlockGenericPipe.java
@@ -633,16 +633,12 @@ public class BlockGenericPipe extends BlockBuildCraft implements IColorRemovable
 			} else if (currentItem.getItem() instanceof IToolWrench) {
 				// Only check the instance at this point. Call the IToolWrench
 				// interface callbacks for the individual pipe/logic calls
-				if (pipe.blockActivated(player, ForgeDirection.getOrientation(side))) {
-					return true;
-				}
-
 				RaytraceResult rayTraceResult = doRayTrace(world, x, y, z, player);
 				if (rayTraceResult != null) {
 					ForgeDirection hitSide = rayTraceResult.hitPart == Part.Pipe ? rayTraceResult.sideHit : ForgeDirection.UNKNOWN;
 					return pipe.blockActivated(player, hitSide);
 				} else {
-					return false;
+					return pipe.blockActivated(player, ForgeDirection.UNKNOWN);
 				}
 			} else if (currentItem.getItem() instanceof IMapLocation) {
 				// We want to be able to record pipe locations
diff --git a/common/buildcraft/transport/Pipe.java b/common/buildcraft/transport/Pipe.java
index ecfada5c..948fb2a0 100644
--- a/common/buildcraft/transport/Pipe.java
+++ b/common/buildcraft/transport/Pipe.java
@@ -82,11 +82,6 @@ public abstract class Pipe<T extends PipeTransport> implements IDropControlInven
 		return false;
 	}
 
-	@Deprecated
-	public boolean blockActivated(EntityPlayer entityplayer) {
-		return false;
-	}
-
 	public void onBlockPlaced() {
 		transport.onBlockPlaced();
 	}
diff --git a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java
index 54dd33dd..e4c14743 100644
--- a/common/buildcraft/transport/pipes/PipeFluidsDiamond.java
+++ b/common/buildcraft/transport/pipes/PipeFluidsDiamond.java
@@ -116,7 +116,7 @@ public class PipeFluidsDiamond extends Pipe<PipeTransportFluids> implements IDia
 	}
 
 	@Override
-	public boolean blockActivated(EntityPlayer entityplayer) {
+	public boolean blockActivated(EntityPlayer entityplayer, ForgeDirection direction) {
 		if (entityplayer.getCurrentEquippedItem() != null) {
 			if (Block.getBlockFromItem(entityplayer.getCurrentEquippedItem().getItem()) instanceof BlockGenericPipe) {
 				return false;
diff --git a/common/buildcraft/transport/pipes/PipeItemsDiamond.java b/common/buildcraft/transport/pipes/PipeItemsDiamond.java
index 409d553c..1f9b9f49 100644
--- a/common/buildcraft/transport/pipes/PipeItemsDiamond.java
+++ b/common/buildcraft/transport/pipes/PipeItemsDiamond.java
@@ -106,7 +106,7 @@ public class PipeItemsDiamond extends Pipe<PipeTransportItems> implements IDiamo
 	}
 
 	@Override
-	public boolean blockActivated(EntityPlayer entityplayer) {
+	public boolean blockActivated(EntityPlayer entityplayer, ForgeDirection direction) {
 		if (entityplayer.getCurrentEquippedItem() != null) {
 			if (Block.getBlockFromItem(entityplayer.getCurrentEquippedItem().getItem()) instanceof BlockGenericPipe) {
 				return false;
diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java
index 570be3c8..1806e2f1 100644
--- a/common/buildcraft/transport/pipes/PipeItemsLapis.java
+++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java
@@ -55,7 +55,7 @@ public class PipeItemsLapis extends Pipe<PipeTransportItems> {
 	}
 
 	@Override
-	public boolean blockActivated(EntityPlayer player) {
+	public boolean blockActivated(EntityPlayer player, ForgeDirection direction) {
 		Item equipped = player.getCurrentEquippedItem() != null ? player.getCurrentEquippedItem().getItem() : null;
 		if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(player, container.xCoord, container.yCoord, container.zCoord)) {
 			if (player.isSneaking()) {
diff --git a/common/buildcraft/transport/pipes/PipePowerIron.java b/common/buildcraft/transport/pipes/PipePowerIron.java
index 93987523..ccd5e6fc 100644
--- a/common/buildcraft/transport/pipes/PipePowerIron.java
+++ b/common/buildcraft/transport/pipes/PipePowerIron.java
@@ -49,7 +49,7 @@ public class PipePowerIron extends Pipe<PipeTransportPower> {
 	}
 
 	@Override
-	public boolean blockActivated(EntityPlayer player) {
+	public boolean blockActivated(EntityPlayer player, ForgeDirection direction) {
 		Item equipped = player.getCurrentEquippedItem() != null ? player.getCurrentEquippedItem().getItem() : null;
 		if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(player, container.xCoord, container.yCoord, container.zCoord)) {
 			if (player.isSneaking()) {