Map optimisation

Author: laz1444

src/MiNET/MiNET/Entities/ImageProviders/MapImageProvider.cs

@@ -23,6 +23,7 @@
 
 #endregion
 
+using System;
 using MiNET.Net;
 using MiNET.Utils;
 
@@ -82,17 +83,19 @@ public virtual McpeWrapper GetBatch(MapInfo mapInfo, bool forced)
 
 		private byte[] GenerateColors(MapInfo map)
 		{
-			byte[] bytes = new byte[map.Col * map.Row * 4];
+			Random random = new Random();
 
+			byte[] bytes = new byte[map.Col * map.Row * 4];
 			int i = 0;
+
 			for (byte y = 0; y < map.Col; y++)
 			{
 				for (byte x = 0; x < map.Row; x++)
 				{
-					bytes[i++] = 255; // R
-					bytes[i++] = 0; // G
-					bytes[i++] = 0; // B
-					bytes[i++] = 0xff; // A
+					bytes[i++] = (byte) random.Next(256);
+					bytes[i++] = (byte) random.Next(256);
+					bytes[i++] = (byte) random.Next(256);
+					bytes[i++] = 0xff;
 				}
 			}
 

src/MiNET/MiNET/Entities/Passive/Villager.cs

@@ -31,7 +31,6 @@ namespace MiNET.Entities.Passive
 {
 	public class Villager : PassiveMob
 	{
-		public int Variant { get; set; }
 		public Villager(Level level) : base(EntityType.Villager, level)
 		{
 			Width = Length = 0.6;

src/MiNET/MiNET/Entities/World/MapEntity.cs

@@ -23,9 +23,9 @@
 
 #endregion
 
-using System;
 using log4net;
 using MiNET.Entities.ImageProviders;
+using MiNET.Items;
 using MiNET.Net;
 using MiNET.Utils;
 using MiNET.Worlds;
@@ -37,7 +37,6 @@ public class MapEntity : Entity
 		private static readonly ILog Log = LogManager.GetLogger(typeof(MapEntity));
 
 		public MapInfo MapInfo { get; set; }
-		public bool initialized { get; set; } = false;
 		public IMapImageProvider ImageProvider { get; set; }
 
 		public MapEntity(Level level, long mapId = EntityManager.EntityIdUndefined) : base(EntityType.None, level)
@@ -58,7 +57,7 @@ public MapEntity(Level level, long mapId = EntityManager.EntityIdUndefined) : ba
 				var mapInfo = new MapInfo
 				{
 					MapId = EntityId,
-					UpdateType = 0,
+					UpdateType = 2,
 					Scale = 0,
 					X = 0,
 					Z = 0,
@@ -96,15 +95,21 @@ public override void OnTick(Entity[] entities)
 			{
 				MapInfo.Data = ImageProvider.GetData(MapInfo, false);
 			}
-			
-			MapInfo.UpdateType = initialized ? (byte) 2 : (byte) 8;
 
-			var mapInfo = (MapInfo) MapInfo.Clone();
+			MapInfo.UpdateType = 2;
+
+			foreach (Player player in Level.GetSpawnedPlayers())
+			{
+				if (player.Inventory.GetItemInHand() is ItemMap)
+				{
+					var mapInfo = (MapInfo) MapInfo.Clone();
+					var msg = McpeClientboundMapItemData.CreateObject();
+
+					msg.mapinfo = mapInfo;
+					player.SendPacket(msg);
+				}
+			}
 
-			var msg = McpeClientboundMapItemData.CreateObject();
-			msg.mapinfo = mapInfo;
-			Level.RelayBroadcast(msg);
-			initialized = true;
 			return;
 		}
 

src/MiNET/MiNET/PlayerInventory.cs

@@ -26,9 +26,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using fNbt;
 using log4net;
 using MiNET.Blocks;
 using MiNET.Entities;
+using MiNET.Entities.World;
 using MiNET.Items;
 using MiNET.Net;
 using MiNET.Utils;
@@ -292,6 +294,21 @@ public virtual void SetHeldItemSlot(int selectedHotbarSlot, bool sendToPlayer =
 		{
 			InHandSlot = selectedHotbarSlot;
 
+			if (GetItemInHand() is ItemMap)
+			{
+				long mapUuid = GetItemInHand().ExtraData.Get<NbtLong>("map_uuid").Value;
+				if (Player.Level.TryGetEntity(mapUuid, out MapEntity mapEntity))
+				{
+					var mapInfo = mapEntity.MapInfo;
+					mapInfo.UpdateType = 8;
+
+					var msg = McpeClientboundMapItemData.CreateObject();
+					msg.mapinfo = mapInfo;
+
+					Player.SendPacket(msg);
+				}
+			}
+
 			if (sendToPlayer)
 			{
 				var order = McpeMobEquipment.CreateObject();