]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update b2dynamictree (#30630)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sat, 8 Mar 2025 03:49:13 +0000 (14:49 +1100)
committerGitHub <noreply@github.com>
Sat, 8 Mar 2025 03:49:13 +0000 (14:49 +1100)
Content.Benchmarks/DynamicTreeBenchmark.cs
Content.IntegrationTests/Tests/Construction/Interaction/CraftingTests.cs
Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs

index 4f3dad40738014f28147f4228baa61f743b86cc2..9086b4d3ac0995d81a1e028bfe5bdba4c585f82f 100644 (file)
@@ -44,7 +44,7 @@ namespace Content.Benchmarks
             for (var i = 0; i < Aabbs1.Length; i++)
             {
                 var aabb = Aabbs1[i];
-                _b2Tree.CreateProxy(aabb, i);
+                _b2Tree.CreateProxy(aabb, uint.MaxValue, i);
                 _tree.Add(i);
             }
         }
index 74d0e9242176e389fbdb4d7c1c84b131b1cbcc87..05e8197c8da5fa3617b47823b12fc00c762706f3 100644 (file)
@@ -54,6 +54,9 @@ public sealed class CraftingTests : InteractionTest
         await CraftItem(Spear);
         await FindEntity(Spear);
 
+        // Reset target because entitylookup will dump this.
+        Target = null;
+
         // Player's hands should be full of the remaining rods, except those dropped during the failed crafting attempt.
         // Spear and left over stacks should be on the floor.
         await AssertEntityLookup((Rod, 2), (Cable, 7), (ShardGlass, 2), (Spear, 1));
index d431c440a2e7cbcb82b93a8dfc7d0247bb01f149..a61f7c3ec860761d97589e0e8f68f6ecd15b67e6 100644 (file)
@@ -62,7 +62,10 @@ public abstract partial class InteractionTest
 
         // Please someone purge async construction code
         Task<bool> task = default!;
-        await Server.WaitPost(() => task = SConstruction.TryStartItemConstruction(prototype, SEntMan.GetEntity(Player)));
+        await Server.WaitPost(() =>
+        {
+            task = SConstruction.TryStartItemConstruction(prototype, SEntMan.GetEntity(Player));
+        });
 
         Task? tickTask = null;
         while (!task.IsCompleted)