Ticket #3530: SaveTheChickenNotTheWhales.patch

source/ps/TemplateLoader.cpp

@@ -394 +394 @@
     CParamNode::LoadXMLString(out, "<Entity/>");
     out.CopyFilteredChildrenOfChild(in, "Entity", permittedComponentTypes);
 
-    // Disable the Obstruction component (if there is one) so it doesn't affect pathfinding
-    // (but can still be used for testing this entity for collisions against others)
-    if (out.GetChild("Entity").GetChild("Obstruction").IsOk())
-        CParamNode::LoadXMLString(out, "<Entity><Obstruction><Active>false</Active></Obstruction></Entity>");
-
     if (!corpse)
     {
         // Previews should not cast shadows
@@ -542 +537 @@
     permittedComponentTypes.insert("Position");
     permittedComponentTypes.insert("VisualActor");
     permittedComponentTypes.insert("Identity");
-    permittedComponentTypes.insert("Obstruction");
     permittedComponentTypes.insert("Minimap");
     permittedComponentTypes.insert("ResourceSupply");
     permittedComponentTypes.insert("Selectable");
@@ -554 +548 @@
 
     CParamNode::LoadXMLString(out, "<Entity/>");
     out.CopyFilteredChildrenOfChild(in, "Entity", permittedComponentTypes);
+    
+    // When dying, resources lose the unitmotion component
+    // This causes them to have no clearance, and an obstruction that does not really exist.
+    // Which makes the unreachable in some cases (see #3530).
+    // To fix this issue and still keep them an obstruction, they need to become static.
+    // So create a static obstruction of an arbitratry radius.
+    CParamNode::LoadXMLString(out, "<Entity><Obstruction><Active>true</Active><BlockMovement>true</BlockMovement><BlockPathfinding>true</BlockPathfinding><BlockFoundation>false</BlockFoundation><BlockConstruction>false</BlockConstruction><DisableBlockMovement>false</DisableBlockMovement><DisableBlockPathfinding>false</DisableBlockPathfinding><Static width=\"2.0\" depth=\"2.0\"/></Obstruction></Entity>");
 }