Fix for B.E error invoke, Anti-Duplication

[automap/automap.git] / Automap / Designators / DefaultDesignators.cs

diff --git a/Automap/Designators/DefaultDesignators.cs b/Automap/Designators/DefaultDesignators.cs
index 4179f38..c8e25c1 100644 (file)
--- a/Automap/Designators/DefaultDesignators.cs
+++ b/Automap/Designators/DefaultDesignators.cs
@@ -167,7 +167,7 @@ namespace Automap
                //sign post Text into a POI field...
                BlockEntitySignPost signEntity = clientAPI.World.BlockAccessor.GetBlockEntity(posn) as BlockEntitySignPost;
 
-               if (signEntity != null && signEntity.textByCardinalDirection?.Length > 0) {
+               if (signEntity != null && signEntity.textByCardinalDirection != null && signEntity.textByCardinalDirection?.Length > 0) {
 
                var textTemp = SaferUnicodeEncoding.GetBytes(string.Join(",", signEntity.textByCardinalDirection));
 
@@ -191,7 +191,9 @@ namespace Automap
                //clientAPI.Logger.VerboseDebug("Trader: {0} @ {1}", entity.GetName(), posn);
 
                var traderJoe = entity as EntityTrader;
-               var traderName = entity.GetBehavior<EntityBehaviorNameTag>( )?.DisplayName;
+               if (traderJoe == null) return;
+               
+               var traderName = entity.GetBehavior<EntityBehaviorNameTag>( )?.DisplayName ?? @"?";
                string code;
                // this makes me ill
                switch (entity.Code.Path) {