X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fsandbox.qc;h=66377d1d84aade6398814d045f04926cefdc7d17;hb=8f4d064a1d62a040e788fc0634baf93e888ba2f6;hp=96b29acabb5b28832889d240274cb8db9de99371;hpb=e36144ff1af0ae9b2872ad04e140cbab315a0339;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/sandbox.qc b/qcsrc/server/mutators/sandbox.qc
index 96b29acab..66377d1d8 100644
--- a/qcsrc/server/mutators/sandbox.qc
+++ b/qcsrc/server/mutators/sandbox.qc
@@ -1,5 +1,6 @@
+const float MAX_STORAGE_ATTACHMENTS = 16;
 float object_count;
-.string object_clipboard;
+.float object_flood;
 .entity object_attach;
 .string material;
 
@@ -29,19 +30,51 @@ void sandbox_ObjectFunction_Touch()
 	pointparticles(particleeffectnum(strcat("impact_", self.material)), self.origin, '0 0 0', ceil(intensity * 10)); // allow a count from 1 to 10
 }
 
-entity sandbox_ObjectEdit_Get()
+void sandbox_ObjectFunction_Think()
 {
-	// returns the traced entity if the player can edit it, and world if not
-	// attached objects are SOLID_NOT and don't risk getting traced
+	entity e;
+
+	// decide if and how this object can be grabbed
+	if(autocvar_g_sandbox_readonly)
+		self.grab = 0; // no grabbing
+	else if(autocvar_g_sandbox_editor_free < 2 && self.crypto_idfp)
+		self.grab = 1; // owner only
+	else
+		self.grab = 3; // anyone
+
+	// 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;
+}
 
-	makevectors(self.v_angle);
-	WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_edit, MOVE_NORMAL, self);
+.float old_solid, old_movetype;
+entity sandbox_ObjectEdit_Get(float permissions)
+{
+	// Returns the traced entity if the player can edit it, and world if not.
+	// If permissions if FALSE, the object is returned regardless of editing rights.
+	// Attached objects are SOLID_NOT and do not get traced.
 
+	crosshair_trace_plusvisibletriggers(self);
+	if(vlen(self.origin - trace_ent.origin) > autocvar_g_sandbox_editor_distance_edit)
+		return world; // out of trace range
 	if(trace_ent.classname != "object")
 		return world; // entity is not an object
+	if(!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
-	else if not(trace_ent.crypto_idfp != self.crypto_idfp && !autocvar_g_sandbox_editor_free)
+	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;
 }
@@ -52,17 +85,21 @@ void sandbox_ObjectEdit_Scale(entity e, float f)
 	if(e.scale)
 	{
 		e.scale = bound(autocvar_g_sandbox_object_scale_min, e.scale, autocvar_g_sandbox_object_scale_max);
+		setmodel(e, e.model); // reset mins and maxs based on mesh
 		setsize(e, e.mins * e.scale, e.maxs * e.scale); // adapt bounding box size to model size
 	}
 }
 
-.float old_movetype;
+void sandbox_ObjectAttach_Remove(entity e);
 void sandbox_ObjectAttach_Set(entity e, entity parent, string s)
 {
 	// attaches e to parent on string s
 
-	e.old_movetype = e.movetype; // persist this
+	// we can't attach to an attachment, for obvious reasons
+	sandbox_ObjectAttach_Remove(e);
 
+	e.old_solid = e.solid; // persist solidity
+	e.old_movetype = e.movetype; // persist physics
 	e.movetype = MOVETYPE_FOLLOW;
 	e.solid = SOLID_NOT;
 	e.takedamage = DAMAGE_NO;
@@ -80,16 +117,18 @@ void sandbox_ObjectAttach_Remove(entity e)
 	{
 		if(head.owner == e)
 		{
-			head.movetype = head.old_movetype; // revert to previous physics
-			head.solid = SOLID_BBOX;
-			head.takedamage = DAMAGE_AIM;
-
+			vector org;
+			org = gettaginfo(head, 0);
 			setattachment(head, world, "");
 			head.owner = world;
 
-			// objects reset origin and angles when detached, so apply the parent's to prevent teleporting
-			setorigin(head, e.origin);
-			head.angles = e.angles;
+			// objects change origin and angles when detached, so apply previous position
+			setorigin(head, org);
+			head.angles = e.angles; // don't allow detached objects to spin or roll
+
+			head.solid = head.old_solid; // restore persisted solidity
+			head.movetype = head.old_movetype; // restore persisted physics
+			head.takedamage = DAMAGE_AIM;
 		}
 	}
 }
