From 5dc15b90c65eb11c122450ba1e38daaff206ead2 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 11 Nov 2020 01:30:09 +0100
Subject: [PATCH] Optimize some allocations.

---
 .../GameObjects/EntitySystems/RenderingTreeSystem.cs        | 6 +++---
 Robust.Client/Graphics/Clyde/Clyde.HLR.cs                   | 2 ++
 Robust.Shared/GameObjects/EntityManager.cs                  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs b/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs
index a0aa37a3af..bfc07895b4 100644
--- a/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs
+++ b/Robust.Client/GameObjects/EntitySystems/RenderingTreeSystem.cs
@@ -102,9 +102,9 @@ namespace Robust.Client.GameObjects.EntitySystems
                 QueueUpdateLight(light);
             }
 
-            foreach (var child in entity.Transform.Children)
+            foreach (var child in entity.Transform.ChildEntityUids)
             {
-                UpdateEntity(child.Owner);
+                UpdateEntity(EntityManager.GetEntity(child));
             }
         }
 
@@ -131,7 +131,7 @@ namespace Robust.Client.GameObjects.EntitySystems
 
                 newMapTrees?.SpriteTree.AddOrUpdate(sprite);
             }
-            
+
             if (ev.Entity.TryGetComponent(out PointLightComponent? light))
             {
                 oldMapTrees?.LightTree.Remove(light);
diff --git a/Robust.Client/Graphics/Clyde/Clyde.HLR.cs b/Robust.Client/Graphics/Clyde/Clyde.HLR.cs
index a6169a69ea..3bba2c2aa2 100644
--- a/Robust.Client/Graphics/Clyde/Clyde.HLR.cs
+++ b/Robust.Client/Graphics/Clyde/Clyde.HLR.cs
@@ -233,6 +233,8 @@ namespace Robust.Client.Graphics.Clyde
                 }
             }
 
+            ArrayPool<int>.Shared.Return(indexList);
+
             _drawingSpriteList.Clear();
             FlushRenderQueue();
 
diff --git a/Robust.Shared/GameObjects/EntityManager.cs b/Robust.Shared/GameObjects/EntityManager.cs
index 804f28fecf..8e506c9728 100644
--- a/Robust.Shared/GameObjects/EntityManager.cs
+++ b/Robust.Shared/GameObjects/EntityManager.cs
@@ -613,9 +613,9 @@ namespace Robust.Shared.GameObjects
                 ++necessary;
             }
 
-            foreach (var childTx in entity.Transform.Children)
+            foreach (var childTx in entity.Transform.ChildEntityUids)
             {
-                if (UpdateEntityTree(childTx.Owner))
+                if (UpdateEntityTree(GetEntity(childTx)))
                 {
                     ++necessary;
                 }