Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

This commit is contained in:
Florian Nücke 2014-07-17 17:08:56 +02:00
commit 1879706f3e

View File

@ -261,7 +261,7 @@ class Hologram(val isClient: Boolean, var tier: Int) extends traits.Environment
override def updateEntity() {
super.updateEntity()
if (isServer) {
if (isServer && node != null) {
if (dirty) {
cooldown -= 1
if (cooldown <= 0) this.synchronized {