From 6263b15c7cf51ee1871823c511c5b0710ca8851b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 20 Feb 2015 01:04:30 +0100 Subject: [PATCH] Fixed workaround. --- src/main/scala/li/cil/oc/common/EventHandler.scala | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala index fb206a832..bad067260 100644 --- a/src/main/scala/li/cil/oc/common/EventHandler.scala +++ b/src/main/scala/li/cil/oc/common/EventHandler.scala @@ -6,6 +6,7 @@ import cpw.mods.fml.common.Optional import cpw.mods.fml.common.eventhandler.SubscribeEvent import cpw.mods.fml.common.gameevent.PlayerEvent._ import cpw.mods.fml.common.gameevent.TickEvent +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent import li.cil.oc._ @@ -97,7 +98,7 @@ object EventHandler { } @SubscribeEvent - def onTick(e: ServerTickEvent) = if (e.phase == TickEvent.Phase.START) { + def onServerTick(e: ServerTickEvent) = if (e.phase == TickEvent.Phase.START) { pending.synchronized { val adds = pending.toArray pending.clear() @@ -107,6 +108,10 @@ object EventHandler { case t: Throwable => OpenComputers.log.warn("Error in scheduled tick action.", t) } }) + } + + @SubscribeEvent + def onClientTick(e: ClientTickEvent) = if (e.phase == TickEvent.Phase.START) { totalWorldTicks += 1 }