From caca57b9b0ab6f80e55071ec1d5fc633ace8f9fb Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Tue, 8 Apr 2014 05:42:19 +0100
Subject: [PATCH] checkLineOfSight now checks if obj is in inventory

---
 src/services/SimulationService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index bf7cc26e..1b106d62 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -909,6 +909,11 @@ public class SimulationService implements INetworkDispatch {
 		if(obj1.getPlanet() != obj2.getPlanet())
 			return false;
 		
+		// If obj1 is an item in inventory and vice versa
+		if (obj1 == obj2.getGrandparent() || obj2 == obj1.getGrandparent()) {
+			return true;
+		}
+		
 		if(obj1.getGrandparent() != null || obj2.getGrandparent() != null) {
 			
 			if(obj1.getGrandparent() == obj2.getGrandparent())