[Phobos Fix] Fixed the issue that NoQueueUpToEnter will clear passenger's planning tokens when entered transport

CREDITS.md

@@ -526,6 +526,7 @@ This page lists all the individual contributions to the project by their author.
   - Customize effects range of power plant enhancer
   - Customize whether transport can kept or kill passengers when driver has been killed
   - Fix a bug where passengers created by the InitialPayload logic or TeamType with `Full=true` would fail to fire when the transport unit with `OpenTopped=yes` moved to an area that the passengers' `MovementZone` cannot move into.
+  - Fix the issue that `NoQueueUpToEnter` will clear passenger's planning tokens when entered transport
 - **Apollo** - Translucent SHP drawing patches
 - **ststl**:
   - Customizable `ShowTimer` priority of superweapons

docs/Whats-New.md

@@ -674,6 +674,7 @@ Phobos fixes:
 - Fixed an issue where shadow matrix scaling was incorrectly applied to `TurretOffset` causing turret shadow misplacement (by Noble_Fish)
 - Fixed an issue that customizable warhead animation scatter cannot override 32 leptons scatter of `Inviso=yes` projectile (by NetsuNegi)
 - Fixed units with Fly, Jumpjet or Rocket locomotors destroyed while crashing off-map never being fully cleaned up, permanently blocking production slots and counting towards unit limits (by RAZER)
+- Fixed the issue that `NoQueueUpToEnter` will clear passenger's planning tokens when entered transport (by NetsuNegi)
 
 Fixes / interactions with other extensions:
 <!--  - Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)  -->

docs/locale/zh_CN/LC_MESSAGES/CREDITS.po

@@ -1734,6 +1734,12 @@ msgstr ""
 "修复了 `OpenTopped=yes` 的运输工具移动到乘客 `MovementZone` 所不支持的区域时由初始载员逻辑或勾选了 "
 "`预装载小队` 的作战小队创建的乘客无法开火的 Bug"
 
+msgid ""
+"Fix the issue that `NoQueueUpToEnter` will clear passenger's "
+"planning tokens when entered transport"
+msgstr ""
+"修复了 `NoQueueUpToEnter` 会在乘客进入载具时清除计划节点的问题"
+
 msgid "**Apollo** - Translucent SHP drawing patches"
 msgstr "**Apollo** - 半透明 SHP 绘制补丁"
 

docs/locale/zh_CN/LC_MESSAGES/Whats-New.po

@@ -2361,6 +2361,12 @@ msgstr ""
 "修复了 `Locomotor` 为 `Fly`、`Jumpjet` 或 `Rocket` "
 "的单位在地图外坠毁时未能彻底清除并且永久占用生产槽位和计入单位上限的问题（by RAZER）"
 
+msgid ""
+"Fixed the issue that `NoQueueUpToEnter` will clear passenger's "
+"planning tokens when entered transport (by NetsuNegi)"
+msgstr ""
+"修复了 `NoQueueUpToEnter` 会在乘客进入载具时清除计划节点的问题（by NetsuNegi）"
+
 msgid "Fixes / interactions with other extensions:"
 msgstr "其他扩展引擎相关的修复／交互："
 

src/Ext/Techno/Hooks.Transport.cpp

@@ -293,7 +293,7 @@ static inline void DoEnterNow(UnitClass* pTransport, FootClass* pPassenger, Tech
 	pPassenger->OnBridge = false; // Don't swap order casually, important
 	pPassenger->NextObject = nullptr; // Don't swap order casually, very important
 
-	pPassenger->SetDestination(nullptr, true); // Added, to prevent passengers from return to board position when survive
+	//pPassenger->SetDestination(nullptr, true); // Added, to prevent passengers from return to board position when survive
 	pPassenger->QueueUpToEnter = nullptr; // Added, to prevent passengers from wanting to get on after getting off
 	pPassenger->FrozenStill = true; // Added, to prevent the vehicles from stacking together when unloading
 	pPassenger->SetSpeedPercentage(0.0); // Added, to stop the passengers and let OpenTopped work normally