From 26d3f69ebfbcd007d44c6e0e16f5682871b7d432 Mon Sep 17 00:00:00 2001 From: MarkT Date: Sat, 16 Apr 2005 16:05:49 +0000 Subject: [PATCH] Fix to gathering script This was SVN commit r2142. --- .../data/mods/official/entities/template_entity_script.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/binaries/data/mods/official/entities/template_entity_script.js b/binaries/data/mods/official/entities/template_entity_script.js index 632269f970..2dde3c8765 100644 --- a/binaries/data/mods/official/entities/template_entity_script.js +++ b/binaries/data/mods/official/entities/template_entity_script.js @@ -135,7 +135,7 @@ function entity_event_targetchanged( evt ) ( evt.target.traits.id.civ_code.toString() != this.traits.id.civ_code.toString() ) ) evt.defaultAction = ORDER_ATTACK; if( this.actions.gather && evt.target.traits.supply && - this.actions.gather.valueOf()[evt.target.traits.supply.type] && + this.actions.gather[evt.target.traits.supply.type] && ( ( evt.target.traits.supply.curr > 0 ) || ( evt.target.traits.supply.max == 0 ) ) ) evt.defaultAction = ORDER_GATHER; } @@ -166,9 +166,10 @@ function entity_event_prepareorder( evt ) break; case ORDER_GATHER: if( !this.actions.gather || - !this.actions.gather.valueOf()[evt.target.traits.supply.type] || + !( this.actions.gather[evt.target.traits.supply.type] ) || ( ( evt.target.traits.supply.curr == 0 ) && ( evt.target.traits.supply.max > 0 ) ) ) evt.preventDefault(); + break; default: evt.preventDefault(); }