@@ -109,6 +148,9 @@ entity sandbox_ObjectSpawn(float database)
 	e.skin = 0;
 	e.material = string_null;
 	e.touch = sandbox_ObjectFunction_Touch;
+	e.think = sandbox_ObjectFunction_Think;
+	e.nextthink = time;
+	//e.effects |= EF_SELECTABLE; // don't do this all the time, maybe just when editing objects?
 
 	if(!database)
 	{
@@ -119,6 +161,11 @@ entity sandbox_ObjectSpawn(float database)
 		else
 			print_to(self, "^1SANDBOX - WARNING: ^7You spawned an object, but lack a player UID. ^1Your objects are not secured and can be edited by any player!");
 
+		// set public object information
+		e.netname = strzone(self.netname); // name of the owner
+		e.message = strzone(strftime(TRUE, "%d-%m-%Y %H:%M:%S")); // creation time
+		e.message2 = strzone(strftime(TRUE, "%d-%m-%Y %H:%M:%S")); // last editing time
+
 		// set origin and direction based on player position and view angle
 		makevectors(self.v_angle);
 		WarpZone_TraceLine(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * autocvar_g_sandbox_editor_distance_spawn, MOVE_NORMAL, self);
@@ -133,68 +180,170 @@ entity sandbox_ObjectSpawn(float database)
 void sandbox_ObjectRemove(entity e)
 {
 	sandbox_ObjectAttach_Remove(e); // detach child objects
-	if(e.material)
-	{
-		strunzone(e.material);
-		e.material = string_null;
-	}
-	if(e.crypto_idfp)
+
+	// if the object being removed has been selected for attachment by a player, unset it
+	entity head;
+	FOR_EACH_REALPLAYER(head) // bots can't have objects
 	{
-		strunzone(e.crypto_idfp);
-		e.crypto_idfp = string_null;
+		if(head.object_attach == e)
+			head.object_attach = world;
 	}
+
+	if(e.material)	{	strunzone(e.material);	e.material = string_null;	}
+	if(e.crypto_idfp)	{	strunzone(e.crypto_idfp);	e.crypto_idfp = string_null;	}
+	if(e.netname)	{	strunzone(e.netname);	e.netname = string_null;	}
+	if(e.message)	{	strunzone(e.message);	e.message = string_null;	}
+	if(e.message2)	{	strunzone(e.message2);	e.message2 = string_null;	}
 	remove(e);
 	e = world;
 
 	object_count -= 1;
 }
 
+string port_string[MAX_STORAGE_ATTACHMENTS]; // fteqcc crashes if this isn't defined as a global
+
 string sandbox_ObjectPort_Save(entity e, float database)
 {
-	// save object properties
+	// save object properties, and return them as a string
+	float i;
 	string s;
+	entity head;
 
-	s = strcat(e.model, " ");
-	s = strcat(s, ftos(e.skin), " ");
-	s = strcat(s, ftos(e.alpha), " ");
-	s = strcat(s, sprintf("\"%.9v\"", e.colormod), " ");
-	s = strcat(s, sprintf("\"%.9v\"", e.glowmod), " ");
-	s = strcat(s, ftos(e.frame), " ");
-	s = strcat(s, ftos(e.scale), " ");
-	s = strcat(s, ftos(e.movetype), " ");
-	s = strcat(s, ftos(e.damageforcescale), " ");
-	if(e.material)	s = strcat(s, e.material, " ");	else	s = strcat(s, "- "); // none
-	if(database)
+	for(head = world; (head = find(head, classname, "object")); )
 	{
-		if(e.crypto_idfp)	s = strcat(s, e.crypto_idfp, " ");	else	s = strcat(s, "- "); // none
-		s = strcat(s, sprintf("\"%.9v\"", e.origin), " ");
-		s = strcat(s, sprintf("\"%.9v\"", e.angles), " ");
+		// the main object needs to be first in the array [0] with attached objects following
+		float slot, physics, solidity;
+		if(head == e) // this is the main object, place it first
+		{
+			slot = 0;
+			solidity = head.solid; // applied solidity is normal solidity for children
+			physics = head.movetype; // applied physics are normal physics for parents
+		}
+		else if(head.owner == e) // child object, list them in order
+		{
+			i += 1; // children start from 1
+			slot = i;
+			solidity = head.old_solid; // persisted solidity is normal solidity for children
+			physics = head.old_movetype; // persisted physics are normal physics for children
+			gettaginfo(head.owner, head.tag_index); // get the name of the tag our object is attached to, used further below
+		}
+		else
+			continue;
+
+		// ---------------- OBJECT PROPERTY STORAGE: SAVE ----------------
+		if(slot)
+		{
+			// properties stored only for child objects
+			if(gettaginfo_name)	port_string[slot] = strcat(port_string[slot], "\"", gettaginfo_name, "\" ");	else	port_string[slot] = strcat(port_string[slot], "\"\" "); // none
+		}
+		else
+		{
+			// properties stored only for parent objects
+			if(database)
+			{
+				port_string[slot] = strcat(port_string[slot], sprintf("\"%.9v\"", head.origin), " ");
+				port_string[slot] = strcat(port_string[slot], sprintf("\"%.9v\"", head.angles), " ");
+			}
+		}
+		// properties stored for all objects
+		port_string[slot] = strcat(port_string[slot], "\"", head.model, "\" ");
+		port_string[slot] = strcat(port_string[slot], ftos(head.skin), " ");
+		port_string[slot] = strcat(port_string[slot], ftos(head.alpha), " ");
+		port_string[slot] = strcat(port_string[slot], sprintf("\"%.9v\"", head.colormod), " ");
+		port_string[slot] = strcat(port_string[slot], sprintf("\"%.9v\"", head.glowmod), " ");
+		port_string[slot] = strcat(port_string[slot], ftos(head.frame), " ");
+		port_string[slot] = strcat(port_string[slot], ftos(head.scale), " ");
+		port_string[slot] = strcat(port_string[slot], ftos(solidity), " ");
+		port_string[slot] = strcat(port_string[slot], ftos(physics), " ");
+		port_string[slot] = strcat(port_string[slot], ftos(head.damageforcescale), " ");
+		if(head.material)	port_string[slot] = strcat(port_string[slot], "\"", head.material, "\" ");	else	port_string[slot] = strcat(port_string[slot], "\"\" "); // none
+		if(database)
+		{
+			// properties stored only for the database
+			if(head.crypto_idfp)	port_string[slot] = strcat(port_string[slot], "\"", head.crypto_idfp, "\" ");	else	port_string[slot] = strcat(port_string[slot], "\"\" "); // none
+			port_string[slot] = strcat(port_string[slot], "\"", e.netname, "\" ");
+			port_string[slot] = strcat(port_string[slot], "\"", e.message, "\" ");
+			port_string[slot] = strcat(port_string[slot], "\"", e.message2, "\" ");
+		}
+	}
+
+	// now apply the array to a simple string, with the ; symbol separating objects
+	for(i = 0; i <= MAX_STORAGE_ATTACHMENTS; ++i)
+	{
+		if(port_string[i])
+			s = strcat(s, port_string[i], "; ");
+		port_string[i] = string_null; // fully clear the string
 	}
 
 	return s;
 }
 
-void sandbox_ObjectPort_Load(entity e, string s, float database)
+entity sandbox_ObjectPort_Load(string s, float database)
 {
-	// load object properties
-	tokenize_console(s);
-
-	setmodel(e, argv(0));
-	e.skin = stof(argv(1));
-	e.alpha = stof(argv(2));
-	e.colormod = stov(argv(3));
-	e.glowmod = stov(argv(4));
-	e.frame = stof(argv(5));
-	sandbox_ObjectEdit_Scale(e, stof(argv(6)));
-	e.movetype = stof(argv(7));
-	e.damageforcescale = stof(argv(8));
-	if(e.material)	strunzone(e.material);	if(argv(9) != "-")	e.material = strzone(argv(9));	else	e.material = string_null;
-	if(database)
+	// load object properties, and spawn a new object with them
+	float n, i;
+	entity e, parent;
+
+	// separate objects between the ; symbols
+	n = tokenizebyseparator(s, "; ");
+	for(i = 0; i < n; ++i)
+		port_string[i] = argv(i);
+
+	// now separate and apply the properties of each object
+	for(i = 0; i < n; ++i)
 	{
-		if(e.crypto_idfp)	strunzone(e.crypto_idfp);	if(argv(10) != "-")	e.crypto_idfp = strzone(argv(10));	else	e.crypto_idfp = string_null;
-		setorigin(e, stov(argv(11)));
-		e.angles = stov(argv(12));
+		float argv_num;
+		string tagname;
+		argv_num = 0;
+		tokenize_console(port_string[i]);
+		e = sandbox_ObjectSpawn(database);
+
+		// ---------------- OBJECT PROPERTY STORAGE: LOAD ----------------
+		if(i)
+		{
+			// properties stored only for child objects
+			if(argv(argv_num) != "")	tagname = argv(argv_num);	else tagname = string_null;	++argv_num;
+		}
+		else
+		{
+			// properties stored only for parent objects
+			if(database)
+			{
+				setorigin(e, stov(argv(argv_num)));	++argv_num;
+				e.angles = stov(argv(argv_num));	++argv_num;
+			}
+			parent = e; // mark parent objects as such
+		}
+		// properties stored for all objects
+		setmodel(e, argv(argv_num));	++argv_num;
+		e.skin = stof(argv(argv_num));	++argv_num;
+		e.alpha = stof(argv(argv_num));	++argv_num;
+		e.colormod = stov(argv(argv_num));	++argv_num;
+		e.glowmod = stov(argv(argv_num));	++argv_num;
+		e.frame = stof(argv(argv_num));	++argv_num;
+		sandbox_ObjectEdit_Scale(e, stof(argv(argv_num)));	++argv_num;
+		e.solid = e.old_solid = stof(argv(argv_num));	++argv_num;
+		e.movetype = e.old_movetype = stof(argv(argv_num));	++argv_num;
+		e.damageforcescale = stof(argv(argv_num));	++argv_num;
+		if(e.material)	strunzone(e.material);	if(argv(argv_num) != "")	e.material = strzone(argv(argv_num));	else	e.material = string_null;	++argv_num;
+		if(database)
+		{
+			// properties stored only for the database
+			if(e.crypto_idfp)	strunzone(e.crypto_idfp);	if(argv(argv_num) != "")	e.crypto_idfp = strzone(argv(argv_num));	else	e.crypto_idfp = string_null;	++argv_num;
+			if(e.netname)	strunzone(e.netname);	e.netname = strzone(argv(argv_num));	++argv_num;
+			if(e.message)	strunzone(e.message);	e.message = strzone(argv(argv_num));	++argv_num;
+			if(e.message2)	strunzone(e.message2);	e.message2 = strzone(argv(argv_num));	++argv_num;
+		}
+
+		// attach last
+		if(i)
+			sandbox_ObjectAttach_Set(e, parent, tagname);
 	}
+
+	for(i = 0; i <= MAX_STORAGE_ATTACHMENTS; ++i)
+		port_string[i] = string_null; // fully clear the string
+
+	return e;
 }
 
 void sandbox_Database_Save()
@@ -211,13 +360,11 @@ void sandbox_Database_Save()
 
 	for(head = world; (head = find(head, classname, "object")); )
 	{
-		// Unfortunately, attached objects cannot be persisted yet. That's because the parent is specified as an entity,
-		// but only properties can be saved to this file, leaving no way to identify the owner once all objects are spawned
-		// TODO: Find some way to fix this!
+		// attached objects are persisted separately, ignore them here
 		if(head.owner != world)
 			continue;
 
-		// use a line for each object, listing all properties
+		// use a line of text for each object, listing all properties
 		fputs(file_get, strcat(sandbox_ObjectPort_Save(head, TRUE), "\n"));
 	}
 	fclose(file_get);
@@ -249,8 +396,7 @@ void sandbox_Database_Load()
 				continue;
 
 			entity e;
-			e = sandbox_ObjectSpawn(TRUE);
-			sandbox_ObjectPort_Load(e, file_read, TRUE);
+			e = sandbox_ObjectPort_Load(file_read, TRUE);
 
 			if(e.material)
 			{
@@ -262,6 +408,7 @@ void sandbox_Database_Load()
 		if(autocvar_g_sandbox_info > 0)
 			print(strcat("^3SANDBOX - SERVER: ^7successfully loaded storage file ^3", file_name, "\n"));
 	}
+	fclose(file_get);
 }
 
 MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
