From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 17 Feb 2012 13:56:26 +0000 (+0100)
Subject: sorry, clones should NOT set self.owner. Use self.enemy instead.
X-Git-Tag: xonotic-v0.6.0~70^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=602d2af83e18a5a689180d34aba7c64369484c91;p=xonotic%2Fxonotic-data.pk3dir.git

sorry, clones should NOT set self.owner. Use self.enemy instead.
---

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 49b52555f..326d13615 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -198,8 +198,6 @@ void CopyBody(float keepvelocity)
 
 	Drag_MoveDrag(oldself, self);
 
-	self.owner = oldself;
-
 	if(self.colormap <= maxclients && self.colormap > 0)
 		self.colormap = 1024 + oldself.clientcolors;
 
diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index cae5e3520..34d384c28 100644
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -29,7 +29,7 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
 	// if this is a copied dead body, send the num of its player instead
 	// TODO: remove this field, read from model txt files
 	if(self.classname == "body")
-		e.team = num_for_edict(self.owner);
+		e.team = num_for_edict(self.enemy);
 	else
 		e.team = num_for_edict(self);