From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 6 Nov 2011 12:11:14 +0000 (+0200)
Subject: In order for the new grabbing to work, a sandbox object's owner must be set as an... 
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49c00884eac6fe9626b8875038d0095d10692d1f;p=xonotic%2Fxonotic-data.pk3dir.git

In order for the new grabbing to work, a sandbox object's owner must be set as an entity too. Therefore, scan for players each frame... and if the player with the correct UID is present on the server, it is set as the owner. Otherwise, the owner is world
---

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 2c4b27034..2f33f841c 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -31,11 +31,27 @@ void sandbox_ObjectFunction_Touch()
 
 void sandbox_ObjectFunction_Think()
 {
+	entity e;
+
+	// decide if and how this object can be grabbed
 	if(autocvar_g_sandbox_editor_free < 2 && self.crypto_idfp)
 		self.grab = 1;
 	else
 		self.grab = 3;
 
+	// Object owner is stored via player UID, but we also need the owner as an entity (if the player is available on the server).
+	// Therefore, scan for all players, and update the owner as long as the player is present. We must always do this,
+	// since if the owning player disconnects, the object's owner should also be reset.
+	FOR_EACH_REALPLAYER(e) // bots can't have objects
+	{
+		if(self.crypto_idfp == e.crypto_idfp)
+		{
+			self.realowner = e;
+			break;
+		}
+		self.realowner = world;
+	}
+
 	self.nextthink = time;
 }
 
@@ -54,7 +70,7 @@ entity sandbox_ObjectEdit_Get(float permissions)
 		return trace_ent; // don't check permissions, anyone can edit this object
 	if(!trace_ent.crypto_idfp)
 		return trace_ent; // the player who spawned this object did not have an UID, so anyone can edit it
-	if not(trace_ent.crypto_idfp != self.crypto_idfp && autocvar_g_sandbox_editor_free < 2)
+	if not(trace_ent.realowner != self && autocvar_g_sandbox_editor_free < 2)
 		return trace_ent; // object does not belong to the player, and players can only edit their own objects on this server
 	return world;
 }