Fix merge issues

FujiAPI · Feb 6, 2024 · 89105e3 · 89105e3
1 parent 27087de
commit 89105e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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])
 						});
 					}
 				}