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

Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Browse Source 
Conflicts:
	build.properties
This commit is contained in:
Florian Nücke 2014-05-16 14:18:17 +02:00
commit 53ebd463d7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -1,6 +1,6 @@
minecraft.version=1.7.2
forge.version=10.12.1.1061
oc.version=1.2.9
oc.version=1.2.10
ccl.version=1.0.0.62
fmp.version=1.0.0.250
maven.url=file:///var/www/users/fnuecke/maven.cil.li

4
src/main/scala/li/cil/oc/server/component/machine/Machine.scala
View File

@ -193,6 +193,10 @@ class Machine(val owner: Owner, val rom: Option[ManagedEnvironment], constructor
case Machine.State.Stopped | Machine.State.Stopping => false
case _ => signals.synchronized {
if (signals.size >= 256) false
else if (args == null) {
signals.enqueue(new Machine.Signal(name, Array.empty))
true
}
else {
signals.enqueue(new Machine.Signal(name, args.map {
case null | Unit | None => null