From c0fb056d5944047dfc449c1aac9449f6b9abaf42 Mon Sep 17 00:00:00 2001 From: LemADEC Date: Wed, 20 Apr 2016 18:30:49 +0200 Subject: [PATCH] Removed laser medium OC support This is a workaround for OC default limit on components per CPU/MB --- .../cr0s/warpdrive/block/TileEntityAbstractInterfaced.java | 3 ++- src/main/java/cr0s/warpdrive/block/TileEntityLaserMedium.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java index c84ef818..62231dff 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityAbstractInterfaced.java @@ -48,6 +48,7 @@ public abstract class TileEntityAbstractInterfaced extends TileEntityAbstractBas protected volatile List CC_scripts = null; // OpenComputer specific properties + protected boolean OC_enable = true; protected Node OC_node = null; protected boolean OC_addedToNetwork = false; @@ -92,7 +93,7 @@ public abstract class TileEntityAbstractInterfaced extends TileEntityAbstractBas super.updateEntity(); if (WarpDriveConfig.isOpenComputersLoaded) { - if (!OC_addedToNetwork) { + if (!OC_addedToNetwork && OC_enable) { OC_addedToNetwork = true; Network.joinOrCreateNetwork(this); } diff --git a/src/main/java/cr0s/warpdrive/block/TileEntityLaserMedium.java b/src/main/java/cr0s/warpdrive/block/TileEntityLaserMedium.java index 1416ecd5..5dbc5c45 100644 --- a/src/main/java/cr0s/warpdrive/block/TileEntityLaserMedium.java +++ b/src/main/java/cr0s/warpdrive/block/TileEntityLaserMedium.java @@ -9,6 +9,7 @@ public class TileEntityLaserMedium extends TileEntityAbstractEnergy { public TileEntityLaserMedium() { peripheralName = "warpdriveLaserMedium"; + OC_enable = false; } @Override