[GEN][ZH] Prevent crash upon beacon removal in GameLogic::logicMessageDispatcher() (#1065)

Caball009 · web-flow · commit 143673a4fafb · 2025-07-20T22:55:10.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/Generals/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -1737,7 +1737,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					Object *beacon = findObjectByID(*it);
 					if (beacon)
 					{
-						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
+						// TheSuperHackers @bugfix Prevent runtime crashing when a beacon is no longer associated with an initialized player.
+						const PlayerTemplate *playerTemplate = beacon->getControllingPlayer()->getPlayerTemplate();
+						if (!playerTemplate)
+							continue;
+
+						const ThingTemplate *thing = TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() );
 						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogicDispatch.cpp
@@ -1765,7 +1765,12 @@ void GameLogic::logicMessageDispatcher( GameMessage *msg, void *userData )
 					Object *beacon = findObjectByID(*it);
 					if (beacon)
 					{
-						const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );
+						// TheSuperHackers @bugfix Prevent runtime crashing when a beacon is no longer associated with an initialized player.
+						const PlayerTemplate *playerTemplate = beacon->getControllingPlayer()->getPlayerTemplate();
+						if (!playerTemplate)
+							continue;
+
+						const ThingTemplate *thing = TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() );
 						if (thing && thing->isEquivalentTo(beacon->getTemplate()))
 						{
 							if (beacon->getControllingPlayer() == thisPlayer)

Original file line number	Diff line number	Diff line change
`@@ -1737,7 +1737,12 @@ void GameLogic::logicMessageDispatcher( GameMessage msg, void userData )`
`1737`	`1737`	`Object beacon = findObjectByID(it);`
`1738`	`1738`	`if (beacon)`
`1739`	`1739`	`{`
`1740`		`- const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );`
	`1740`	`+ // TheSuperHackers @bugfix Prevent runtime crashing when a beacon is no longer associated with an initialized player.`
	`1741`	`+ const PlayerTemplate *playerTemplate = beacon->getControllingPlayer()->getPlayerTemplate();`
	`1742`	`+ if (!playerTemplate)`
	`1743`	`+ continue;`
	`1744`	`+`
	`1745`	`+ const ThingTemplate *thing = TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() );`
`1741`	`1746`	`if (thing && thing->isEquivalentTo(beacon->getTemplate()))`
`1742`	`1747`	`{`
`1743`	`1748`	`if (beacon->getControllingPlayer() == thisPlayer)`
Original file line number	Diff line number	Diff line change
`@@ -1765,7 +1765,12 @@ void GameLogic::logicMessageDispatcher( GameMessage msg, void userData )`
`1765`	`1765`	`Object beacon = findObjectByID(it);`
`1766`	`1766`	`if (beacon)`
`1767`	`1767`	`{`
`1768`		`- const ThingTemplate *thing = TheThingFactory->findTemplate( beacon->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate() );`
	`1768`	`+ // TheSuperHackers @bugfix Prevent runtime crashing when a beacon is no longer associated with an initialized player.`
	`1769`	`+ const PlayerTemplate *playerTemplate = beacon->getControllingPlayer()->getPlayerTemplate();`
	`1770`	`+ if (!playerTemplate)`
	`1771`	`+ continue;`
	`1772`	`+`
	`1773`	`+ const ThingTemplate *thing = TheThingFactory->findTemplate( playerTemplate->getBeaconTemplate() );`
`1769`	`1774`	`if (thing && thing->isEquivalentTo(beacon->getTemplate()))`
`1770`	`1775`	`{`
`1771`	`1776`	`if (beacon->getControllingPlayer() == thisPlayer)`