From 572352c18e7cbfac1ed4e0fa4adf7e17a7caffa6 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Thu, 17 Apr 2014 19:44:51 -0500 Subject: [PATCH] Networks now run at 1x speed. Illuminated Panels now use proper channel and power settings. --- hooks/TickHandler.java | 3 ++- parts/reporting/PartDarkMonitor.java | 3 +-- parts/reporting/PartMonitor.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hooks/TickHandler.java b/hooks/TickHandler.java index 47f99774..c59c8970 100644 --- a/hooks/TickHandler.java +++ b/hooks/TickHandler.java @@ -14,6 +14,7 @@ import appeng.tile.AEBaseTile; import appeng.util.Platform; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.Type; public class TickHandler @@ -104,7 +105,7 @@ public class TickHandler @SubscribeEvent public void onTick(TickEvent ev) { - if ( ev.type == Type.SERVER ) + if ( ev.type == Type.SERVER && ev.phase == Phase.END ) { HandlerRep repo = getRepo(); while (!repo.tiles.isEmpty()) diff --git a/parts/reporting/PartDarkMonitor.java b/parts/reporting/PartDarkMonitor.java index dfbb7b30..2b1963f8 100644 --- a/parts/reporting/PartDarkMonitor.java +++ b/parts/reporting/PartDarkMonitor.java @@ -13,8 +13,7 @@ public class PartDarkMonitor extends PartMonitor { public PartDarkMonitor(ItemStack is) { - super( PartDarkMonitor.class, is,false ); - + super( PartDarkMonitor.class, is, false ); notLightSource = false; } diff --git a/parts/reporting/PartMonitor.java b/parts/reporting/PartMonitor.java index abbeff5e..be6b850d 100644 --- a/parts/reporting/PartMonitor.java +++ b/parts/reporting/PartMonitor.java @@ -111,12 +111,12 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann } public PartMonitor(ItemStack is) { - super( PartMonitor.class, is ); + this( PartMonitor.class, is, false ); } - protected PartMonitor(Class c, ItemStack is, boolean requireChannel ) { + protected PartMonitor(Class c, ItemStack is, boolean requireChannel) { super( c, is ); - + if ( requireChannel ) proxy.setFlags( GridFlags.REQUIRE_CHANNEL ); else