From f514e2735bb4bc057f71efa7acf38ac046945dd5 Mon Sep 17 00:00:00 2001
From: Sense101 <67970865+Sense101@users.noreply.github.com>
Date: Wed, 23 Jun 2021 20:58:54 +0100
Subject: [PATCH] fixed a minor bug

---
 src/js/game/components/goal_acceptor.js | 7 +++++++
 src/js/game/systems/goal_acceptor.js    | 6 ------
 src/js/game/systems/item_processor.js   | 7 ++++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/js/game/components/goal_acceptor.js b/src/js/game/components/goal_acceptor.js
index 527ac65e..ab61d432 100644
--- a/src/js/game/components/goal_acceptor.js
+++ b/src/js/game/components/goal_acceptor.js
@@ -40,6 +40,13 @@ export class GoalAcceptorComponent extends Component {
         this.displayPercentage = 0;
     }
 
+    // clears items but doesn't instantly reset the progress bar
+    clearItems() {
+        this.lastDelivery = null;
+
+        this.currentDeliveredItems = 0;
+    }
+
     getRequiredItemsPerSecond() {
         return (
             globalConfig.goalAcceptorsPerProducer /
diff --git a/src/js/game/systems/goal_acceptor.js b/src/js/game/systems/goal_acceptor.js
index b8b2d589..fce8e4c7 100644
--- a/src/js/game/systems/goal_acceptor.js
+++ b/src/js/game/systems/goal_acceptor.js
@@ -33,12 +33,6 @@ export class GoalAcceptorSystem extends GameSystemWithFilter {
                 goalComp.currentDeliveredItems = 0;
             }
 
-            //// filter the ones which are no longer active, or which are not the same
-            //goalComp.deliveryHistory = goalComp.deliveryHistory.filter(
-            //    d =>
-            //        now - d.time < globalConfig.goalAcceptorMinimumDurationSeconds && d.item === goalComp.item
-            //);
-
             if (goalComp.currentDeliveredItems < globalConfig.goalAcceptorItemsRequired) {
                 allAccepted = false;
             }
diff --git a/src/js/game/systems/item_processor.js b/src/js/game/systems/item_processor.js
index 9673b88d..d5ec43e3 100644
--- a/src/js/game/systems/item_processor.js
+++ b/src/js/game/systems/item_processor.js
@@ -578,12 +578,13 @@ export class ItemProcessorSystem extends GameSystemWithFilter {
             globalConfig.goalAcceptorItemsRequired
         );
 
+        if (goalComp.item && !item.equals(goalComp.item)) {
+            goalComp.clearItems();
+        }
+
         if (this.root.gameMode.getIsEditor()) {
             // while playing in editor, assign the item
             goalComp.item = payload.items[0].item;
-        } else if (!item.equals(goalComp.item)) {
-            // if the inputted item isn't the same, clear the acceptor
-            goalComp.clear();
         }
 
         goalComp.lastDelivery = {