From 676640151059fbe29edbc1ac00835989fd39ca3f Mon Sep 17 00:00:00 2001 From: sanderd17 Date: Mon, 20 Apr 2015 16:22:48 +0000 Subject: [PATCH] Fix the resign problem with capturing This was SVN commit r16553. --- .../data/mods/public/simulation/components/Capturable.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/binaries/data/mods/public/simulation/components/Capturable.js b/binaries/data/mods/public/simulation/components/Capturable.js index 2616a818cc..45f487b5b6 100644 --- a/binaries/data/mods/public/simulation/components/Capturable.js +++ b/binaries/data/mods/public/simulation/components/Capturable.js @@ -196,7 +196,10 @@ Capturable.prototype.OnOwnershipChanged = function(msg) { this.startRegenTimer(); - if (msg.from != -1) + // if the new owner has no capture points, it means that either + // * it's being initialised now, or + // * it changed ownership for a different reason (defeat, atlas, ...) + if (this.cp[msg.to]) return; // initialise the capture points when created