@@ -270,9 +417,14 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 		return FALSE;
 	if(cmd_name == "g_sandbox")
 	{
+		if(autocvar_g_sandbox_readonly)
+		{
+			print_to(self, "^2SANDBOX - INFO: ^7Sandbox mode is active, but in read-only mode. Sandbox commands cannot be used");
+			return TRUE;
+		}
 		if(cmd_argc < 2)
 		{
-			print_to(self, "Sandbox mode is active. For usage information, type 'sandbox help'");
+			print_to(self, "^2SANDBOX - INFO: ^7Sandbox mode is active. For usage information, type 'sandbox help'");
 			return TRUE;
 		}
 
@@ -280,35 +432,47 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 		{
 			entity e;
 			float i;
+			string s;
 
 			// ---------------- COMMAND: HELP ----------------
 			case "help":
 				print_to(self, "You can use the following sandbox commands:");
 				print_to(self, "^7\"^2object_spawn ^3models/foo/bar.md3^7\" spawns a new object in front of the player, and gives it the specified model");
 				print_to(self, "^7\"^2object_remove^7\" removes the object the player is looking at. Players can only remove their own objects");
-				print_to(self, "^7\"^2object_duplicate ^3value^7\" duplicates the object. 'copy' copies the object, 'paste' puts it in front of the player");
-				print_to(self, "^7\"^2object_claim^7\" sets the player as the owner of the object, if he has the right to edit it");
+				print_to(self, "^7\"^2object_duplicate ^3value^7\" duplicates the object, if the player has copying rights over the original");
+				print_to(self, "^3copy value ^7- copies the properties of the object to the specified client cvar");
+				print_to(self, "^3paste value ^7- spawns an object with the given properties. Properties or cvars must be specified as follows; eg1: \"0 1 2 ...\", eg2: \"$cl_cvar\"");
 				print_to(self, "^7\"^2object_attach ^3property value^7\" attaches one object to another. Players can only attach their own objects");
-				print_to(self, "^7Attachment properties for ^2object_attach^7:");
 				print_to(self, "^3get ^7- selects the object you are facing as the object to be attached");
 				print_to(self, "^3set value ^7- attaches the previously selected object to the object you are facing, on the specified bone");
 				print_to(self, "^3remove ^7- detaches all objects from the object you are facing");
 				print_to(self, "^7\"^2object_edit ^3property value^7\" edits the given property of the object. Players can only edit their own objects");
-				print_to(self, "^7Object properties for ^2object_edit^7:");
 				print_to(self, "^3skin value ^7- changes the skin of the object");
 				print_to(self, "^3alpha value ^7- sets object transparency");
 				print_to(self, "^3colormod \"value_x value_y value_z\" ^7- main object color");
 				print_to(self, "^3glowmod \"value_x value_y value_z\" ^7- glow object color");
 				print_to(self, "^3frame value ^7- object animation frame, for self-animated models");
 				print_to(self, "^3scale value ^7- changes object scale. 0.5 is half size and 2 is double size");
+				print_to(self, "^3solidity value ^7- object collisions, 0 = non-solid, 1 = solid");
 				print_to(self, "^3physics value ^7- object physics, 0 = static, 1 = movable, 2 = physical");
 				print_to(self, "^3force value ^7- amount of force applied to objects that are shot");
 				print_to(self, "^3material value ^7- sets the material of the object. Default materials are: metal, stone, wood, flesh");
+				print_to(self, "^7\"^2object_claim^7\" sets the player as the owner of the object, if he has the right to edit it");
+				print_to(self, "^7\"^2object_info ^3value^7\" shows public information about the object");
+				print_to(self, "^3object ^7- prints general information about the object, such as owner and creation / editing date");
+				print_to(self, "^3mesh ^7- prints information about the object's mesh, including skeletal bones");
+				print_to(self, "^3attachments ^7- prints information about the object's attachments");
 				print_to(self, "^7The ^1drag object ^7key can be used to grab and carry objects. Players can only grab their own objects");
 				return TRUE;
 
-			// ---------------- COMMAND: SPAWN OBJECT ----------------
+			// ---------------- COMMAND: OBJECT, SPAWN ----------------
 			case "object_spawn":
+				if(time < self.object_flood)
+				{
+					print_to(self, strcat("^1SANDBOX - WARNING: ^7Flood protection active. Please wait ^3", ftos(self.object_flood - time), " ^7seconds beofore spawning another object"));
+					return TRUE;
+				}
+				self.object_flood = time + autocvar_g_sandbox_editor_flood;
 				if(object_count >= autocvar_g_sandbox_editor_maxobjects)
 				{
 					print_to(self, strcat("^1SANDBOX - WARNING: ^7Cannot spawn any more objects. Up to ^3", ftos(autocvar_g_sandbox_editor_maxobjects), " ^7objects may exist at a time"));
@@ -319,7 +483,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					print_to(self, "^1SANDBOX - WARNING: ^7Attempted to spawn an object without specifying a model. Please specify the path to your model file after the 'object_spawn' command");
 					return TRUE;
 				}
-				else if not(fexists(argv(2)))
+				if not(fexists(argv(2)))
 				{
 					print_to(self, "^1SANDBOX - WARNING: ^7Attempted to spawn an object with a non-existent model. Make sure the path to your model file is correct");
 					return TRUE;
@@ -332,9 +496,9 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					print(strcat("^3SANDBOX - SERVER: ^7", self.netname, " spawned an object at origin ^3", vtos(e.origin), "\n"));
 				return TRUE;
 
-			// ---------------- COMMAND: REMOVE OBJECT ----------------
+			// ---------------- COMMAND: OBJECT, REMOVE ----------------
 			case "object_remove":
-				e = sandbox_ObjectEdit_Get();
+				e = sandbox_ObjectEdit_Get(TRUE);
 				if(e != world)
 				{
 					if(autocvar_g_sandbox_info > 0)
@@ -346,28 +510,34 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				print_to(self, "^1SANDBOX - WARNING: ^7Object could not be removed. Make sure you are facing an object that you have edit rights over");
 				return TRUE;
 
-			// ---------------- COMMAND: DUPLICATE OBJECT ----------------
+			// ---------------- COMMAND: OBJECT, DUPLICATE ----------------
 			case "object_duplicate":
 				switch(argv(2))
 				{
 					case "copy":
-						// copies customizable properties of the selected object to the clipboard
-						e = sandbox_ObjectEdit_Get(); // you can only copy objects you can edit, so this works
+						// copies customizable properties of the selected object to the clipboard cvar
+						e = sandbox_ObjectEdit_Get(autocvar_g_sandbox_editor_free); // can we copy objects we can't edit?
 						if(e != world)
 						{
-							if(self.object_clipboard)
-								strunzone(self.object_clipboard);
-							self.object_clipboard = strzone(sandbox_ObjectPort_Save(e, FALSE));
+							s = sandbox_ObjectPort_Save(e, FALSE);
+							s = strreplace("\"", "\\\"", s);
+							stuffcmd(self, strcat("set ", argv(3), " \"", s, "\""));
 
 							print_to(self, "^2SANDBOX - INFO: ^7Object copied to clipboard");
 							return TRUE;
 						}
-						print_to(self, "^1SANDBOX - WARNING: ^7Object could not be copied. Make sure you are facing an object that you have edit rights over");
+						print_to(self, "^1SANDBOX - WARNING: ^7Object could not be copied. Make sure you are facing an object that you have copy rights over");
 						return TRUE;
 
 					case "paste":
-						// spawns a new object using the properties in the player's clipboard
-						if(!self.object_clipboard) // no object in clipboard
+						// spawns a new object using the properties in the player's clipboard cvar
+						if(time < self.object_flood)
+						{
+							print_to(self, strcat("^1SANDBOX - WARNING: ^7Flood protection active. Please wait ^3", ftos(self.object_flood - time), " ^7seconds beofore spawning another object"));
+							return TRUE;
+						}
+						self.object_flood = time + autocvar_g_sandbox_editor_flood;
+						if(!argv(3)) // no object in clipboard
 						{
 							print_to(self, "^1SANDBOX - WARNING: ^7No object in clipboard. You must copy an object before you can paste it");
 							return TRUE;
@@ -377,9 +547,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							print_to(self, strcat("^1SANDBOX - WARNING: ^7Cannot spawn any more objects. Up to ^3", ftos(autocvar_g_sandbox_editor_maxobjects), " ^7objects may exist at a time"));
 							return TRUE;
 						}
-
-						e = sandbox_ObjectSpawn(FALSE);
-						sandbox_ObjectPort_Load(e, self.object_clipboard, FALSE);
+						e = sandbox_ObjectPort_Load(argv(3), FALSE);
 
 						print_to(self, "^2SANDBOX - INFO: ^7Object pasted successfully");
 						if(autocvar_g_sandbox_info > 0)
@@ -388,38 +556,13 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				}
 				return TRUE;
 
-			// ---------------- COMMAND: CLAIM OBJECT ----------------
-			case "object_claim":
-				// if the player can edit an object but is not its owner, this can be used to claim that object
-				if(self.crypto_idfp == "")
-				{
-					print_to(self, "^1SANDBOX - WARNING: ^7You do not have a player UID, and cannot claim objects");
-					return TRUE;
-				}
-				e = sandbox_ObjectEdit_Get();
-				if(e != world)
-				{
-					if(e.crypto_idfp == self.crypto_idfp)
-					{
-						print_to(self, "^2SANDBOX - INFO: ^7Object is already yours, nothing to claim");
-						return TRUE;
-					}
-
-					if(e.crypto_idfp)
-						strunzone(e.crypto_idfp);
-					e.crypto_idfp = self.crypto_idfp;
-					print_to(self, "^2SANDBOX - INFO: ^7Object claimed successfully");
-				}
-				print_to(self, "^1SANDBOX - WARNING: ^7Object could not be claimed. Make sure you are facing an object that you have edit rights over");
-				return TRUE;
-
-			// ---------------- COMMAND: ATTACH OBJECT ----------------
+			// ---------------- COMMAND: OBJECT, ATTACH ----------------
 			case "object_attach":
 				switch(argv(2))
 				{
 					case "get":
 						// select e as the object as meant to be attached
-						e = sandbox_ObjectEdit_Get();
+						e = sandbox_ObjectEdit_Get(TRUE);
 						if(e != world)
 						{
 							self.object_attach = e;
@@ -436,7 +579,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 						}
 
 						// attaches the previously selected object to e
-						e = sandbox_ObjectEdit_Get();
+						e = sandbox_ObjectEdit_Get(TRUE);
 						if(e != world)
 						{
 							sandbox_ObjectAttach_Set(self.object_attach, e, argv(3));
@@ -450,7 +593,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 						return TRUE;
 					case "remove":
 						// removes e if it was attached
-						e = sandbox_ObjectEdit_Get();
+						e = sandbox_ObjectEdit_Get(TRUE);
 						if(e != world)
 						{
 							sandbox_ObjectAttach_Remove(e);
@@ -464,7 +607,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				}
 				return TRUE;
 
-			// ---------------- COMMAND: EDIT OBJECT ----------------
+			// ---------------- COMMAND: OBJECT, EDIT ----------------
 			case "object_edit":
 				if(!argv(2))
 				{
@@ -472,7 +615,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 					return TRUE;
 				}
 
-				e = sandbox_ObjectEdit_Get();
+				e = sandbox_ObjectEdit_Get(TRUE);
 				if(e != world)
 				{
 					switch(argv(2))
@@ -495,6 +638,18 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 						case "scale":
 							sandbox_ObjectEdit_Scale(e, stof(argv(3)));
 							break;
+						case "solidity":
+							switch(argv(3))
+							{
+								case "0": // non-solid
+									e.solid = SOLID_TRIGGER;
+									break;
+								case "1": // solid
+									e.solid = SOLID_BBOX;
+									break;
+								default:
+									break;
+							}
 						case "physics":
 							switch(argv(3))
 							{
@@ -515,8 +670,7 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							e.damageforcescale = stof(argv(3));
 							break;
 						case "material":
-							if(e.material)
-								strunzone(e.material);
+							if(e.material)	strunzone(e.material);
 							if(argv(3))
 							{
 								for (i = 1; i <= 5; i++) // precache material sounds, 5 in total
@@ -528,8 +682,13 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 							break;
 						default:
 							print_to(self, "^1SANDBOX - WARNING: ^7Invalid object property. For usage information, type 'sandbox help'");
-							break;
+							return TRUE;
 					}
+
+					// update last editing time
+					if(e.message2)	strunzone(e.message2);
+					e.message2 = strzone(strftime(TRUE, "%d-%m-%Y %H:%M:%S"));
+
 					if(autocvar_g_sandbox_info > 1)
 						print(strcat("^3SANDBOX - SERVER: ^7", self.netname, " edited property ^3", argv(2), " ^7of an object at origin ^3", vtos(e.origin), "\n"));
 					return TRUE;
@@ -538,49 +697,86 @@ MUTATOR_HOOKFUNCTION(sandbox_PlayerCommand)
 				print_to(self, "^1SANDBOX - WARNING: ^7Object could not be edited. Make sure you are facing an object that you have edit rights over");
 				return TRUE;
 
-			// ---------------- COMMAND: DEFAULT ----------------
-			default:
-				print_to(self, "Invalid command. For usage information, type 'sandbox help'");
-				return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-MUTATOR_HOOKFUNCTION(sandbox_PlayerPreThink)
-{
-	// if the player is close enough to their object, they can drag it
-
-	if(autocvar_sv_cheats)
-		return FALSE; // cheat dragging is used instead
-
-	// grab is TRUE if the object can be picked up. While an object is being carried, the Drag() function
-	// must execute for it either way, otherwise it would cause bugs if it went out of the player's trace.
-	// This also makes sure that an object can only pe picked up if in range, but does not get dropped if
-	// it goes out of range while slinging it around.
+			// ---------------- COMMAND: OBJECT, CLAIM ----------------
+			case "object_claim":
+				// if the player can edit an object but is not its owner, this can be used to claim that object
+				if(self.crypto_idfp == "")
+				{
+					print_to(self, "^1SANDBOX - WARNING: ^7You do not have a player UID, and cannot claim objects");
+					return TRUE;
+				}
+				e = sandbox_ObjectEdit_Get(TRUE);
+				if(e != world)
+				{
+					// update the owner's name
+					// Do this before checking if you're already the owner and skipping if such, so we
+					// also update the player's nickname if he changed it (but has the same player UID)
+					if(e.netname != self.netname)
+					{
+						if(e.netname)	strunzone(e.netname);
+						e.netname = strzone(self.netname);
+						print_to(self, "^2SANDBOX - INFO: ^7Object owner name updated");
+					}
 
-	entity e;
-	float grab;
+					if(e.crypto_idfp == self.crypto_idfp)
+					{
+						print_to(self, "^2SANDBOX - INFO: ^7Object is already yours, nothing to claim");
+						return TRUE;
+					}
 
-	e = sandbox_ObjectEdit_Get();
-	if(e != world && vlen(e.origin - self.origin) <= autocvar_g_sandbox_editor_distance_edit)
-		grab = TRUE;
+					if(e.crypto_idfp)	strunzone(e.crypto_idfp);
+					e.crypto_idfp = strzone(self.crypto_idfp);
 
-	if(Drag(e, grab)) // execute dragging
-		return TRUE;
+					print_to(self, "^2SANDBOX - INFO: ^7Object claimed successfully");
+				}
+				print_to(self, "^1SANDBOX - WARNING: ^7Object could not be claimed. Make sure you are facing an object that you have edit rights over");
+				return TRUE;
 
-	return FALSE;
-}
+			// ---------------- COMMAND: OBJECT, INFO ----------------
+			case "object_info":
+				// prints public information about the object to the player
+				e = sandbox_ObjectEdit_Get(FALSE);
+				if(e != world)
+				{
+					switch(argv(2))
+					{
+						case "object":
+							print_to(self, strcat("^2SANDBOX - INFO: ^7Object is owned by \"^7", e.netname, "^7\", created \"^3", e.message, "^7\", last edited \"^3", e.message2, "^7\""));
+							return TRUE;
+						case "mesh":
+							for(i = 1; gettaginfo(e, i); i++)
+								s = strcat(s, "^7\"^5", gettaginfo_name, "^7\", ");
+							print_to(self, strcat("^2SANDBOX - INFO: ^7Object mesh is \"^3", e.model, "^7\" at animation frame ^3", ftos(e.frame), " ^7containing the following tags: ", s));
+							return TRUE;
+						case "attachments":
+							// this should show the same info as 'mesh' but for attachments
+							entity head;
+							for(head = world; (head = find(head, classname, "object")); )
+							{
+								if(head.owner == e)
+								{
+									++i; // start from 1
+									gettaginfo(e, head.tag_index);
+									s = strcat(s, "^1attachment ", ftos(i), "^7 has mesh \"^3", head.model, "^7\" at animation frame ^3", ftos(head.frame));
+									s = strcat(s, "^7 and is attached to bone \"^5", gettaginfo_name, "^7\", ");
+								}
+							}
+							if(i) // object contains attachments
+								print_to(self, strcat("^2SANDBOX - INFO: ^7Object contains the following ^1", ftos(i), "^7 attachment(s): ", s));
+							else
+								print_to(self, "^2SANDBOX - INFO: ^7Object contains no attachments");
+							return TRUE;
+					}
+				}
+				print_to(self, "^1SANDBOX - WARNING: ^7No information could be found. Make sure you are facing an object");
+				return TRUE;
 
-MUTATOR_HOOKFUNCTION(sandbox_ClientDisconnect)
-{
-	// unzone the player's clipboard if it's not empty
-	if(self.object_clipboard)
-	{
-		strunzone(self.object_clipboard);
-		self.object_clipboard = string_null;
+			// ---------------- COMMAND: DEFAULT ----------------
+			default:
+				print_to(self, "Invalid command. For usage information, type 'sandbox help'");
+				return TRUE;
+		}
 	}
-
 	return FALSE;
 }
 
@@ -589,7 +785,7 @@ MUTATOR_HOOKFUNCTION(sandbox_StartFrame)
 {
 	if(!autocvar_g_sandbox_storage_autosave)
 		return FALSE;
-	if(time < autocvar_g_sandbox_storage_autosave)
+	if(time < autosave_time)
 		return FALSE;
 	autosave_time = time + autocvar_g_sandbox_storage_autosave;
 
@@ -602,8 +798,6 @@ MUTATOR_DEFINITION(sandbox)
 {
 	MUTATOR_HOOK(SV_ParseClientCommand, sandbox_PlayerCommand, CBC_ORDER_ANY);
 	MUTATOR_HOOK(SV_StartFrame, sandbox_StartFrame, CBC_ORDER_ANY);
-	MUTATOR_HOOK(PlayerPreThink, sandbox_PlayerPreThink, CBC_ORDER_ANY);
-	MUTATOR_HOOK(ClientDisconnect, sandbox_ClientDisconnect, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD
 	{