Created
October 13, 2011 06:28
-
-
Save Flow86/1283561 to your computer and use it in GitHub Desktop.
regression fix
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
| index df63dbc..0da206b 100755 | |
| --- a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
| +++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
| @@ -240,11 +245,11 @@ public class BlockGenericPipe extends BlockContainer implements | |
| Pipe pipe1 = getPipe(blockAccess, x1, y1, z1); | |
| Pipe pipe2 = getPipe(blockAccess, x2, y2, z2); | |
| - if (!isValid(pipe1) || !isValid(pipe2)) { | |
| + if (!isValid(pipe1)) { | |
| return false; | |
| } | |
| - if (!pipe1.transport.getClass().isAssignableFrom( | |
| + if (isValid(pipe2) && !pipe1.transport.getClass().isAssignableFrom( | |
| pipe2.transport.getClass()) | |
| && !pipe2.transport.getClass().isAssignableFrom( | |
| pipe1.transport.getClass())) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment