From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 11 Jul 2012 19:24:05 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/physical_entities
X-Git-Tag: xonotic-v0.7.0~111^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97ee6130a24f5452a61eec2310bd14f8390ceb4f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/physical_entities

Conflicts:
	qcsrc/server/t_items.qc
---

97ee6130a24f5452a61eec2310bd14f8390ceb4f
diff --cc qcsrc/server/t_items.qc
index a08333e76,2e7b9bfba..500d8f60c
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@@ -917,14 -1163,8 +1163,16 @@@ void StartItem (string itemmodel, strin
  	}
  	else
  		Item_Reset();
+         
+     Net_LinkEntity(self, FALSE, 0, ItemSend);
 +
 +	// call this hook after everything else has been done
 +	if(MUTATOR_CALLHOOK(Item_Spawn))
 +	{
 +		startitem_failed = TRUE;
 +		remove(self);
 +		return;
 +	}
  }
  
  /* replace items in minstagib