diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2017-12-24 14:49:43 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2017-12-24 14:52:38 -0800 |
| commit | 1f54500dc1f4f258727315cd0b6fac7b6bb0fa56 (patch) | |
| tree | 26ed0590ced9cae7cb5bb5f2ed4153279bb065e0 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | 51dd74eb21b4c1bfe9659eb43f545281e52b8216 (diff) | |
| download | GT5-Unofficial-1f54500dc1f4f258727315cd0b6fac7b6bb0fa56.tar.gz GT5-Unofficial-1f54500dc1f4f258727315cd0b6fac7b6bb0fa56.tar.bz2 GT5-Unofficial-1f54500dc1f4f258727315cd0b6fac7b6bb0fa56.zip | |
Allow use of wire cutter/soldering item on the tile entity, as well as the wire, for a connect/disconnect
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java | 7 |
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;
|