AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 09:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
This commit is contained in:
Florian Nücke 2015-02-20 01:05:45 +01:00
commit b323022e43
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/li/cil/oc/common/EventHandler.scala
View File

@ -24,6 +24,7 @@ import net.minecraftforge.event.world.WorldEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.PlayerEvent._ import net.minecraftforge.fml.common.gameevent.PlayerEvent._
import net.minecraftforge.fml.common.gameevent.TickEvent import net.minecraftforge.fml.common.gameevent.TickEvent
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent
import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent
@ -64,7 +65,7 @@ object EventHandler {
} }
@SubscribeEvent @SubscribeEvent
def onTick(e: ServerTickEvent) = if (e.phase == TickEvent.Phase.START) { def onServerTick(e: ServerTickEvent) = if (e.phase == TickEvent.Phase.START) {
pending.synchronized { pending.synchronized {
val adds = pending.toArray val adds = pending.toArray
pending.clear() pending.clear()
@ -76,6 +77,10 @@ object EventHandler {
}) })
runningRobots.foreach(_.machine.update()) runningRobots.foreach(_.machine.update())
}
@SubscribeEvent
def onClientTick(e: ClientTickEvent) = if (e.phase == TickEvent.Phase.START) {
totalWorldTicks += 1 totalWorldTicks += 1
} }