From 29087fd9fab836833a01b6aa0d4b93f19bc9cc0e Mon Sep 17 00:00:00 2001
From: mehmed-faheim-arslan <mehmedfaheimarslan@gmail.com>
Date: Mon, 25 May 2026 20:32:48 +0100
Subject: [PATCH] renamed set/unset-rallypoint cmd field to structures, use
 structures instead of entities in rally point commands

---
 binaries/data/mods/public/gui/session/unit_actions.js       | 4 ++--
 .../data/mods/public/simulation/ai/common-api/entity.js     | 4 ++--
 binaries/data/mods/public/simulation/helpers/Commands.js    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/binaries/data/mods/public/gui/session/unit_actions.js b/binaries/data/mods/public/gui/session/unit_actions.js
index 628b4ca18a..1962100915 100644
--- a/binaries/data/mods/public/gui/session/unit_actions.js
+++ b/binaries/data/mods/public/gui/session/unit_actions.js
@@ -1125,7 +1125,7 @@ var g_UnitActions =
 
 				Engine.PostNetworkCommand({
 					"type": "set-rallypoint",
-					"entities": selection,
+					"structures": selection,
 					"x": position.x,
 					"z": position.z,
 					"data": action.data,
@@ -1355,7 +1355,7 @@ var g_UnitActions =
 			{
 				Engine.PostNetworkCommand({
 					"type": "unset-rallypoint",
-					"entities": selection
+					"structures": selection
 				});
 
 				// Remove displayed rally point
diff --git a/binaries/data/mods/public/simulation/ai/common-api/entity.js b/binaries/data/mods/public/simulation/ai/common-api/entity.js
index 6b8a5c47d1..0ac8657463 100644
--- a/binaries/data/mods/public/simulation/ai/common-api/entity.js
+++ b/binaries/data/mods/public/simulation/ai/common-api/entity.js
@@ -996,13 +996,13 @@ export const Entity = Class({
 	"setRallyPoint": function(target, command)
 	{
 		const data = { "command": command, "target": target.id() };
-		Engine.PostCommand(PlayerID, { "type": "set-rallypoint", "entities": [this.id()], "x": target.position()[0], "z": target.position()[1], "data": data });
+		Engine.PostCommand(PlayerID, { "type": "set-rallypoint", "structures": [this.id()], "x": target.position()[0], "z": target.position()[1], "data": data });
 		return this;
 	},
 
 	"unsetRallyPoint": function()
 	{
-		Engine.PostCommand(PlayerID, { "type": "unset-rallypoint", "entities": [this.id()] });
+		Engine.PostCommand(PlayerID, { "type": "unset-rallypoint", "structures": [this.id()] });
 		return this;
 	},
 
diff --git a/binaries/data/mods/public/simulation/helpers/Commands.js b/binaries/data/mods/public/simulation/helpers/Commands.js
index 621237e5b0..64183219c5 100644
--- a/binaries/data/mods/public/simulation/helpers/Commands.js
+++ b/binaries/data/mods/public/simulation/helpers/Commands.js
@@ -434,7 +434,7 @@ var g_Commands = {
 
 	"set-rallypoint": function(player, cmd, data)
 	{
-		const structures = FilterEntityListWithAllies(cmd.entities || [], player, data.controlAllUnits);
+		const structures = FilterEntityListWithAllies(cmd.structures || [], player, data.controlAllUnits);
 		for (const structure of structures)
 		{
 			const cmpRallyPoint = Engine.QueryInterface(structure, IID_RallyPoint);
@@ -451,7 +451,7 @@ var g_Commands = {
 
 	"unset-rallypoint": function(player, cmd, data)
 	{
-		const structures = FilterEntityListWithAllies(cmd.entities || [], player, data.controlAllUnits);
+		const structures = FilterEntityListWithAllies(cmd.structures || [], player, data.controlAllUnits);
 		for (const structure of structures)
 		{
 			const cmpRallyPoint = Engine.QueryInterface(structure, IID_RallyPoint);
@@ -921,7 +921,7 @@ function ProcessCommand(player, cmd)
 		"controlAllUnits": cmpPlayer.CanControlAllUnits()
 	};
 
-	if (cmd.entities && cmd.type !== "set-rallypoint" && cmd.type !== "unset-rallypoint")
+	if (cmd.entities)
 		data.entities = FilterEntityList(cmd.entities, player, data.controlAllUnits);
 
 	// TODO: queuing order and forcing formations doesn't really work.