Ignore server-side entities when using 'goto' and added a safety distance and a nudge check.

1 files changed, 11 insertions, 8 deletions

diff --git a/src/core/zone.cc b/src/core/zone.cc
index 2ea04fb..659e62f 100644
--- a/src/core/zone.cc
+++ b/src/core/zone.cc
@@ -274,14 +274,17 @@ Entity *Zone::search_entity(const std::string & searchname)
 	for (Content::iterator it = zone_content.begin(); it != zone_content.end(); it++) {
 		Entity *entity = (*it);
 
-		label.assign(entity->label());
-		if (label.size() && (label.find(strsearchkey) != std::string::npos)) {
-			return entity;
-		}
-
-		name.assign(aux::lowercase(entity->name()));
-		if (name.size() && (name.find(strsearchkey) != std::string::npos)) {
-			return entity;
+		if (!entity->serverside()) 
+		{
+			label.assign(entity->label());
+			if (label.size() && (label.find(strsearchkey) != std::string::npos)) {
+				return entity;
+			}
+
+			name.assign(aux::lowercase(entity->name()));
+			if (name.size() && (name.find(strsearchkey) != std::string::npos)) {
+				return entity;
+			}
 		}
 	}