aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2017-12-25 00:02:27 +0100
committerGitHub <noreply@github.com>2017-12-25 00:02:27 +0100
commita8dcbf0245052454e6182fcccc0c0a2a5b51223a (patch)
treed009d7eea01a993be89ce6187e77eace2ca9b18f /src/main/java/gregtech/api/metatileentity/implementations
parent5a653ca960874a14c28d90f48b10b65876c45bb1 (diff)
parent1f54500dc1f4f258727315cd0b6fac7b6bb0fa56 (diff)
downloadGT5-Unofficial-a8dcbf0245052454e6182fcccc0c0a2a5b51223a.tar.gz
GT5-Unofficial-a8dcbf0245052454e6182fcccc0c0a2a5b51223a.tar.bz2
GT5-Unofficial-a8dcbf0245052454e6182fcccc0c0a2a5b51223a.zip
Merge pull request #64 from mitchej123/gt6_cables_quality_of_life_enhancements
GT6 cable quality of life improvements
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index 1b720c9503..a5bfa18016 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -318,14 +318,13 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
private boolean onConnectionToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (GT_Mod.gregtechproxy.gt6Cable) {
- byte tSide = GT_Utility.determineWrenchingSide(aSide, aX, aY, aZ);
- if (!isConnectedAtSide(tSide)) {
+ if (!isConnectedAtSide(aWrenchingSide)) {
if (GT_Mod.gregtechproxy.costlyCableConnection && !GT_ModHandler.consumeSolderingMaterial(aPlayer)) return false;
- if (connect(tSide) > 0)
+ if (connect(aWrenchingSide) > 0)
GT_Utility.sendChatToPlayer(aPlayer, trans("214", "Connected"));
}
else {
- disconnect(tSide);
+ disconnect(aWrenchingSide);
GT_Utility.sendChatToPlayer(aPlayer, trans("215", "Disconnected"));
}
return true;