diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-09-10 17:23:29 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-09-10 17:23:29 +0200 |
| commit | d093ec9083a981a9db2ea194fd40494bdda00ba8 (patch) | |
| tree | fe0458e7f7b73929e62ddcf708ecd6ba7656cc4e | |
| parent | fa2c6cf1a63711098dedb786931b0cdeda668478 (diff) | |
| parent | 556b4dc6240fd4a9b8c65a13d686fb82275a695e (diff) | |
| download | GT5-Unofficial-d093ec9083a981a9db2ea194fd40494bdda00ba8.tar.gz GT5-Unofficial-d093ec9083a981a9db2ea194fd40494bdda00ba8.tar.bz2 GT5-Unofficial-d093ec9083a981a9db2ea194fd40494bdda00ba8.zip | |
Merge branch 'experimental' into GT_Bees_dev
| -rw-r--r-- | build.properties | 2 | ||||
| -rw-r--r-- | libs/Galacticraft-API-1.7-3.0.12.504.jar | bin | 119588 -> 0 bytes | |||
| -rw-r--r-- | libs/GalacticraftCore-Dev-1.7-3.0.12.504.jar | bin | 10419213 -> 0 bytes | |||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/build.properties b/build.properties index 808f85ccd8..134f542bbc 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ minecraft.version=1.7.10 forge.version=10.13.4.1614-1.7.10 -gt.version=5.09.32.35 +gt.version=5.09.32.36 ae2.version=rv2-beta-33 applecore.version=1.7.10-1.2.1+107.59407 diff --git a/libs/Galacticraft-API-1.7-3.0.12.504.jar b/libs/Galacticraft-API-1.7-3.0.12.504.jar Binary files differdeleted file mode 100644 index 6935478027..0000000000 --- a/libs/Galacticraft-API-1.7-3.0.12.504.jar +++ /dev/null diff --git a/libs/GalacticraftCore-Dev-1.7-3.0.12.504.jar b/libs/GalacticraftCore-Dev-1.7-3.0.12.504.jar Binary files differdeleted file mode 100644 index 329f7ae19b..0000000000 --- a/libs/GalacticraftCore-Dev-1.7-3.0.12.504.jar +++ /dev/null diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index fe0a996117..421b0e3e30 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -763,7 +763,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { final byte tSide = GT_Utility.getOppositeSide(aSide);
final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
- if (baseMetaTile == null) return 0;
+ if (baseMetaTile == null || !baseMetaTile.isServerSide()) return 0;
final GT_CoverBehavior coverBehavior = baseMetaTile.getCoverBehaviorAtSide(aSide);
final int coverId = baseMetaTile.getCoverIDAtSide(aSide),
|