From 57a5740cce16c213110fd355c518fc1689282e0d Mon Sep 17 00:00:00 2001 From: Atrik Date: Mon, 4 May 2026 14:47:24 +0200 Subject: [PATCH] Remove dead territory ownership code --- .../public/simulation/helpers/Transform.js | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/binaries/data/mods/public/simulation/helpers/Transform.js b/binaries/data/mods/public/simulation/helpers/Transform.js index 19f2d8ece1..e0be13402e 100644 --- a/binaries/data/mods/public/simulation/helpers/Transform.js +++ b/binaries/data/mods/public/simulation/helpers/Transform.js @@ -86,23 +86,10 @@ function ChangeEntityTemplate(oldEnt, newTemplate) for (const entity of cmpTurretHolder.GetEntities()) cmpNewTurretHolder.SetReservedTurretPoint(cmpTurretHolder.GetOccupiedTurretPointName(entity)); - let owner; - const cmpTerritoryDecay = Engine.QueryInterface(newEnt, IID_TerritoryDecay); - if (cmpTerritoryDecay && cmpTerritoryDecay.HasTerritoryOwnership() && cmpNewPosition) - { - const pos = cmpNewPosition.GetPosition2D(); - const cmpTerritoryManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TerritoryManager); - owner = cmpTerritoryManager.GetOwner(pos.x, pos.y); - } - else - { - const cmpOwnership = Engine.QueryInterface(oldEnt, IID_Ownership); - if (cmpOwnership) - owner = cmpOwnership.GetOwner(); - } + const cmpOwnership = Engine.QueryInterface(oldEnt, IID_Ownership); const cmpNewOwnership = Engine.QueryInterface(newEnt, IID_Ownership); - if (cmpNewOwnership) - cmpNewOwnership.SetOwner(owner); + if (cmpOwnership && cmpNewOwnership) + cmpNewOwnership.SetOwner(cmpOwnership.GetOwner()); CopyControlGroups(oldEnt, newEnt);