Created
October 1, 2011 20:31
-
-
Save Flow86/1256622 to your computer and use it in GitHub Desktop.
fixed problematic getClass.equals - you can't derive from transportclasses to change some specific transport features if you only allow same transport classes made item public to use it in derived classes
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 949426e..cd05778 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/BlockGenericPipe.java | |
@@ -241,8 +246,8 @@ public class BlockGenericPipe extends BlockContainer implements | |
Pipe pipe2 = getPipe(blockAccess, x2, y2, z2); | |
if (pipe2 != null | |
- && !pipe1.transport.getClass().equals( | |
- pipe2.transport.getClass())) { | |
+ && (!pipe1.transport.getClass().isAssignableFrom(pipe2.transport.getClass()) && | |
+ !pipe2.transport.getClass().isAssignableFrom(pipe1.transport.getClass())) ) { | |
return false; | |
} | |
diff --git a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java | |
index 13c966b..bb398ec 100755 | |
--- a/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java | |
+++ b/buildcraft/common/net/minecraft/src/buildcraft/transport/PipeTransportItems.java | |
@@ -38,7 +38,7 @@ public class PipeTransportItems extends PipeTransport { | |
public class EntityData { | |
// TODO: Move passive data here too, like position, speed and all? | |
boolean toCenter = true; | |
- EntityPassiveItem item; | |
+ public EntityPassiveItem item; | |
public Orientations orientation; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment