mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-13 01:10:19 -04:00
Removed broken workaround for not progressing robot hover animation when game is paused. Closes #1101.
Because the bug in Mystcraft the workaround was required for in the first place has been fixed. \o/
This commit is contained in:
parent
d52ed578b7
commit
043548e78e
@ -282,7 +282,7 @@ object RobotRenderer extends TileEntitySpecialRenderer {
|
||||
|
||||
val proxy = entity.asInstanceOf[tileentity.RobotProxy]
|
||||
val robot = proxy.robot
|
||||
val worldTime = EventHandler.totalWorldTicks + f
|
||||
val worldTime = entity.getWorldObj.getTotalWorldTime + f
|
||||
|
||||
GL11.glPushMatrix()
|
||||
GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5)
|
||||
|
@ -6,7 +6,6 @@ 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._
|
||||
@ -53,8 +52,6 @@ import scala.concurrent.Future
|
||||
object EventHandler {
|
||||
private val pending = mutable.Buffer.empty[() => Unit]
|
||||
|
||||
var totalWorldTicks = 0L
|
||||
|
||||
private val runningRobots = mutable.Set.empty[Robot]
|
||||
|
||||
private val keyboards = java.util.Collections.newSetFromMap[Keyboard](new java.util.WeakHashMap[Keyboard, java.lang.Boolean])
|
||||
@ -159,11 +156,6 @@ object EventHandler {
|
||||
machines --= closed
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
def onClientTick(e: ClientTickEvent) = if (e.phase == TickEvent.Phase.START) {
|
||||
totalWorldTicks += 1
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
def playerLoggedIn(e: PlayerLoggedInEvent) {
|
||||
if (SideTracker.isServer) e.player match {
|
||||
|
Loading…
x
Reference in New Issue
Block a user