From 83a2dac1a2839571cc93e2b08c3d1d8861899af5 Mon Sep 17 00:00:00 2001
From: Petteri <jupean@utu.fi>
Date: Sun, 3 Mar 2019 22:56:58 +0200
Subject: [PATCH] Collector update
---
Assets/Scripts/Collector.cs | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/Collector.cs b/Assets/Scripts/Collector.cs
index 1384f4f..2204389 100644
--- a/Assets/Scripts/Collector.cs
+++ b/Assets/Scripts/Collector.cs
@@ -78,7 +78,7 @@ public class Collector : MonoBehaviour
Vector2 mousePos2D = new Vector2(mousePos.x, mousePos.y);
RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero);
- if (hit.collider != null)
+ if (hit.collider != null && hit.collider.gameObject != null)
{
this.Requested_resource = null;
@@ -133,10 +133,13 @@ public class Collector : MonoBehaviour
}
else
{
- //Amount of resources worker is carrying right now
- this.amount = target.GetComponent<Resource>().extractResource(this.max_amount);
- //Gives target resource to resource variable
- this.resource = this.target.GetComponent<Resource>();
+ if(target != null)
+ {
+ //Amount of resources worker is carrying right now
+ this.amount = target.GetComponent<Resource>().extractResource(this.max_amount);
+ //Gives target resource to resource variable
+ this.resource = this.target.GetComponent<Resource>();
+ }
StartCoroutine("goHome");
}
--
GitLab