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

CREDITS.md

@@ -546,6 +546,7 @@ This page lists all the individual contributions to the project by their author.
   - Allow `Temporal` warhead to apply ratio and bonus
   - Fix the bug that techno will get stuck if change owner in tunnel
   - Fix the bug that the vanilla `SecondSpawnOffset` no longer takes effect
+  - 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

@@ -729,6 +729,7 @@ HideShakeEffects=false           ; boolean
 - Fixed cells with `CanBeBuiltOn=true` TerrainTypes on them not being considered valid build locations by AI (by Starkku)
 - Fixed a bug where stationary vehicles would also block movement caused by external factors (by Noble_Fish)
 - Fixed `src/Interop/Version.cpp` not being compiled into the project (by Chang_zhi)
+- Fixed the issue that `NoQueueUpToEnter` will clear passenger's planning tokens when entered transport (by NetsuNegi)
 
 #### Fixes / interactions with other extensions:
 - Taking over Ares' AlphaImage respawn logic to reduce lags from it (by NetsuNegi)

docs/locale/zh_CN/LC_MESSAGES/CREDITS.po

@@ -1807,6 +1807,12 @@ msgstr "修复了科技类型在隧道中变更所属方会导致卡住的 Bug"
 msgid "Fix the bug that the vanilla `SecondSpawnOffset` no longer takes effect"
 msgstr "修复了原版 `SecondSpawnOffset` 不再生效的 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

@@ -2746,6 +2746,12 @@ msgid ""
 "Chang_zhi)"
 msgstr "修复了 `src/Interop/Version.cpp` 未参与编译的问题（by Chang_zhi）"
 
+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