Skip to content

bugfix(energy): Destroying disabled Power Plant lowers energy production twice #1857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

bugfix(energy): Destroying disabled Power Plant lowers energy production twice #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24024fc
bugfix: Destroying disabled power plants lowers energy production twice
Caball009 Nov 14, 2025
6c3b0d4
Moved assertion.
Caball009 Nov 16, 2025
89c7698
Simplified non-retail logic.
Caball009 Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Generals/Code/GameEngine/Source/Common/RTS/Energy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,12 @@ void Energy::removePowerBonus( Object *obj )
if( obj == NULL )
return;

// TheSuperHackers @bugfix Caball009 14/11/2025 Don't remove power bonus for disabled power plants.
#if !RETAIL_COMPATIBLE_CRC
if ( obj->isDisabled() )
return;
#endif

addProduction( -obj->getTemplate()->getEnergyBonus() );

// sanity
Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/Energy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,12 @@ void Energy::removePowerBonus( Object *obj )
if( obj == NULL )
return;

// TheSuperHackers @bugfix Caball009 14/11/2025 Don't remove power bonus for disabled power plants.
#if !RETAIL_COMPATIBLE_CRC
if ( obj->isDisabled() )
return;
#endif

addProduction( -obj->getTemplate()->getEnergyBonus() );

// sanity
Expand Down
Loading