From 01d7a92a2b91391ea7964a1eeba61b4691289e33 Mon Sep 17 00:00:00 2001 From: Exp Date: Wed, 29 Jul 2020 12:36:31 +0200 Subject: [PATCH] No pointing at pointing arrows (#1527) --- Content.Server/GameObjects/EntitySystems/PointingSystem.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs b/Content.Server/GameObjects/EntitySystems/PointingSystem.cs index d10b87f364..6352aafef9 100644 --- a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs +++ b/Content.Server/GameObjects/EntitySystems/PointingSystem.cs @@ -92,6 +92,12 @@ namespace Content.Server.GameObjects.EntitySystems return false; } + if (EntityManager.TryGetEntity(uid, out var entity) && entity.HasComponent()) + { + // this is a pointing arrow. no pointing here... + return false; + } + if (!InRange(coords, player.Transform.GridPosition)) { player.PopupMessage(player, Loc.GetString("You can't reach there!"));