paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Remove player owned sheep when committing the foundation.

Browse Source 
This was SVN commit r13531.
This commit is contained in:
leper 2013-07-05 15:33:39 +00:00
parent 453389b53a
commit 4ab38f81f7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/public/simulation/components/Foundation.js
View File

@ -176,6 +176,7 @@ Foundation.prototype.Build = function(builderEnt, work)
var collisions = cmpObstruction.GetEntityCollisions(true, true);
if (collisions.length)
{
var cmpFoundationOwnership = Engine.QueryInterface(this.entity, IID_Ownership);
for each (var ent in collisions)
{
var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
@ -183,10 +184,11 @@ Foundation.prototype.Build = function(builderEnt, work)
cmpUnitAI.LeaveFoundation(this.entity);
else
{
// If obstructing fauna is gaia but doesn't have UnitAI, just destroy it
// If obstructing fauna is gaia or our own but doesn't have UnitAI, just destroy it
var cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
var cmpIdentity = Engine.QueryInterface(ent, IID_Identity);
if (cmpOwnership && cmpIdentity && cmpOwnership.GetOwner() == 0 && cmpIdentity.HasClass("Animal"))
if (cmpOwnership && cmpIdentity && cmpIdentity.HasClass("Animal")
&& (cmpOwnership.GetOwner() == 0 || cmpFoundationOwnership && cmpOwnership.GetOwner() == cmpFoundationOwnership.GetOwner()))
Engine.DestroyEntity(ent);
}