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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into robot_components

Browse Source
This commit is contained in:
Johannes Lohrer 2013-12-19 18:17:33 +01:00
commit d35ad805bb
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/opencomputers/lib/native.32.dylib Normal file
View File

Binary file not shown.

BIN
assets/opencomputers/lib/native.32.so
View File

Binary file not shown.

BIN
assets/opencomputers/lib/native.64.dylib Normal file
View File

Binary file not shown.

BIN
assets/opencomputers/lib/native.64.so
View File

Binary file not shown.

2
li/cil/oc/common/tileentity/Environment.scala
View File

@ -22,7 +22,7 @@ abstract class Environment extends net.minecraft.tileentity.TileEntity with Tile
def block = getBlockType def block = getBlockType
private var addedToNetwork = false protected var addedToNetwork = false
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //

4
li/cil/oc/common/tileentity/Robot.scala
View File

@ -237,7 +237,8 @@ class Robot(isRemote: Boolean) extends Computer(isRemote) with ISidedInventory w
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
override def updateEntity() { override def updateEntity() {
if (node != null && node.network == null) { if (!addedToNetwork) {
addedToNetwork = true
api.Network.joinNewNetwork(node) api.Network.joinNewNetwork(node)
} }
if (animationTicksLeft > 0) { if (animationTicksLeft > 0) {
@ -270,6 +271,7 @@ class Robot(isRemote: Boolean) extends Computer(isRemote) with ISidedInventory w
case Some(item) => player_.getAttributeMap.applyAttributeModifiers(item.getAttributeModifiers) case Some(item) => player_.getAttributeMap.applyAttributeModifiers(item.getAttributeModifiers)
case _ => case _ =>
} }
updateXpInfo()
} }
} }

12
li/cil/oc/server/network/Network.scala
View File

@ -100,7 +100,7 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
data.remove(node.address) match { data.remove(node.address) match {
case Some(entry) => case Some(entry) =>
node match { node match {
case connector: Connector if connector.localBufferSize > 0 => removeConnector(connector) case connector: Connector => removeConnector(connector)
case _ => case _ =>
} }
node.network = null node.network = null
@ -287,10 +287,12 @@ private class Network private(private val data: mutable.Map[String, Network.Vert
} }
def removeConnector(connector: Connector) { def removeConnector(connector: Connector) {
assert(connectors.contains(connector)) if (connector.localBufferSize > 0) {
connectors -= connector assert(connectors.contains(connector))
globalBuffer -= connector.localBuffer connectors -= connector
globalBufferSize -= connector.localBufferSize globalBuffer -= connector.localBuffer
globalBufferSize -= connector.localBufferSize
}
} }
def changeBuffer(delta: Double): Double = { def changeBuffer(delta: Double): Double = {