diff --git a/CREDITS.md b/CREDITS.md index 063458b44e..299629df77 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -727,6 +727,7 @@ This page lists all the individual contributions to the project by their author. - Fix an issue that the move mission of the jumpjet does not end correctly - Fix the issue that the Jumpjet must end its movement before starting the next mission - Taunt warhead + - Fix the bug where non-Teleporter miners would not return to work after minerals are depleted and then regenerated - **solar-III (凤九歌)** - Target scanning delay customization (documentation) - Skip target scanning function calling for unarmed technos (documentation) diff --git a/docs/Fixed-or-Improved-Logics.md b/docs/Fixed-or-Improved-Logics.md index 0b5a6f3ace..703e91301c 100644 --- a/docs/Fixed-or-Improved-Logics.md +++ b/docs/Fixed-or-Improved-Logics.md @@ -314,6 +314,7 @@ This page describes all ingame logics that are fixed or improved in Phobos witho - Fixed the bug where paradropped infantry with `NotHuman=yes` will ignore `Crashable=no` and crash on ground when killed in air. - Fixed an issue where a unit might cause the target to fall from above its own head when using a locomotor warhead with `Locomotor=Jumpjet` to pull a target with `BalloonHover=yes`. - Fixed the [EIP#007120F7](https://modenc.renegadeprojects.com/Internal_Error#eip_007120F7) that was triggered when repairing because the `Strength` value was lower than `RepairStep`. +- Fixed the bug where non-Teleporter miners would not return to work after minerals are depleted and then regenerated. ## Fixes / interactions with other extensions diff --git a/docs/Whats-New.md b/docs/Whats-New.md index bc68c51964..a50d3f32e8 100644 --- a/docs/Whats-New.md +++ b/docs/Whats-New.md @@ -680,6 +680,7 @@ Fixes / interactions with other extensions: - Modified the ares hook that stopped OpenTopped transports from firing if cloaked (by RAZER & Morton) - Fixed an Ares bug that led to erroneous interactions where the parasite would frequently reset to the victim's position under specific circumstances and that was highly prone to crashes (by NetsuNegi) - Fixed the initial direction of building placed by Ares's UnitDelivery superweapon (by NetsuNegi) +- Fixed the bug where non-Teleporter miners would not return to work after minerals are depleted and then regenerated (by TaranDahl) ``` diff --git a/src/Ext/Unit/Hooks.Harvester.cpp b/src/Ext/Unit/Hooks.Harvester.cpp index b872659e36..dcd679d3fe 100644 --- a/src/Ext/Unit/Hooks.Harvester.cpp +++ b/src/Ext/Unit/Hooks.Harvester.cpp @@ -236,3 +236,7 @@ DEFINE_HOOK(0x738A3E, UnitClass_EnterIdleMode_SubterraneanHarvester, 0x5) } #pragma endregion + +// Skip the check for Teleporter here; this is an unreasonable check. +// This check determines whether miners on a Guard mission near the refinery should return to the Harvest mission. +DEFINE_JUMP(LJMP, 0x740943, 0x740957);