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

Check for "Destroy" messages beforehand in the base manager to avoid a rare error.

Browse Source 
This was SVN commit r14320.
This commit is contained in:
wraitii 2013-12-09 16:35:06 +00:00
parent ed93cebd28
commit a44e88fa42
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
binaries/data/mods/public/simulation/ai/aegis/base-manager.js
View File

@ -192,7 +192,11 @@ BaseManager.prototype.checkEvents = function (gameState, events, queues) {
}
}
}
} else if (events[i].type == "ConstructionFinished")
}
}
for (i in events)
{
if (events[i].type == "ConstructionFinished")
{
// let's check we haven't lost an important building here.
var evt = events[i];
@ -201,6 +205,9 @@ BaseManager.prototype.checkEvents = function (gameState, events, queues) {
// TODO: we ought to add new resources or do something.
var ent = gameState.getEntityById(evt.msg.newentity);
if (ent === undefined)
continue;
if (ent.getMetadata(PlayerID,"base") == this.ID)
{
if(ent.hasTerritoryInfluence())
@ -219,7 +226,11 @@ BaseManager.prototype.checkEvents = function (gameState, events, queues) {
if (evt.msg && evt.msg.entity)
{
var ent = gameState.getEntityById(evt.msg.entity);
if (ent && ent.resourceSupplyAmount() && ent.owner() == 0)
if (ent === undefined)
continue;
if (ent.resourceSupplyAmount() && ent.owner() == 0)
this.assignResourceToDP(gameState,ent);
}
}

12
binaries/data/mods/public/simulation/ai/aegis/headquarters.js
View File

@ -186,7 +186,11 @@ HQ.prototype.checkEvents = function (gameState, events, queues) {
if (evt.msg && evt.msg.entity)
{
var ent = gameState.getEntityById(evt.msg.entity);
if (ent && ent.isOwn(PlayerID) && ent.getMetadata(PlayerID, "base") === -1)
if (ent === undefined)
continue; // happens when this message is right before a "Destroy" one for the same entity.
if (ent.isOwn(PlayerID) && ent.getMetadata(PlayerID, "base") === -1)
{
// Okay so let's try to create a new base around this.
var bID = uniqueIDBases;
@ -213,7 +217,11 @@ HQ.prototype.checkEvents = function (gameState, events, queues) {
if (evt.msg && evt.msg.newentity)
{
var ent = gameState.getEntityById(evt.msg.newentity);
if (ent && ent.isOwn(PlayerID) && ent.getMetadata(PlayerID, "baseAnchor") == true)
if (ent === undefined)
continue; // happens when this message is right before a "Destroy" one for the same entity.
if (ent.isOwn(PlayerID) && ent.getMetadata(PlayerID, "baseAnchor") == true)
{
var base = ent.getMetadata(PlayerID, "base");
if (this.baseManagers[base].constructing)