From: Mario <mario.mario@y7mail.com>
Date: Tue, 9 Apr 2013 00:39:58 +0000 (+1000)
Subject: Merge branch 'master' into Mario/mutator_minstagib
X-Git-Tag: xonotic-v0.7.0~55^2~3^2~18
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=5b6514ad570d0210590f6fb10b6abd26df38cbd8

Merge branch 'master' into Mario/mutator_minstagib
---

5b6514ad570d0210590f6fb10b6abd26df38cbd8
diff --cc qcsrc/server/cl_client.qc
index a2ee7ece34,4c7d5c5756..671771bcb3
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -401,9 -401,10 +401,8 @@@ void PutObserverInServer (void
  		WriteEntity(MSG_ONE, self);
  	}
  
- 	DropAllRunes(self);
  	MUTATOR_CALLHOOK(MakePlayerObserver);
  
 -	minstagib_stop_countdown(self);
 -
  	Portal_ClearAll(self);
  	
  	if(self.alivetime)