From c7ea2536208f03e816560c8bfc9ebe5d4cc82748 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Tue, 8 Apr 2014 05:58:04 +0100
Subject: [PATCH] Equipment cmd checks

---
 src/services/command/CommandService.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index ff33d682..650bef26 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -114,11 +114,15 @@ public class CommandService implements INetworkDispatch  {
 				
 				break;
 			case 1: // Other Only
-				if (target != null && target == actor) {
+				if (target == null || target == actor) {
 					return false;
 				}
 				
-				if (target != null && actor.getPosition().getDistance(target.getPosition()) > command.getMaxRangeToTarget()) {
+				if (target.getContainer() == actor || target.getGrandparent() == actor) {
+					break;
+				}
+				
+				if (actor.getPosition().getDistance(target.getPosition()) > command.getMaxRangeToTarget()) {
 					return false;
 				}