diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-09-16 00:17:08 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-09-16 00:17:08 +0100 |
| commit | 6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2 (patch) | |
| tree | 5f0b682f5b1db4995f9324f8e0094989a9942153 /src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | |
| parent | b22bb2dfa6ec7d1e91d8657fcb8bd0389ff7e74a (diff) | |
| download | GT5-Unofficial-6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2.tar.gz GT5-Unofficial-6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2.tar.bz2 GT5-Unofficial-6ac01a92c9b9c54c2c853c6c46bd8e6c8030a4b2.zip | |
Fix conflicts
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 686286d7d8..01ca8c0f7b 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -283,11 +283,12 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE } default: tCode = -1; + break; } } } catch (Throwable e) { - gregtech.api.util.GT_Log.err.println("Encountered Exception while ticking MetaTileEntity in Step " + (tCode - 1) + ". The Game should've crashed now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!"); - e.printStackTrace(gregtech.api.util.GT_Log.err); + //GT_Log.err.println("Encountered Exception while ticking MetaTileEntity in Step " + (tCode - 1) + ". The Game should've crashed now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!"); + e.printStackTrace(GT_Log.err); } if (isServerSide() && hasValidMetaTileEntity()) { @@ -355,7 +356,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE if (aValue > 16 || aValue < 0) aValue = 0; mColor = (byte) aValue; break; - case 3: //int X & Y = 0 or Y; Y -> {1,2,4,8,16,32}; byte type analogy + case 3: mSidedRedstone[0] = (byte) ((aValue & 1) == 1 ? 15 : 0); mSidedRedstone[1] = (byte) ((aValue & 2) == 2 ? 15 : 0); mSidedRedstone[2] = (byte) ((aValue & 4) == 4 ? 15 : 0); |