From 89105e3b5d1522d5758058ad97177c9ba91b6645 Mon Sep 17 00:00:00 2001
From: hacktic_ <foorganders@outlook.com>
Date: Tue, 6 Feb 2024 11:00:10 +0100
Subject: [PATCH] Fix merge issues

---
 Source/Actors/Player.cs    | 2 +-
 Source/Actors/SolidMesh.cs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/Actors/Player.cs b/Source/Actors/Player.cs
index 7f33b14e..a223aaed 100644
--- a/Source/Actors/Player.cs
+++ b/Source/Actors/Player.cs
@@ -1566,7 +1566,7 @@ private void StClimbingUpdate()
 
 		if (dashes > 0 && tDashCooldown <= 0 && Controls.Dash.ConsumePress())
 		{
-			stateMachine.State = States.Dashing;
+			StateMachine.State = States.Dashing;
 			dashes--;
 			return;
 		}
diff --git a/Source/Actors/SolidMesh.cs b/Source/Actors/SolidMesh.cs
index becd88e3..3da7b114 100644
--- a/Source/Actors/SolidMesh.cs
+++ b/Source/Actors/SolidMesh.cs
@@ -40,8 +40,7 @@ public SolidMesh(SkinnedTemplate model, float scale)
 					{
 						faces.Add(new Face()
 						{
-							Plane = Plane.CreateFromVertices(vertices[v + n + 0], vertices[v + n + 1], vertices[v + n + 2]), 
-							Indices = [v + n + 0, v + n + 1, v + n + 2]
+							Plane = Plane.CreateFromVertices(vertices[v + n + 0], vertices[v + n + 1], vertices[v + n + 2])
 						});
 					}
 				}