From: The Grand Dog <alex.h@me.com>
Date: Mon, 27 Apr 2020 14:36:53 +0000 (-0400)
Subject: Merge branch 'Split_renderers' into vgd
X-Git-Tag: PR7x~8
X-Git-Url: http://git.osdn.net/view?p=automap%2Fautomap.git;a=commitdiff_plain;h=7ee9d3ca4ad7b6b39dce2979e13ad1ca8a1ab1e7

Merge branch 'Split_renderers' into vgd
---

7ee9d3ca4ad7b6b39dce2979e13ad1ca8a1ab1e7
diff --cc Automap/Data/EntitiesOfInterest.cs
index 7eb1253,add5406..d22f328
--- a/Automap/Data/EntitiesOfInterest.cs
+++ b/Automap/Data/EntitiesOfInterest.cs
@@@ -28,9 -29,7 +29,9 @@@ namespace Automa
  		[ProtoMember(2)]
  		public string Notes;
  
- 		[DisplayName(0, "Loc.")]
+ 		[DisplayName(1, "Loc.")]
 +		public string PrettyLocation;
 +
  		[ProtoMember(3)]
  		public BlockPos Location;
  
diff --cc Automap/Data/PointOfInterest.cs
index ef27476,f2bbac3..3ad779b
--- a/Automap/Data/PointOfInterest.cs
+++ b/Automap/Data/PointOfInterest.cs
@@@ -25,9 -26,7 +26,9 @@@ namespace Automa
  		[ProtoMember(2)]
  		public string Notes;
  
- 		[DisplayName(0, "Loc.")]
+ 		[DisplayName(1, "Loc.")]
 +		public string PrettyLocation;
 +
  		[ProtoMember(3)]
  		public BlockPos Location;
  
diff --cc Automap/Subsystems/AutomapSystem.cs
index 8cc81d7,880fe90..20af359
--- a/Automap/Subsystems/AutomapSystem.cs
+++ b/Automap/Subsystems/AutomapSystem.cs
@@@ -502,15 -495,15 +503,15 @@@ namespace Automa
  			int targetChunkY = mapChunk.YMax / chunkSize;//Surface ... 
  			for (; targetChunkY > 0; targetChunkY--)
  			{
 -			WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
 +				WorldChunk chunkData = ClientAPI.World.BlockAccessor.GetChunk(key.X, targetChunkY, key.Y) as WorldChunk;
  
- 				if (chunkData == null || chunkData.BlockEntities == null)
- 				{
- #if DEBUG
- 					Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
- #endif
- 					continue;
- 				}
+ 			if (chunkData == null || chunkData.BlockEntities == null) {
+ 			#if DEBUG
+ 			Logger.VerboseDebug("Chunk null or empty X{0} Y{1} Z{2}", key.X, targetChunkY, key.Y);
+ 			#endif
+ 			nullChunkCount++;
+ 			continue;
+ 			}
  
  				/*************** Chunk Entities Scanning *********************/
  				if (chunkData.BlockEntities != null && chunkData.BlockEntities.Length > 0)