From e5dcc4d5c00a66789127f9e87b5b01e0cfe78dd5 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 10 Mar 2014 06:23:16 +0800 Subject: [PATCH] Temporarily switched to non-threaded ticker for MC 1.6 --- .../resonantinduction/quantum/gate/PartQuantumGlyph.java | 7 +++++-- src/main/java/resonantinduction/core/grid/TickingGrid.java | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/electrical/src/main/java/resonantinduction/quantum/gate/PartQuantumGlyph.java b/electrical/src/main/java/resonantinduction/quantum/gate/PartQuantumGlyph.java index 9e27da77..c9356d6d 100644 --- a/electrical/src/main/java/resonantinduction/quantum/gate/PartQuantumGlyph.java +++ b/electrical/src/main/java/resonantinduction/quantum/gate/PartQuantumGlyph.java @@ -126,6 +126,7 @@ public class PartQuantumGlyph extends JCuboidPart implements TSlottedPart, JNorm { if (ticks == 0) FrequencyGrid.instance().register((IQuantumGate) tile()); + ticks++; if (world().isRemote) @@ -150,6 +151,7 @@ public class PartQuantumGlyph extends JCuboidPart implements TSlottedPart, JNorm if (!world().isRemote) { transport(player); + return true; } } else @@ -163,11 +165,12 @@ public class PartQuantumGlyph extends JCuboidPart implements TSlottedPart, JNorm System.out.println(getQuantumTank()); player.addChatMessage("Quantum Gate Frequency: " + frequency); } - return false; + + return true; } } - return true; + return false; } @Override diff --git a/src/main/java/resonantinduction/core/grid/TickingGrid.java b/src/main/java/resonantinduction/core/grid/TickingGrid.java index b85c0d53..12ca59cb 100644 --- a/src/main/java/resonantinduction/core/grid/TickingGrid.java +++ b/src/main/java/resonantinduction/core/grid/TickingGrid.java @@ -1,6 +1,7 @@ package resonantinduction.core.grid; import universalelectricity.api.net.IUpdate; +import universalelectricity.core.net.NetworkTickHandler; public class TickingGrid extends NodeGrid implements IUpdate { @@ -8,7 +9,8 @@ public class TickingGrid extends NodeGrid implements IUpdate { super(type); add(node); - UpdateTicker.addNetwork(this); + NetworkTickHandler.addNetwork(this); + // UpdateTicker.addNetwork(this); } /** @@ -18,7 +20,7 @@ public class TickingGrid extends NodeGrid implements IUpdate @Override public void update() { - //synchronized (nodes) + // synchronized (nodes) { for (Node node : nodes) {