[GEN][ZH] Fixed garrison points not initialized before first use

[roossienb]

Fixes garrison points not initialized before first use throwing an debug asset

• Resolves Garrison points are not initialised before the first use, throwing a non init assert. #762

Background

GarrisonContain::loadGarrisonPoints() method is not initially run when the object is created because draw is false in
GarrisonContain::onObjectCreated().

The first time loadGarrisonPoints() is called is when the first unit garissons the object and GarrisonContain::onContaining() is called. At that point the debug assert has already fired.

The issue lies in its parent class method OpenContain::addToContain.

	// ensure our contents are positions correctly.
	redeployOccupants();

	// trigger an onContaining event for the object that just "ate" something
	if( getObject()->getContain() )
	{
		getObject()->getContain()->onContaining( rider, wasSelected );
	}

It first calls redeployOccupants(), which contains the assert, then calls onContaining.

Solution in this PR is to call redeployOccupants() after onContaining.
I've tested it by building, occupying exiting and destroying garrisonable objects to ensure there were no unexpected side effect.

This did however caused a mismatch in the Golden replay (about 10 minutes in).

I have looked at less elegant solutions - e.g. calling loadGarrisonPoints() in redeployOccupants, but that still causes a mismatch.

[Mauller]

Looks like this Resolved the problem, but causes a mismatch.
Worth keeping to merge later once we drop compat.

SkyAero — 09:05 PM
main is fine, PR is causing mismatch