Fix dynshapes placement

Code/Components/Player/Player.cs

@@ -158,19 +158,36 @@ void SandboxPlus.PlayerController.IEvents.OnLanded( float distance, Vector3 impa
 		IPlayerEvent.PostToGameObject( GameObject, x => x.OnLand( distance, impactVelocity ) );
 	}
 
-	public static SceneTraceResult DoBasicTrace()
+	/// <summary>
+	/// Function that runs a trace from the Player's eye forwards.
+	/// 
+	/// Use this is you already have a copy of the Player.
+	/// </summary>
+	/// <returns></returns>
+	public SceneTraceResult BasicTrace()
 	{
-		var player = Player.FindLocalPlayer();
-		var trace = player.Scene.Trace.Ray( player.AimRay.Position, player.AimRay.Position + player.AimRay.Forward * 5000 )
+		var trace = Scene.Trace.Ray( AimRay.Position, AimRay.Position + AimRay.Forward * 5000 )
 				.UseHitboxes()
 				.WithAnyTags( "solid", "npc", "glass" )
 				.WithoutTags( "debris", "player" )
-				.IgnoreGameObjectHierarchy( player.GameObject )
+				.IgnoreGameObjectHierarchy( GameObject )
 				.Size( 2 );
 
 		return trace.Run();
 	}
 
+	/// <summary>
+	/// Static function that gets the Local Player, and runs a trace from it's eye forwards.
+	/// 
+	/// Use this if you don't have a copy of the Player
+	/// </summary>
+	/// <returns>SceneTraceResult of a straight trace from the player's eye forwards</returns>
+	public static SceneTraceResult DoBasicTrace()
+	{
+		var player = Player.FindLocalPlayer();
+		return player.BasicTrace();
+	}
+
 	public static Player FindPlayerByConnection( Connection connection )
 	{
 		return Game.ActiveScene.GetAllComponents<Player>().FirstOrDefault( x => x.Network.Owner == connection );

Code/MeshBuilders/VertexMeshBuilder.Cylinder.cs

@@ -139,10 +139,10 @@ public static void SpawnCylinder( float radius, float depth, int numFaces = 16,
 			var modelId = CreateCylinder(radius, depth, numFaces, texScale);
 
 			var entity = SpawnEntity( modelId );
+
 			Player player = Player.FindLocalPlayer();
-			GameObject pawn = player.Controller.GameObject;
-			Transform eye = player.EyeTransform;
-			SceneTraceResult trace = pawn.Scene.Trace.Ray(eye.Position, eye.Position + eye.Forward * 5000.0f ).UseHitboxes().IgnoreGameObject(pawn).Run();
+			SceneTraceResult trace = player.BasicTrace();
+
 			entity.WorldPosition = trace.EndPosition + trace.Normal;
 
 			UndoSystem.Add( creator: player, callback: ReadyUndo( entity, "Cylinder" ), prop: entity );

Code/MeshBuilders/VertexMeshBuilder.Gear.cs

@@ -234,10 +234,9 @@ public static void SpawnGear( float radius, float depth, int numTeeth = 16, floa
 		{
 			var modelId = CreateGear( radius, depth, numTeeth, cutDepth, cutAngle, texScale );
 			var entity = SpawnEntity( modelId );
+
 			Player player = Player.FindLocalPlayer();
-			GameObject pawn = player.Controller.GameObject;
-			Transform eye = player.EyeTransform;
-			SceneTraceResult trace = pawn.Scene.Trace.Ray(eye.Position, eye.Position + eye.Forward * 5000.0f ).UseHitboxes().IgnoreGameObject(pawn).Run();
+			SceneTraceResult trace = player.BasicTrace();
 
 			entity.WorldPosition = trace.EndPosition + trace.Normal;
 

Code/MeshBuilders/VertexMeshBuilder.Sphere.cs

@@ -105,12 +105,11 @@ public static void SpawnSphere( float radius, int numSegments = 16, int texSize
 			var modelId = CreateSphere(radius, numSegments, texSize);
 
 			var entity = SpawnEntity( modelId );
+
 			Player player = Player.FindLocalPlayer();
-			GameObject pawn = player.Controller.GameObject;
-			Transform eye = player.EyeTransform;
-			SceneTraceResult trace = pawn.Scene.Trace.Ray(eye.Position, eye.Position + eye.Forward * 5000.0f ).UseHitboxes().IgnoreGameObject(pawn).Run();
+			SceneTraceResult trace = player.BasicTrace();
 
-			entity.WorldPosition = trace.EndPosition + trace.Normal;
+			entity.WorldPosition = trace.EndPosition + trace.Normal + new Vector3(0, 0, radius);
 
 			UndoSystem.Add( creator: player, callback: ReadyUndo( entity, "Sphere" ), prop: entity );
 		}

Code/MeshBuilders/VertexMeshBuilder.cs

@@ -54,10 +54,9 @@ public static void SpawnPlate( float length, float width, float height, int texS
 		{
 			var modelId = CreateRectangle( length, width, height, texSize );
 			var entity = SpawnEntity( modelId );
+
 			Player player = Player.FindLocalPlayer();
-			GameObject pawn = player.Controller.GameObject;
-			Transform eye = player.EyeTransform;
-			SceneTraceResult trace = pawn.Scene.Trace.Ray(eye.Position, eye.Position + eye.Forward * 5000.0f ).UseHitboxes().IgnoreGameObject(pawn).Run();
+			SceneTraceResult trace = player.BasicTrace();
 
 			entity.WorldPosition = trace.EndPosition + trace.Normal;